JudgeManager -> InputManager

Refactoring: Extract class "NoteJudger"
Wirte tests for class "NoteCondition"

Assets/Scene/tmp.unity.meta → Assets/InitTestScene636539850190010233.unity.meta

 fileFormatVersion: 2
-guid: bd1125abc59508941a9858dc3f08c1b7
-timeCreated: 1516864014
+guid: 3f810c26412ef644d8b8b81ac4bf6245
+timeCreated: 1518355819
 licenseType: Free
 DefaultImporter:
   externalObjects: {}

Assets/InitTestScene636539850929906532.unity.meta

+fileFormatVersion: 2
+guid: 0526a2bf9c9fda24dbecff65be3f2158
+timeCreated: 1518355893
+licenseType: Free
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/InitTestScene636539965245787098.unity.meta

+fileFormatVersion: 2
+guid: d2389f6a9e58d0a4a81444158153a41c
+timeCreated: 1518367324
+licenseType: Free
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/InitTestScene636539972224041284.unity.meta

+fileFormatVersion: 2
+guid: 3f008c816a8e510448068950e12fa82f
+timeCreated: 1518368022
+licenseType: Free
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/JudgeModule/Judge.cs

@@ -75,5 +75,15 @@ namespace JudgeModule
             return judge == BAD ||
                    judge == MISS;
         }
+
+        public static bool IsNoteBroken(Note note, float timing)
+        {
+            var isEnd = IsNoteEnd(note, timing);
+            var judge = TestJudge(note, timing, isEnd);
+
+            return note.IsLong &&
+                   !isEnd      &&
+                   IsNoteComboBroken(judge);
+        }
     }
 }
\ No newline at end of file

Assets/JudgeModule/NoteCondition.cs

@@ -11,7 +11,7 @@ namespace JudgeModule
             manager = inputManager;
         }
 
-        public Dictionary<string, InputStatus> WrongInput(Note note)
+        private Dictionary<string, InputStatus> WrongInput(Note note)
         {
             if (note is MotionNote)
                 return new Dictionary<string, InputStatus>
@@ -26,7 +26,7 @@ namespace JudgeModule
             };
         }
 
-        public Dictionary<string, InputStatus> JudgeInput(Note note)
+        private  Dictionary<string, InputStatus> JudgeInput(Note note)
         {
             if (note is MotionNote)
                 return new Dictionary<string, InputStatus>

Assets/JudgeModule/NoteJudger.cs

+using System;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace JudgeModule
+{
+    public class NoteJudger
+    {
+        private Transform offset;
+        private Action<int> EndGame;
+        private GameObject judgeText;
+
+        public NoteJudger(Action<int> endgame)
+        {
+            offset = GameObject.Find("Offset").transform;
+            judgeText = GameObject.Find("JudgeText");
+            EndGame = endgame;
+        }
+
+        public void WrongNoteProc(Note note)
+        {
+            SetJudge(Judge.MISS);
+            DeactivateNote(note);
+
+            if (!(note is MotionNote))
+                EndGame(0);
+        }
+
+        public void EnteredNoteProc(Note note, float timing)
+        {
+            SetJudge(Judge.TestJudge(note, timing));
+
+            if (note.IsLong)
+                note.Activated = true;
+            else
+                DeactivateNote(note);
+        }
+
+        public void ContinuingNoteProc(Note note, float timing)
+        {
+            SetJudge(Judge.TestJudge(note, timing, Judge.IsNoteEnd(note, timing)));
+
+            if (Judge.IsNoteBroken(note, timing))
+                DeactivateNote(note);
+        }
+
+        public void CorrectlyStoppedNoteProc(Note note, float timing)
+        {
+            SetJudge(Judge.TestJudge(note, timing, true));
+            DeactivateNote(note);
+        }
+
+        public void IncorrectlyStoppedNoteProc(Note note, float timing)
+        {
+            var judge = Judge.TestJudge(note, timing, note.Activated);
+            SetJudge(Judge.IsNoteComboBroken(judge) ? judge : Judge.MISS);
+            DeactivateNote(note);
+        }
+
+        public void DeactivateNote(Note note)
+        {
+            note.Activated = false;
+            note.Component.transform.SetParent(offset);
+            note.Component.Deactivate();
+        }
+
+        public void SetJudge(Judge judge)
+        {
+            if (!judge.IsBreak)
+                ++GameManager.Instance.Combo;
+            else
+                GameManager.Instance.Combo = 0;
+            GameManager.Instance.Score += judge.Score;
+            GameManager.Instance.JudgeCount[judge]++;
+
+            judgeText.SetActive(true);
+            judgeText.GetComponent<Text>().text = judge.Name;
+            judgeText.GetComponent<Text>().color = judge.Color;
+        }
+    }
+}
\ No newline at end of file

Assets/JudgeModule/NoteJudger.cs.meta

+fileFormatVersion: 2
+guid: 2712b1909ed45024da811b21529b10f0
+timeCreated: 1518343840
+licenseType: Free
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scene/InGame.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1}
+  m_IndirectSpecularColor: {r: 0.37311992, g: 0.38074034, b: 0.35872713, a: 1}
 --- !u!157 &3
 LightmapSettings:
   m_ObjectHideFlags: 0
