Refactoring about motion notes. Add motion: JumpPushUp.

Assets/MotionNotes/Clap.cs

@@ -20,16 +20,4 @@ public class Clap : MotionNote
     public Clap(float start, float end = 0f) : base(start, end)
     {
     }
-
-    public override void Checkpoint()
-    {
-        IsChecked = (InputManager.Instance.CurrentMotionState
-            & MotionState.CLAP_PREPARE) != 0;
-    }
-
-    public override bool FinalJudgeAction()
-    {
-        return (InputManager.Instance.CurrentMotionState
-            & MotionState.CLAP_DONE) != 0;
-    }
 }

Assets/MotionNotes/Guard.cs

@@ -4,11 +4,6 @@ using UnityEngine;
 
 public class Guard : MotionNote
 {
-    enum Hand { Both, Left, Right }
-    Hand hand;
-
-    MotionState prepare, done;
-
     private static Sprite image;
     public override Sprite Image
     {
@@ -23,30 +18,15 @@ public class Guard : MotionNote
         switch (key)
         {
             case "BG":
-                hand = Hand.Both;
                 image = LoadNewSprite("Assets/MotionNotes/BG.png");
-                prepare = MotionState.GUARD_BASE_LEFT | MotionState.GUARD_BASE_RIGHT
-                | MotionState.HAND_MOVE_DOWN_LEFT | MotionState.HAND_MOVE_DOWN_RIGHT;
-                done = MotionState.GUARD_BASE_LEFT | MotionState.GUARD_BASE_RIGHT
-                | MotionState.HAND_MOVE_UP_LEFT | MotionState.HAND_MOVE_UP_RIGHT;
                 MotionName = "GuardBoth";
                 break;
             case "LG":
-                hand = Hand.Left;
                 image = LoadNewSprite("Assets/MotionNotes/LG.png");
-                prepare = MotionState.GUARD_BASE_LEFT
-                | MotionState.HAND_MOVE_DOWN_LEFT;
-                done = MotionState.GUARD_BASE_LEFT
-                | MotionState.HAND_MOVE_UP_LEFT;
                 MotionName = "GuardLeft";
                 break;
             case "RG":
-                hand = Hand.Right;
                 image = LoadNewSprite("Assets/MotionNotes/RG.png");
-                prepare = MotionState.GUARD_BASE_RIGHT
-                | MotionState.HAND_MOVE_DOWN_RIGHT;
-                done = MotionState.GUARD_BASE_RIGHT
-                | MotionState.HAND_MOVE_UP_RIGHT;
                 MotionName = "GuardRight";
                 break;
         }
@@ -54,16 +34,4 @@ public class Guard : MotionNote
     public Guard(float start, float end = 0f) : base(start, end)
     {
     }
-
-     public override void Checkpoint()
-    {
-        IsChecked = (InputManager.Instance.CurrentMotionState
-            & prepare) != 0;
-    }
-
-    public override bool FinalJudgeAction()
-    {
-        return (InputManager.Instance.CurrentMotionState
-            & done) != 0;
-    }
 }

Assets/MotionNotes/HandDown.cs

@@ -4,11 +4,6 @@ using UnityEngine;
 
 public class HandDown : MotionNote
 {
-    enum Hand { Both, Left, Right }
-    Hand hand;
-
-    MotionState done;
-
     private static Sprite image;
     public override Sprite Image
     {
@@ -23,21 +18,15 @@ public class HandDown : MotionNote
         switch (key)
         {
             case "BD":
-                hand = Hand.Both;
                 image = LoadNewSprite("Assets/MotionNotes/BD.png");
-                done = MotionState.HAND_DOWN_LEFT | MotionState.HAND_DOWN_RIGHT;
                 MotionName = "HandDownBoth";
                 break;
             case "LD":
-                hand = Hand.Left;
                 image = LoadNewSprite("Assets/MotionNotes/LD.png");
-                done = MotionState.HAND_DOWN_LEFT;
                 MotionName = "HandDownLeft";
                 break;
             case "RD":
-                hand = Hand.Right;
                 image = LoadNewSprite("Assets/MotionNotes/RD.png");
-                done = MotionState.HAND_DOWN_RIGHT;
                 MotionName = "HandDownRight";
                 break;
         }
@@ -45,15 +34,4 @@ public class HandDown : MotionNote
     public HandDown(float start, float end = 0f) : base(start, end)
     {
     }
-
-    public override void Checkpoint()
-    {
-        IsChecked = true;
-    }
-
-    public override bool FinalJudgeAction()
-    {
-        return (InputManager.Instance.CurrentMotionState
-            & done) != 0;
-    }
 }

Assets/MotionNotes/HandUp.cs

@@ -4,11 +4,6 @@ using UnityEngine;
 
 public class HandUp : MotionNote
 {
-    enum Hand { Both, Left, Right }
-    Hand hand;
-
-    MotionState done;
-
     private static Sprite image;
     public override Sprite Image
     {
@@ -23,21 +18,15 @@ public class HandUp : MotionNote
         switch (key)
         {
             case "BU":
-                hand = Hand.Both;
                 image = LoadNewSprite("Assets/MotionNotes/BU.png");
-                done = MotionState.HAND_UP_LEFT | MotionState.HAND_UP_RIGHT;
                 MotionName = "HandUpBoth";
                 break;
             case "LU":
-                hand = Hand.Left;
                 image = LoadNewSprite("Assets/MotionNotes/LU.png");
-                done = MotionState.HAND_UP_LEFT;
                 MotionName = "HandUpLeft";
                 break;
             case "RU":
-                hand = Hand.Right;
                 image = LoadNewSprite("Assets/MotionNotes/RU.png");
-                done = MotionState.HAND_UP_RIGHT;
                 MotionName = "HandUpRight";
                 break;
         }
@@ -45,15 +34,4 @@ public class HandUp : MotionNote
     public HandUp(float start, float end = 0f) : base(start, end)
     {
     }
-
-    public override void Checkpoint()
-    {
-        IsChecked = true;
-    }
-
-    public override bool FinalJudgeAction()
-    {
-        return (InputManager.Instance.CurrentMotionState
-            & done) != 0;
-    }
 }

Assets/MotionNotes/Headphone.cs

@@ -4,11 +4,6 @@ using UnityEngine;
 
 public class Headphone : MotionNote
 {
-    enum Hand { Both, Left, Right }
-    Hand hand;
-
-    MotionState done;
-
     private static Sprite image;
     public override Sprite Image
     {
@@ -23,36 +18,19 @@ public class Headphone : MotionNote
         switch (key)
         {
             case "BH":
-                hand = Hand.Both;
                 image = LoadNewSprite("Assets/MotionNotes/BH.png");
-                done = MotionState.HEADPHONE_LEFT | MotionState.HEADPHONE_RIGHT;
                 MotionName = "HeadphoneBoth";
                 break;
             case "LH":
-                hand = Hand.Left;
                 image = LoadNewSprite("Assets/MotionNotes/LH.png");
-                done = MotionState.HEADPHONE_LEFT;
                 MotionName = "HeadphoneLeft";
                 break;
             case "RH":
-                hand = Hand.Right;
                 image = LoadNewSprite("Assets/MotionNotes/RH.png");
-                done = MotionState.HEADPHONE_RIGHT;
                 MotionName = "HeadphoneRight";
                 break;
         }
     }
     public Headphone(float start, float end = 0f) : base(start, end)
     { }
-
-     public override void Checkpoint()
-    {
-        IsChecked = true;
-    }
-
-    public override bool FinalJudgeAction()
-    {
-        return (InputManager.Instance.CurrentMotionState
-            & done) != 0;
-    }
 }

Assets/MotionNotes/Jesus.cs

@@ -20,15 +20,4 @@ public class Jesus : MotionNote
     public Jesus(float start, float end = 0f) : base(start, end)
     {
     }
-
-    public override void Checkpoint()
-    {
-        IsChecked = true;
-    }
-
-    public override bool FinalJudgeAction()
-    {
-        return (InputManager.Instance.CurrentMotionState
-            & MotionState.JESUS) != 0;
-    }
 }

Assets/MotionNotes/Jump.cs

@@ -20,16 +20,4 @@ public class Jump : MotionNote
     public Jump(float start, float end = 0f) : base(start, end)
     {
     }
-
-    public override void Checkpoint()
-    {
-        IsChecked = (InputManager.Instance.CurrentMotionState
-            & MotionState.JUMP_PREPARE) != 0;
-    }
-
-    public override bool FinalJudgeAction()
-    {
-        return (InputManager.Instance.CurrentMotionState
-            & MotionState.JUMP_DONE) != 0;
-    }
 }

Assets/MotionNotes/OnTheTable.cs

@@ -20,15 +20,4 @@ public class OnTheTable : MotionNote
     public OnTheTable(float start, float end = 0f) : base(start, end)
     {
     }
-
-    public override void Checkpoint()
-    {
-        IsChecked = true;
-    }
-
-    public override bool FinalJudgeAction()
-    {
-        return (InputManager.Instance.CurrentMotionState
-            & MotionState.ON_THE_TABLE) != 0;
-    }
 }

