Optimizing undos

Author: yatharthmathur

Assets/Scripts/ARStage.cs

@@ -121,12 +121,14 @@ private void UpdatePlacementPose()
     }
     public void Next()
     {
-        index++;
-        if (index >= stageData.size)
+        Debug.Log(index);
+        if (index > stageData.states.Count-1)
         {
-            index = stageData.size - 1;
+            index = stageData.states.Count - 1;
             return;
         }
+        if(index < stageData.states.Count)
+            index++;
         State args = stageData.states[index];
         Debug.Log(args.state_type);
         if (args.state_type == "comment")
@@ -175,12 +177,21 @@ public void Next()
     }
     public void Undo()
     {
+        Debug.Log(index);
         if (index <= -1)
+        {
+            index = 0;
             return;
+        }
+
+        if (index >= stageData.states.Count - 1)
+            index = stageData.states.Count - 2;
+
         State args = stageData.states[index];
         if (args.state_type == "comment")
         {
-            index--;
+            if(index >= 0)   
+                index--;
             return;
         }
 
@@ -195,7 +206,8 @@ public void Undo()
 
         BaseStructure currStructure = stageData.objectMap[id];
         currStructure.Undo(args);
-        index--;
+        if(index>=0)
+            index--;
     }
     public void BackButton()
     {

Assets/Scripts/ARgorithm/Animations/QueueAnimator.cs

@@ -156,6 +156,7 @@ public void Pop()
                 arrow.position += new Vector3(arrow.scale.x * 1.25f, 0, 0);
             }
             var arrowFirst = queueOfArrows.First.Value;
+            arrowFirst.arrow.transform.SetParent(null);
             Destroy(arrowFirst.arrow);
             queueOfArrows.RemoveFirst();
         }
@@ -220,5 +221,35 @@ IEnumerator LerpFunctionHighlight(Material materialToChange, Color endValue, flo
             }
             materialToChange.color = startValue;
         }
+
+        public void PopLast()
+        {
+            if (this.queueOfArrows.Count == 0)
+                return;
+            var arrowLast = queueOfArrows.Last.Value;
+            arrowLast.arrow.transform.SetParent(null);
+            Destroy(arrowLast.arrow);
+            queueOfArrows.RemoveLast();
+        }
+
+        public void PushFirst(ContentType element)
+        {
+            var arrow = new VariableArrow(element);
+            if (queueOfArrows.Count == 0)
+            {
+                arrow.position = this.placeholder.transform.position;
+                arrow.arrow.transform.SetParent(placeholder.transform);
+                queueOfArrows.AddFirst(arrow);
+                return;
+            }
+            foreach (var ar in queueOfArrows)
+            {
+                ar.position -= new Vector3(arrow.scale.x * 1.25f, 0, 0);
+            }
+            arrow.position = placeholder.transform.position;
+            arrow.arrow.transform.SetParent(placeholder.transform);
+            queueOfArrows.AddFirst(arrow);
+
+        }
     }
 }

Assets/Scripts/ARgorithm/Animations/StackAnimator.cs

@@ -67,7 +67,7 @@ public VariableTile(ContentType value)
             {
                 this.tile = (GameObject)Instantiate(Resources.Load("Tile") as GameObject);
                 var cubeRenderer = this.tile.GetComponent<Renderer>();
-                cubeRenderer.material.SetColor("_Color", Color.blue);
+                cubeRenderer.material.SetColor("_Color", Color.cyan);
                 this._scale = this.tile.transform.localScale;
                 this.faceValue = value;
             }

Assets/Scripts/ARgorithm/Structure/QueueStructure.cs

@@ -82,7 +82,27 @@ private void Back(State state)
 
         public override void Undo(State state)
         {
-            base.Undo(state);
+            // Called to undo a change enforced by `state`
+            string funcType = state.state_type.Split('_').ToList()[1];
+            switch (funcType)
+            {
+                case "declare":
+                    break;
+                case "push":
+                    animator.PopLast();
+                    break;
+                case "pop":
+                    ContentType element = new ContentType((JToken)state.state_def["element"]);
+                    animator.PushFirst(element);
+                    break;
+                case "front":
+                    break;
+                case "back":
+                    
+                    break;
+                default:
+                    break;
+            }
         }
     }
 }

Assets/Scripts/ARgorithm/Structure/StackStructure.cs

@@ -72,7 +72,23 @@ private void Top(State state)
         }
         public override void Undo(State state)
         {
-            base.Undo(state);
+            string funcType = state.state_type.Split('_').ToList()[1];
+            switch (funcType)
+            {
+                case "declare":
+                    break;
+                case "push":
+                    animator.Pop();
+                    break;
+                case "pop":
+                    var element = new ContentType((JToken)state.state_def["element"]);
+                    animator.Push(element);
+                    break;
+                case "top":
+                    break;
+                default:
+                    break;
+            }
         }
     }
 }