Changeset 5969 for 2015/24

Timestamp:

2015-06-09 21:12:52 (8 years ago)

Author:

sieerinn

Message:

Reitinlöytö toimii.

Location:

2015/24/ohjaajat/Dungeon/Dungeon/Dungeon

Files:

• Dungeon.cs (modified) (3 diffs)
• Pathfinding/PathFinder.cs (modified) (4 diffs)

2015/24/ohjaajat/Dungeon/Dungeon/Dungeon/Dungeon.cs

@@ -164 +164 @@
         Keyboard.Listen(Key.F1, ButtonState.Pressed, Begin, null);
 
-        // Testi haku huoneesta (0, 0) -> (5, 5).
-        Keyboard.Listen(Key.F2, ButtonState.Pressed, delegate
-        {
-            FindPath(new Point(0, 0), new Point(5, 5));
-        }, null);
-
         Keyboard.Listen(Key.Space, ButtonState.Pressed, SeuraavaAalto, "Anna kivan barbaariaallon tulla");
     }
@@ -292 +286 @@
             digArrowHead.Angle = suunta.Angle - Angle.FromDegrees(90);
         }
+
         base.Update(time);
     }
 
+    protected override void Paint(Canvas canvas)
+    {
+        canvas.BrushColor = Color.Purple;
+
+        var points = FindPath(new Point(6, 0), MuunnaJypelista(Mouse.PositionOnWorld));
+        for (int i = 0; i < points.Count - 1; i++)
+        {
+            Vector v = new Vector(points[i].X - huoneet.GetLength(0) / 2, points[i].Y - huoneet.GetLength(1) / 2) * RUUDUN_KOKO;
+            Vector v2 = new Vector(points[i+1].X - huoneet.GetLength(0) / 2, points[i+1].Y - huoneet.GetLength(1) / 2) * RUUDUN_KOKO;
+            canvas.DrawLine(v, v2);
+        }
+
+        base.Paint(canvas);
+    }
+
     #region Reitinlöytö
 
-    void FindPath(Point alku, Point loppu)
-    {
+    List<Point> FindPath(Point alku, Point loppu)
+    {
+        if (GetRoom(alku) == null || GetRoom(loppu) == null)
+            return new List<Point>();
+
         bool[,] walkable = new bool[huoneet.GetLength(0), huoneet.GetLength(1)];
         foreach (var paikka in RuutujenPaikat())
@@ -304 +317 @@
             walkable[paikka.X, paikka.Y] = huoneet[paikka.X, paikka.Y].Dug;
         }
-        var finder = new AStar.PathFinder(new AStar.SearchParameters(alku, loppu, walkable));
-        List<Point> path = finder.FindPath();
-        // Ei ota huomioon ovia :(
+        var finder = new AStar.PathFinder(new AStar.SearchParameters(alku, loppu, walkable), OviTarkistus);
+        return finder.FindPath();
+    }
+
+    bool OviTarkistus(Point a, Point b)
+    {
+        Room ra = GetRoom(a);
+        Room rb = GetRoom(b);
+        Direction suunta = (new Vector(b.X, b.Y) - new Vector(a.X, a.Y)).Angle.MainDirection;
+        if (ra != null && rb != null)
+        {
+            return ra.Walls[suunta].Image == reikaSeinaKuva && rb.Walls[Direction.Inverse(suunta)].Image == reikaSeinaKuva;
+        }
+        return false;
     }
 

2015/24/ohjaajat/Dungeon/Dungeon/Dungeon/Pathfinding/PathFinder.cs

@@ -16 +16 @@
         private Node endNode;
         private SearchParameters searchParameters;
+        private Func<Point, Point, bool> extraCheck;
 
         /// <summary>
@@ -21 +22 @@
         /// </summary>
         /// <param name="searchParameters"></param>
-        public PathFinder(SearchParameters searchParameters)
+        public PathFinder(SearchParameters searchParameters, Func<Point, Point, bool> extraCheck)
         {
+            this.extraCheck = extraCheck;
             this.searchParameters = searchParameters;
             InitializeNodes(searchParameters.Map);
@@ -134 +136 @@
                     continue;
 
+                if (!extraCheck(fromNode.Location, location))
+                    continue;
+
                 // Already-open nodes are only added to the list if their G-value is lower going via this route.
                 if (node.State == NodeState.Open)
@@ -166 +171 @@
             return new Point[]
             {
-                new Point(fromLocation.X-1, fromLocation.Y-1),
+                //new Point(fromLocation.X-1, fromLocation.Y-1),
                 new Point(fromLocation.X-1, fromLocation.Y  ),
-                new Point(fromLocation.X-1, fromLocation.Y+1),
+                //new Point(fromLocation.X-1, fromLocation.Y+1),
                 new Point(fromLocation.X,   fromLocation.Y+1),
-                new Point(fromLocation.X+1, fromLocation.Y+1),
+                //new Point(fromLocation.X+1, fromLocation.Y+1),
                 new Point(fromLocation.X+1, fromLocation.Y  ),
-                new Point(fromLocation.X+1, fromLocation.Y-1),
+                //new Point(fromLocation.X+1, fromLocation.Y-1),
                 new Point(fromLocation.X,   fromLocation.Y-1)
             };