Assets/MotionNotes/PushUp.cs

@@ -4,11 +4,6 @@ using UnityEngine;
 
 public class PushUp : MotionNote
 {
-    enum Hand { Both, Left, Right }
-    Hand hand;
-
-    MotionState prepare, done;
-
     private static Sprite image;
     public override Sprite Image
     {
@@ -23,45 +18,27 @@ public class PushUp : MotionNote
         switch (key)
         {
             case "BP":
-                hand = Hand.Both;
                 image = LoadNewSprite("Assets/MotionNotes/BP.png");
-                prepare = MotionState.HAND_MOVE_UP_LEFT | MotionState.HAND_MOVE_UP_RIGHT;
-                done = MotionState.HAND_MOVE_DOWN_LEFT | MotionState.HAND_MOVE_DOWN_RIGHT;
                 MotionName = "PushUpBoth";
                 break;
             case "LP":
-                hand = Hand.Left;
                 image = LoadNewSprite("Assets/MotionNotes/LP.png");
-                prepare = MotionState.HAND_MOVE_UP_LEFT;
-                done = MotionState.HAND_MOVE_DOWN_LEFT;
                 MotionName = "PushUpLeft";
                 break;
             case "RP":
-                hand = Hand.Right;
                 image = LoadNewSprite("Assets/MotionNotes/RP.png");
-                prepare = MotionState.HAND_MOVE_UP_RIGHT;
-                done = MotionState.HAND_MOVE_DOWN_RIGHT;
                 MotionName = "PushUpRight";
                 break;
             case "BK":
-                hand = Hand.Both;
                 image = LoadNewSprite("Assets/MotionNotes/BK.png");
-                prepare = MotionState.HAND_MOVE_UP_LEFT | MotionState.HAND_MOVE_UP_RIGHT | MotionState.JUMP_PREPARE;
-                done = MotionState.HAND_MOVE_DOWN_LEFT | MotionState.HAND_MOVE_DOWN_RIGHT | MotionState.JUMP_DONE;
                 MotionName = "JumpPushUpBoth";
                 break;
             case "LK":
-                hand = Hand.Left;
                 image = LoadNewSprite("Assets/MotionNotes/LK.png");
-                prepare = MotionState.HAND_MOVE_UP_LEFT | MotionState.JUMP_PREPARE;
-                done = MotionState.HAND_MOVE_DOWN_LEFT | MotionState.JUMP_DONE;
                 MotionName = "JumpPushUpLeft";
                 break;
             case "RK":
-                hand = Hand.Right;
                 image = LoadNewSprite("Assets/MotionNotes/RK.png");
-                prepare = MotionState.HAND_MOVE_UP_RIGHT | MotionState.JUMP_PREPARE;
-                done = MotionState.HAND_MOVE_DOWN_RIGHT | MotionState.JUMP_DONE;
                 MotionName = "JumpPushUpRight";
                 break;
         }
@@ -69,16 +46,4 @@ public class PushUp : MotionNote
     public PushUp(float start, float end = 0f) : base(start, end)
     {
     }
-
-     public override void Checkpoint()
-    {
-        IsChecked = (InputManager.Instance.CurrentMotionState
-            & prepare) != 0;
-    }
-
-    public override bool FinalJudgeAction()
-    {
-        return (InputManager.Instance.CurrentMotionState
-            & done) != 0;
-    }
 }

Assets/Script/MotionNote.cs

@@ -13,11 +13,6 @@ public abstract class MotionNote : Note
     public MotionNote(string key, float start, float end = 0f)
         : this(start, end) { }
 
-    public abstract void Checkpoint();
-    public abstract bool FinalJudgeAction();
-
-    public bool IsChecked { get; protected set; }
-
     public MotionSampleDisplay MotionSampleDisplay { get; set; }
 
     public string MotionName { get; protected set; }