@@ -1341,12 +1341,12 @@ GameObject:
   serializedVersion: 5
   m_Component:
   - component: {fileID: 750753103}
-  - component: {fileID: 750753104}
   - component: {fileID: 750753105}
   - component: {fileID: 750753106}
   - component: {fileID: 750753107}
   - component: {fileID: 750753108}
   - component: {fileID: 750753109}
+  - component: {fileID: 750753104}
   m_Layer: 5
   m_Name: InGameManagers
   m_TagString: Untagged
@@ -1380,7 +1380,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 750753102}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 2fcba0157b527de4e89b842943a90af3, type: 3}
+  m_Script: {fileID: 11500000, guid: 1b8ba20470a8ce34d854f6f8e3a598c3, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
 --- !u!114 &750753105

Assets/Scene/tmp.unity → Assets/Scene/extract.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1}
+  m_IndirectSpecularColor: {r: 0.37311992, g: 0.38074034, b: 0.35872713, a: 1}
 --- !u!157 &3
 LightmapSettings:
   m_ObjectHideFlags: 0
@@ -223,51 +223,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 397b5aecede4d754abd2fba781e08f97, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!1 &1026530465
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 1026530467}
-  - component: {fileID: 1026530466}
-  m_Layer: 5
-  m_Name: GameManager
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &1026530466
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1026530465}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 397b5aecede4d754abd2fba781e08f97, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!224 &1026530467
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1026530465}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 4
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1217935565
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scene/extract.unity.meta

+fileFormatVersion: 2
+guid: 86ac16ed676e3b146b5b95996950d918
+timeCreated: 1518370980
+licenseType: Free
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scene/test.unity.meta

+fileFormatVersion: 2
+guid: 6c36c432c541722448589b2dbad13896
+timeCreated: 1518346175
+licenseType: Free
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Script/InGameManager.cs

