X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fcarfire;a=blobdiff_plain;f=CarFire%2FCarFire%2FCarFire%2FMovementManager.cs;h=ad26e478a317f8921f9b14e512f97f9df2690e42;hp=10f6ba22f85d8e1326522aad7638d8ac2a9538d9;hb=9fc306c489b446612f0fc1b363e490a5ff217d2c;hpb=109c7d277adc8e347600922fea6a8d73d4c5f01c

diff --git a/CarFire/CarFire/CarFire/MovementManager.cs b/CarFire/CarFire/CarFire/MovementManager.cs
index 10f6ba2..ad26e47 100644
--- a/CarFire/CarFire/CarFire/MovementManager.cs
+++ b/CarFire/CarFire/CarFire/MovementManager.cs
@@ -18,7 +18,8 @@ namespace CarFire
         UpperRight,
         Right,
         LowerRight,
-        LowerLeft
+        LowerLeft,
+        None
     }
 
 
@@ -43,7 +44,7 @@ namespace CarFire
         /// Get the grid coordinates where the object is at or
         /// is moving to.
         /// </summary>
-        public Point Coordinates { get { return mCoordinates; } }
+        public Point Coordinates { get { return mCoordinates; } set { mCoordinates = value; } }
 
         /// <summary>
         /// Get and set the speed of movement in grid cells / second.
@@ -102,6 +103,24 @@ namespace CarFire
             Update(timeSpan, false, false, false, false);
         }
 
+        /// <summary>
+        /// Update the movement manager with the timeslice and a direction.
+        /// </summary>
+        /// <param name="timeSpan">The timeslice.</param>
+        /// <param name="direction">Direction you want to move.</param>
+        public void Update(TimeSpan timeSpan, Direction direction)
+        {
+            if (direction == Direction.Left) Update(timeSpan, true, false, false, false);
+            else if (direction == Direction.UpperLeft) Update(timeSpan, true, false, true, false);
+            else if (direction == Direction.Up) Update(timeSpan, false, false, true, false);
+            else if (direction == Direction.UpperRight) Update(timeSpan, false, true, true, false);
+            else if (direction == Direction.Right) Update(timeSpan, false, true, false, false);
+            else if (direction == Direction.LowerRight) Update(timeSpan, false, true, false, true);
+            else if (direction == Direction.Down) Update(timeSpan, false, false, false, true);
+            else if (direction == Direction.LowerLeft) Update(timeSpan, true, false, false, true);
+            else Update(timeSpan);
+        }
+
         /// <summary>
         /// Update the movement manager with the timeslice and the directions
         /// the object is supposed to go.  The directions will be ignored if the
@@ -152,10 +171,31 @@ namespace CarFire
                 RecalculatePosition(alpha);
             }
         }
+        public void LockUpdate(TimeSpan timeSpan, bool moveLeft, bool moveRight, bool moveUp, bool moveDown)
+        {
+            float passedTime = (float)timeSpan.TotalSeconds;
+            if (moveLeft == true || moveRight == true || moveUp == true || moveDown == true)
+            {
+                mDirection = GetDirection(moveLeft, moveRight, moveUp, moveDown);
+            }
+            if (mIsMoving)
+            {
+                mTimeAccumulator += passedTime;
+
+                float alpha = mTimeAccumulator / mInverseSpeed;
+                if (alpha >= 1.0f)
+                {
+                    mIsMoving = false;
+                    alpha = 1.0f;
+                }
+
+                RecalculatePosition(alpha);
+            }
+        }
 
 
         /// <summary>
-        /// Helper method to get neighbor cells from a point and directions.
+        /// Helper method to get a neighbor cell from a point and directions.
         /// </summary>
         /// <param name="point">The point.</param>
         /// <param name="left">To the left.</param>
@@ -163,7 +203,7 @@ namespace CarFire
         /// <param name="up">Above.</param>
         /// <param name="down">Below.</param>
         /// <returns>The neighbor cell coordinates.</returns>
-        public static Point GetNeighborCell(Point point, bool left, bool right, bool up, bool down)
+        public static Point GetNeighbor(Point point, bool left, bool right, bool up, bool down)
         {
             if (left) point.X--;
             if (right) point.X++;
@@ -172,6 +212,43 @@ namespace CarFire
             return point;
         }
 
