Changeset 5967 for 2015/24/ohjaajat/Dungeon/Dungeon

Timestamp:

2015-06-09 20:35:53 (8 years ago)

Author:

sieerinn

Message:

 

Location:

2015/24/ohjaajat/Dungeon/Dungeon/Dungeon

Files:

• Dungeon.cs (modified) (9 diffs)
• Dungeon.csproj (modified) (1 diff)
• Pathfinding (added)
• Pathfinding/Node.cs (added)
• Pathfinding/NodeState.cs (added)
• Pathfinding/PathFinder.cs (added)
• Pathfinding/SearchParameters.cs (added)

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

@@ -73 +73 @@
     bool digging = false;
 
+    GameObject digArrow;
+    GameObject digArrowHead;
+
     IntMeter kulttuuri = new IntMeter(300, 0, 2000);
 
@@ -84 +87 @@
         UlkoAsuRoskaa();
         Kauppa();
+
+        digArrow = new GameObject(5, 5);
+        digArrowHead = new GameObject(15, 15);
+        digArrowHead.Shape = Shape.Triangle;
+        digArrowHead.IsVisible = digArrow.IsVisible = false;
+        Add(digArrow, 3);
+        Add(digArrowHead, 3);
 
         // Luodaan huoneet ruutuihin.
@@ -156 +166 @@
         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");
     }
@@ -185 +201 @@
         digStart = huone.Location;
         digging = true;
+        digArrowHead.IsVisible = digArrow.IsVisible = true;
     }
 
@@ -190 +207 @@
     {
         digging = false;
+        digArrowHead.IsVisible = digArrow.IsVisible = false;
         if (CanDig()) 
         {
@@ -215 +233 @@
         huone.Roof.Image = kiviKuva;
         huone.Roof.Position = huone.Position;
-        Add(huone.Roof, 2);
+        Add(huone.Roof, 1);
 
         Mouse.ListenOn(huone, MouseButton.Left, ButtonState.Pressed, AsetaHuone, "Asetetaan ostettu huone paikoilleen", huone);
@@ -240 +258 @@
         wall.Image = seinaKuva;
         wall.Angle = suunta.Angle;
-        Add(wall, 1);
+        Add(wall, 0);
         return wall;
     }
@@ -247 +265 @@
     {
         Room kohdeHuone = GetRoom(MuunnaJypelista(Mouse.PositionOnWorld));
+        if (kohdeHuone == null)
+        {
+            return false;
+        }
         int dx = Math.Abs(kohdeHuone.Location.X - digStart.X);
         int dy = Math.Abs(kohdeHuone.Location.Y - digStart.Y);
@@ -252 +274 @@
     }
 
-    protected override void Paint(Canvas canvas)
+    protected override void Update(Time time)
     {
         if (digging)
         {
-            canvas.BrushColor = CanDig() ? Color.Green : Color.Red;
-            canvas.DrawLine(huoneet[digStart.X, digStart.Y].Position, Mouse.PositionOnWorld);
-        }
-        base.Paint(canvas);
-    }
+            Color vari = CanDig() ? Color.Green : Color.Red;
+            Vector alku = huoneet[digStart.X, digStart.Y].Position;
+            Vector loppu = Mouse.PositionOnWorld;
+            Vector suunta = loppu - alku;
+            double pituus = suunta.Magnitude;
+            if (pituus <= 2) pituus = 2;
+
+            digArrow.Color = vari;
+            digArrow.Position = alku + suunta * 0.5;
+            digArrow.Angle = suunta.Angle;
+            digArrow.Width = pituus;
+
+            digArrowHead.Color = vari;
+            digArrowHead.Position = alku + suunta;
+            digArrowHead.Angle = suunta.Angle - Angle.FromDegrees(90);
+        }
+        base.Update(time);
+    }
+
+    #region Reitinlöytö
+
+    void FindPath(Point alku, Point loppu)
+    {
+        bool[,] walkable = new bool[huoneet.GetLength(0), huoneet.GetLength(1)];
+        foreach (var paikka in RuutujenPaikat())
+        {
+            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 :(
+    }
+
+    #endregion
 
     #region Extra Juttuja

2015/24/ohjaajat/Dungeon/Dungeon/Dungeon/Dungeon.csproj

@@ -113 +113 @@
     <Compile Include="Ohjelma.cs" />
     <Compile Include="Dungeon.cs" />
+    <Compile Include="Pathfinding\Node.cs" />
+    <Compile Include="Pathfinding\NodeState.cs" />
+    <Compile Include="Pathfinding\PathFinder.cs" />
+    <Compile Include="Pathfinding\SearchParameters.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>