Reverting wanderers

Author: liunicholas6

Assets/Scripts/MyDebug/DebugRenderer.cs

@@ -28,7 +28,6 @@ public class DebugRenderer : MonoBehaviour
         /*** Move stuff ***/ 
         private float lerpDuration = 1.0f; // You can adjust the duration to control the speed of movement
         private float lerpStartTime;
-        private BezierCurveMover curveMover;
         /*
         private bool justEntered = false;
         */

Assets/Scripts/Navigation/Wanderer.cs

@@ -21,11 +21,11 @@ public class Wanderer : MonoBehaviour {
         public bool justEntered = false;
 
         // MOVEMENT
-        private const float Velocity = 1.0f;
         private float lerpDuration = 1.5f; // You can adjust the duration to control the speed of movement
         private float lerpDurationRoom= 10.0f;
         private float lerpStartTime;
 
+        // yum BEZIER STUFF
         private List<Vector2> controlPoints;
         private float movementDuration;
 
@@ -40,28 +40,27 @@ public void Initialize(Graph navGraph, EdgeInfo start, EdgeInfo end, PathFinder
         }
 
 
-        void Update(){
-            if (!isInRoom) {
-                if (!isMoving  && path.Count > 0) {
+        void Update()
+        {
+            if (isInRoom) return;
+            if (!isMoving  && path.Count > 0) {
                 currEdge = path.Pop();
                 StartCoroutine(MoveToTarget(currEdge.Curve));
                 if (currEdge.Tag == EdgeTag.Doorway && justEntered == false)
-                        {
-                            isInRoom = true;
-                            StartCoroutine(EnterRoom(currEdge));
-                        }
-                        else
-                        {
-                            justEntered = false;
-                            StartCoroutine(MoveToTarget(currEdge.Curve)); 
-                        }
-                  
+                {
+                    isInRoom = true;
+                    StartCoroutine(EnterRoom(currEdge));
+                }
+                else
+                {
+                    justEntered = false;
+                    StartCoroutine(MoveToTarget(currEdge.Curve)); 
                 }
-                 else if (path.Count == 0) {
+                  
+            }
+            else if (path.Count == 0) {
                 endEdge = navGraph.GetRandomEdge();
                 path = pathFinder.FindPath(currEdge, endEdge);
-                }
-
             }
         }
 
@@ -90,75 +89,53 @@ private IEnumerator MoveToTarget(ICurve curve)
                 }
         private IEnumerator EnterRoom(EdgeInfo edge)
         {
-            var vertexInfo = navGraph.GetVertex(edge.ToVertex);
-            var controls = new Vector3[4];
-            controls[0] = edge.Curve.Point(0);
-            controls[1] = vertexInfo.region.RandPoint();
-            controls[2] = vertexInfo.region.RandPoint();
-            controls[3] = edge.Curve.Point(1);
-            BezierCurve bezier = new BezierCurve(controls);
-
-            var length = bezier.Length();
-            var timeInRoom = length / Velocity;
+            List<Vector2> randomPoints = new List<Vector2>();
+            randomPoints.Add(currEdge.Curve.Point(1));
+            int points = UnityEngine.Random.Range(4, 10);
 
-            //
-            // List<Vector2> randomPoints = new List<Vector2>();
-            // randomPoints.Add(currEdge.Curve.Point(1));
-            // int points = UnityEngine.Random.Range(4, 10);
-            //
-            // for (int i = 0; i < 5; i++)  
-            // {
-            //     Vector2 randomPoint = navGraph.GetVertices()[edge.ToVertex].region.RandPoint(); 
-            //     randomPoints.Add(randomPoint);
-            // }
+            for (int i = 0; i < 5; i++)  
+            {
+                Vector2 randomPoint = navGraph.GetVertex(edge.ToVertex).region.RandPoint(); 
+                randomPoints.Add(randomPoint);
+            }
 
             //changed post exit code
             var exit = path.Pop();
-            //randomPoints.Add(exit.Curve.Point(0));
+            randomPoints.Add(exit.Curve.Point(0));
             path = pathFinder.FindPath(exit, navGraph.GetRandomEdge());
-            
             lerpStartTime = Time.time;
             Vector2 startPosition = this.Position;
-            
             while (Time.time - lerpStartTime < lerpDurationRoom)
             {
                 float t = (Time.time - lerpStartTime) / lerpDuration;
-                //Vector2 bezierPosition = DeCasteljauRecursive(randomPoints, t);
-                //MoveTo(bezierPosition);
+                Vector2 bezierPosition = DeCasteljauRecursive(randomPoints, t);
+                MoveTo(bezierPosition);
                 yield return null;
             }
-            
+                
             justEntered = true;
             isInRoom = false;
             yield return null;
+
         }
 
-            private Vector2 DeCasteljauRecursive(List<Vector2> points, float t)
+        private Vector2 DeCasteljauRecursive(List<Vector2> points, float t)
+        {
+            if (points.Count == 1)
             {
-                if (points.Count == 1)
-                {
-                    return points[0];
-                }
-
-                List<Vector2> newPoints = new List<Vector2>();
-                for (int i = 0; i < points.Count - 1; i++)
-                {
-                    Vector2 newPoint = Vector2.Lerp(points[i], points[i + 1], t);
-                    newPoints.Add(newPoint);
-                }
-
-                return DeCasteljauRecursive(newPoints, t);
+                return points[0];
             }
 
+            List<Vector2> newPoints = new List<Vector2>();
+            for (int i = 0; i < points.Count - 1; i++)
+            {
+                Vector2 newPoint = Vector2.Lerp(points[i], points[i + 1], t);
+                newPoints.Add(newPoint);
+            }
 
-
-        
+            return DeCasteljauRecursive(newPoints, t);
+        }
     }
-  
-
-
-
-
 }
 
 

Assets/Scripts/Navigation/WandererManage.cs

@@ -17,9 +17,9 @@ public class WandererManager : MonoBehaviour {
         private bool isInitialized = false;
 
         public void Initialize(Graph graph) {
-                navGraph = graph;
-                isInitialized = true;
-            }
+            navGraph = graph;
+            isInitialized = true;
+        }
 
         void Start() {
 
@@ -37,7 +37,6 @@ void Start() {
                 wanderers.Add(wander);
                 _drawables.Add(new DebugSquare() {position = wander.Position});
             }
-
         }
 
         void Update() {