+using JudgeModule;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine;
+
+public class InGameManager : MonoBehaviour {
+
+    float latency = 225f;
+    float scrollMultiplier = 1.0f;
+    float startOffset = -5f;
+    float baseTime;
+    bool IsInitTime;
+
+    bool IsGameEnd;
+
+    private GameObject offset;
+    private GameObject noteobj;
+    private MotionGageManager motionGageManager;
+    private GameObject judgeText;
+
+    private GameObject motionSampleDisplayPrefab;
+
+    private Vector3 initialPos;
+
+    private float MsPerBeat
+    {
+        get
+        {
+            return 60 * 1000f / GameManager.Instance.CurrentTrack.BPM;
+        }
+    }
+
+    private float ScrollSpeed
+    {
+        get
+        {
+            return scrollMultiplier * MsPerBeat / 1000f;
+        }
+    }
+
+    private InputManager input;
+    private NoteCondition condition;
+    private List<Note> notes;
+    private NoteJudger judger;
+
+    void SetObjectRef()
+    {
+        offset = GameObject.Find("Offset");
+        noteobj = GameObject.Find("Noteobj");
+        judgeText = GameObject.Find("Judge");
+        input = GameObject.Find("InGameManagers").GetComponent<InputManager>();
+        condition = new NoteCondition(input);
+        judger = new NoteJudger(x => ShowResult());
+        motionGageManager = new MotionGageManager
+        { motionGuage = GameObject.Find("Motion Guage") };
+    }
+
+    void JudgeInit()
+    {
+        initialPos = offset.transform.position;
+        judgeText.SetActive(false);
+        motionGageManager.ResetGuage();
+        IsGameEnd = false;
+        baseTime = 0f;
+        IsInitTime = false;
+    }
+
+    void LoadGameObjects()
+    {
+        motionSampleDisplayPrefab = Resources.Load("Motion Sample Display") as GameObject;
+        notes = GameManager.Instance.CurrentTrack.Notes.ToList();
+        notes.ForEach(LoadNote);
+
+        var sounds = GameObject.Find("Sounds");
+        sounds.transform.Cast<Transform>()
+                        .ToList()
+                        .ForEach(x => x.gameObject.SetActive(false));
+        if (GameManager.Instance.CurrentTrack.BGM != null)
+            sounds.transform.Find(GameManager.Instance.CurrentTrack.BGM)
+                  .gameObject.SetActive(true);
+    }
+
+    // Use this for initialization
+    void Start()
+    {
+        SetObjectRef();
+        JudgeInit();
+        LoadGameObjects();
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        float current = motionGageManager.UpdateTime();
+        if (!IsInitTime)
+        {
+            baseTime = current;
+            IsInitTime = true;
+        }
+
+        float timing = current - baseTime;
+
+        offset.transform.position = Vector3.left * current * ScrollSpeed;
+
+        motionGageManager.UpdateGuage();
+
+        if (noteobj.transform.childCount == 0 ||
+            IsGameEnd)
+            Invoke("ShowResult", 2f);
+
+        JudgeNote(timing);
+    }
+
+    void JudgeNote(float timing)
+    {
+        Note note = GetLastNote(timing);
+        if (note == null)
+            return;
+
+        if (condition.IsWrongInput(note))
+        {
+            judger.WrongNoteProc(note);
+            return;
+        }
+
+        if (Judge.IsNoteStart(note, timing))
+            PlaySampleMotion(note as MotionNote);
+
+        if (note.IsLong)
+            JudgeLongNote(note, timing);
+        else
+            JudgeShortNote(note, timing);
+    }
+
+    Note GetLastNote(float timing)
+    {
+        while (noteobj.transform.childCount != 0)
+        {
+            var note = noteobj.transform.GetChild(0).gameObject
+                              .GetComponent<Note.Controller>().Instance;
+            if (!Judge.IsPastNote(note, timing))
+                return note;
+            judger.SetJudge(Judge.MISS);
+            judger.DeactivateNote(note);
+        }
+
+        return null;
+    }
+
+    void PlaySampleMotion(MotionNote note)
+    {
+        GameObject motionSample = Instantiate(motionSampleDisplayPrefab);
+        MotionSampleDisplay msd = motionSample.GetComponent<MotionSampleDisplay>();
+        msd.sprite = note.Image;
+        msd.timeout = MsPerBeat;
+        note.Activated = true;
+        note.MotionSampleDisplay = msd;
+    }
+
+    void JudgeShortNote(Note note, float timing)
+    {
+        if (condition.IsShortNoteEntered(note))
+            judger.EnteredNoteProc(note, timing);
+    }
+
+    void JudgeLongNote(Note note, float timing)
+    {
+        if (condition.IsLongNoteStartCorrectly(note))
+            judger.EnteredNoteProc(note, timing);
+        else if (condition.IsLongNoteHoldCorrectly(note))
+            judger.ContinuingNoteProc(note, timing);
+        else if (condition.IsLongNoteFinishCorrectly(note, timing))
+            judger.CorrectlyStoppedNoteProc(note, timing);
+        else if (condition.IsLongNoteFinishIncorrectly(note, timing))
+            judger.IncorrectlyStoppedNoteProc(note, timing);
+    }
+
+    void LoadNote(Note note)
+    {
+        GameObject obj = Instantiate(
+                Resources.Load(note.Type.ToString(), typeof(GameObject)),
+                noteobj.transform)
+                as GameObject;
+
+        obj.AddComponent<Note.Controller>().Instance = note;
+
+        if (note.Type == NoteType.MeasureLine || note.Type == NoteType.BeatLine)
+            obj.transform.SetParent(offset.transform);
+
+        if (note.IsLong)
+            StretchLongNote(note, obj);
+
+        obj.transform.position += initialPos +
+            (Vector3.right * (note.StartTiming * ScrollSpeed));
+    }
+
+    void StretchLongNote(Note note, GameObject obj)
+    {
+        float length = note.Length * ScrollSpeed;
+
+        var holdTransform = obj.transform.GetChild(1)
+            .GetComponent<RectTransform>();
+        var endTransform = obj.transform.GetChild(2)
+            .GetComponent<RectTransform>();
+
+        holdTransform.SetSizeWithCurrentAnchors(
+            RectTransform.Axis.Horizontal, length);
+        holdTransform.position += (Vector3.right * length / 2);
+        endTransform.position += (Vector3.right * length);
+    }
+
+    private bool onResult = false;
+
+    private void ShowResult()
+    {
+        if (!onResult)
+        {
+            Destroy(GetComponent<InputManager>());
+            Destroy(GetComponent<MotionView>());
+            Destroy(GetComponent<CoordinateMapperManager>());
+            Destroy(this);
+
+            GameManager.Instance.SceneTransition("Result");
+            onResult = true;
+        }
+    }
+}