+        /// <summary>
+        /// Helper method to get a neighbor cell from a point and a direction.
+        /// </summary>
+        /// <param name="point">The point.</param>
+        /// <param name="direction">The direction.</param>
+        /// <returns>The neighbor cell coordinates.</returns>
+        public static Point GetNeighbor(Point point, Direction direction)
+        {
+            switch (direction)
+            {
+                case Direction.Left: return new Point(point.X - 1, point.Y);
+                case Direction.UpperLeft: return new Point(point.X - 1, point.Y - 1);
+                case Direction.Up: return new Point(point.X, point.Y - 1);
+                case Direction.UpperRight: return new Point(point.X + 1, point.Y - 1);
+                case Direction.Right: return new Point(point.X + 1, point.Y);
+                case Direction.LowerRight: return new Point(point.X + 1, point.Y + 1);
+                case Direction.Down: return new Point(point.X, point.Y + 1);
+                case Direction.LowerLeft: return new Point(point.X - 1, point.Y + 1);
+            }
+            return point;
+        }
+
+        /// <summary>
+        /// Helper method to get the two neighbor cells of two nearby cells.
+        /// </summary>
+        /// <param name="a">A point.</param>
+        /// <param name="b">Another point.</param>
+        /// <returns>An array of two points representing the neighbor cells.</returns>
+        public static Point[] GetNeighbors(Point a, Point b)
+        {
+            Point[] neighbors = new Point[2];
+            neighbors[0] = new Point(a.X, b.Y);
+            neighbors[1] = new Point(b.X, a.Y);
+            return neighbors;
+        }
+
+
         /// <summary>
         /// Helper method to get a Direction type from directions.
         /// </summary>
@@ -199,6 +276,34 @@ namespace CarFire
             else return Direction.None;
         }
 
+        /// <summary>
+        /// Helper method to get the general Direction type if you want to move
+        /// from one cell to another.
+        /// <param name="a">Starting point.</param>
+        /// <param name="b">Destination point.</param>
+        /// <returns>The direction toward the cell.</returns>
+        public static Direction GetDirection(Point a, Point b)
+        {
+            int dx = b.X - a.X;
+            int dy = b.Y - a.Y;
+
+            if (dx < 0)
+            {
+                if (dy < 0) return Direction.UpperLeft;
+                else if (dy > 0) return Direction.LowerLeft;
+                else return Direction.Left;
+            }
+            else if (dx > 0)
+            {
+                if (dy < 0) return Direction.UpperRight;
+                else if (dy > 0) return Direction.LowerRight;
+                else return Direction.Right;
+            }
+            else if (dy < 0) return Direction.Up;
+            else if (dy > 0) return Direction.Down;
+            else return Direction.None;
+        }
+
         #endregion
 
 
@@ -206,7 +311,7 @@ namespace CarFire
 
         void RecalculatePosition(float alpha)
         {
-            Console.WriteLine("last: " + mLastCoordinates + ", now: " + mCoordinates + ", alpha: " + alpha);
+            //Console.WriteLine("last: " + mLastCoordinates + ", now: " + mCoordinates + ", alpha: " + alpha);
             mPosition.X = (float)mLastCoordinates.X + alpha * ((float)mCoordinates.X - (float)mLastCoordinates.X);
             mPosition.Y = (float)mLastCoordinates.Y + alpha * ((float)mCoordinates.Y - (float)mLastCoordinates.Y);
         }
@@ -214,7 +319,7 @@ namespace CarFire
         void UpdateCoordinates(bool moveLeft, bool moveRight, bool moveUp, bool moveDown)
         {
             mLastCoordinates = mCoordinates;
-            mCoordinates = GetNeighborCell(mCoordinates, moveLeft, moveRight, moveUp, moveDown);
+            mCoordinates = GetNeighbor(mCoordinates, moveLeft, moveRight, moveUp, moveDown);
 
             if ((moveLeft && moveUp) || (moveUp && moveRight) || (moveRight && moveDown) || (moveDown && moveLeft))
             {