Assets/Script/InGameManager.cs.meta

+fileFormatVersion: 2
+guid: 1b8ba20470a8ce34d854f6f8e3a598c3
+timeCreated: 1518343863
+licenseType: Free
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Script/JudgeManager.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
-using UnityEngine.UI;
 
 public class JudgeManager : MonoBehaviour
 {
@@ -42,6 +41,7 @@ public class JudgeManager : MonoBehaviour
     private InputManager input;
     private NoteCondition condition;
     private List<Note> notes;
+    private NoteJudger judger;
 
     void SetObjectRef()
     {
@@ -50,6 +50,7 @@ public class JudgeManager : MonoBehaviour
         judgeText = GameObject.Find("Judge");
         input = GameObject.Find("InGameManagers").GetComponent<InputManager>();
         condition = new NoteCondition(input);
+        judger = new NoteJudger(x => ShowResult());
         motionGageManager = new MotionGageManager
         { motionGuage = GameObject.Find("Motion Guage") };
     }
@@ -118,7 +119,7 @@ public class JudgeManager : MonoBehaviour
 
         if (condition.IsWrongInput(note))
         {
-            WrongNoteProc(note);
+            judger.WrongNoteProc(note);
             return;
         }
 
@@ -139,8 +140,8 @@ public class JudgeManager : MonoBehaviour
                               .GetComponent<Note.Controller>().Instance;
             if (!Judge.IsPastNote(note, timing))
                 return note;
-            SetJudge(Judge.MISS);
-            DeactivateNote(note);
+            judger.SetJudge(Judge.MISS);
+            judger.DeactivateNote(note);
         }
 
         return null;
@@ -159,88 +160,19 @@ public class JudgeManager : MonoBehaviour
     void JudgeShortNote(Note note, float timing)
     {
         if (condition.IsShortNoteEntered(note))
-            EnteredNoteProc(note, timing);
+            judger.EnteredNoteProc(note, timing);
     }
 
     void JudgeLongNote(Note note, float timing)
     {
-        if (condition.IsLongNoteStartCorrectly(note))
-            EnteredNoteProc(note, timing);
-        if (condition.IsLongNoteHoldCorrectly(note))
-            ContinuingNoteProc(note, timing);
-        if (condition.IsLongNoteFinishCorrectly(note, timing))
-            CorrectlyStoppedNoteProc(note, timing);
-        if (condition.IsLongNoteFinishIncorrectly(note, timing))
-            IncorrectlyStoppedNoteProc(note, timing);
-    }
-
-    void WrongNoteProc(Note note)
-    {
-        SetJudge(Judge.MISS);
-        DeactivateNote(note);
-
-        if (!(note is MotionNote))
-        {
-            IsGameEnd = true;
-            Invoke("ShowResult", 2f);
-        }
-    }
-
-    void EnteredNoteProc(Note note, float timing)
-    {
-        SetJudge(Judge.TestJudge(note, timing));
-
-        if (note.IsLong)
-            note.Activated = true;
-        else
-            DeactivateNote(note);
-    }
-
-    void ContinuingNoteProc(Note note, float timing)
-    {
-        bool isNoteEnd = Judge.IsNoteEnd(note, timing);
-        var judge = Judge.TestJudge(note, timing, isNoteEnd);
-        SetJudge(judge);
-
-        if (isNoteEnd ||
-            condition.IsNoteBroken(note, timing, judge))
-            DeactivateNote(note);
-    }
-
-    void CorrectlyStoppedNoteProc(Note note, float timing)
-    {
-        SetJudge(Judge.TestJudge(note, timing, true));
-        DeactivateNote(note);
-    }
-
-    void IncorrectlyStoppedNoteProc(Note note, float timing)
-    {
-        var judge = Judge.TestJudge(note, timing, note.Activated);
-        SetJudge(Judge.IsNoteComboBroken(judge) ? judge : Judge.MISS);
-        DeactivateNote(note);
-    }
-
-    private void DeactivateNote(Note note)
-    {
-        note.Activated = false;
-        note.Component.transform.SetParent(offset.transform);
-        note.Component.Deactivate();
-    }
-
-    private void SetJudge(Judge judge, bool isMotion = false)
-    {
-        if (!judge.IsBreak)
-            ++GameManager.Instance.Combo;
-        else
-            GameManager.Instance.Combo = 0;
-        GameManager.Instance.Score += judge.Score;
-        GameManager.Instance.JudgeCount[judge]++;
-
-        Debug.Log(judge.Name + (isMotion ? " Motion" : " Note") + " Combo: " + GameManager.Instance.Combo);
-
-        judgeText.SetActive(true);
-        judgeText.GetComponent<Text>().text = judge.Name;
-        judgeText.GetComponent<Text>().color = judge.Color;
+        if      (condition.IsLongNoteStartCorrectly(note))
+            judger.EnteredNoteProc(note, timing);
+        else if (condition.IsLongNoteHoldCorrectly(note))
+            judger.ContinuingNoteProc(note, timing);
+        else if (condition.IsLongNoteFinishCorrectly(note, timing))
+            judger.CorrectlyStoppedNoteProc(note, timing);
+        else if (condition.IsLongNoteFinishIncorrectly(note, timing))
+            judger.IncorrectlyStoppedNoteProc(note, timing);
     }
 
     void LoadNote(Note note)

Assets/Script/Tests/NoteConditionTests.cs.meta

+fileFormatVersion: 2
+guid: 3fb181574fc063b48992771dd1f54887
+timeCreated: 1518351425
+licenseType: Free
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: