babbot-svn Mailing List for BabBot

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Revision: 494
          http://babbot.svn.sourceforge.net/babbot/?rev=494&view=rev
Author:   yetihunter
Date:     2010-04-13 22:04:55 +0000 (Tue, 13 Apr 2010)

Log Message:
-----------
Added CalculatePath methods to Caronte for generating paths with specific character dimensions. Not tested yet. 

Modified Paths:
--------------
    trunk/Caronte/Graph/PathGraph.cs
    trunk/Caronte/Program.cs

Modified: trunk/Caronte/Graph/PathGraph.cs
===================================================================

--- trunk/Caronte/Graph/PathGraph.cs	2010-03-03 09:31:10 UTC (rev 493)
+++ trunk/Caronte/Graph/PathGraph.cs	2010-04-13 22:04:55 UTC (rev 494)
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Threading;
 
 using WowTriangles;
@@ -9,8 +8,8 @@
 {
 	public class PathGraph
 	{
-		public const float toonHeight = 2.0f;
-		public const float toonSize = 0.5f;
+		public float toonHeight = 2.0f;
+		public float toonSize = 0.5f;
 
 		public const float MinStepLength = 2f;
 		public const float WantedStepLength = 3f;
@@ -35,9 +34,7 @@
 		long LRU = 0;
 
 
-		public PathGraph(string continent,
-						 ChunkedTriangleCollection triangles,
-						 TriangleCollection paint)
+		public PathGraph(string continent, ChunkedTriangleCollection triangles, TriangleCollection paint)
 		{
 			this.Continent = continent;
 			this.triangleWorld = triangles;
@@ -46,14 +43,10 @@
 		}
 
 		public void Close()
-		{
-			triangleWorld.Close();
-		}
+		{ triangleWorld.Close(); }
 
 		public void Clear()
-		{
-			chunks = new SparseMatrix2D<GraphChunk>(8);
-		}
+		{ chunks = new SparseMatrix2D<GraphChunk>(8); }
 
 		private void GetChunkCoord(float x, float y, out int ix, out int iy)
 		{
@@ -508,10 +501,7 @@
 		// return null if failed or the last spot in the path found
 
 		int searchID = 0;
-		private Spot search(Spot src, Spot dst,
-							Location realDst,
-							float minHowClose, bool AllowInvented,
-							ILocationHeuristics locationHeuristics)
+		private Spot search(Spot src, Spot dst, Location realDst, float minHowClose, bool AllowInvented, ILocationHeuristics locationHeuristics)
 		{
 			searchID++;
 			int count = 0;
@@ -868,5 +858,11 @@
 			//Console.WriteLine(s); 
 			Console.WriteLine(s);
 		}
+        public Path CreatePath(Location origin, Location destination, float dist, float hight, float radius)
+        {
+            this.toonHeight = hight;
+            this.toonSize = radius;
+            return CreatePath(origin, destination, dist);
+        }
 	}
 }

Modified: trunk/Caronte/Program.cs
===================================================================
--- trunk/Caronte/Program.cs	2010-03-03 09:31:10 UTC (rev 493)
+++ trunk/Caronte/Program.cs	2010-04-13 22:04:55 UTC (rev 494)
@@ -17,19 +17,16 @@
     along with PPather.  If not, see <http://www.gnu.org/licenses/>.
 
 */
-
-
-
 using System;
+using WowTriangles;
 
-
 namespace Caronte
 {
     public class Caronte
     {
         private string continent;
-        private WowTriangles.MPQTriangleSupplier mpq;
-        private WowTriangles.ChunkedTriangleCollection triangleWorld;
+        private MPQTriangleSupplier mpq;
+        private ChunkedTriangleCollection triangleWorld;
 
         private Pather.Graph.PathGraph world;
 
@@ -37,14 +34,13 @@
         {
             set { world.Cancel = value; }
         }
-
         public void Init(string iContinent)
         {
             continent = iContinent;
 
-            mpq = new WowTriangles.MPQTriangleSupplier();
+            mpq = new MPQTriangleSupplier();
             mpq.SetContinent(continent);
-            triangleWorld = new WowTriangles.ChunkedTriangleCollection(512);
+            triangleWorld = new ChunkedTriangleCollection(512);
             triangleWorld.SetMaxCached(9);
             triangleWorld.AddSupplier(mpq);
 
@@ -56,116 +52,118 @@
             world = new Pather.Graph.PathGraph(continent, triangleWorld, null);
 
         }
-
-        public Pather.Graph.Path CalculatePath(Pather.Graph.Location iOrigin, 
-                                                    Pather.Graph.Location iDestination)
+        public Pather.Graph.Path CalculatePath(Pather.Graph.Location iOrigin, Pather.Graph.Location iDestination)
         {
             return CalculatePath(iOrigin, iDestination, 5F);
         }
 
-        public Pather.Graph.Path CalculatePath(Pather.Graph.Location iOrigin, 
-                                    Pather.Graph.Location iDestination, float sDist)
+        public Pather.Graph.Path CalculatePath(Pather.Graph.Location iOrigin, Pather.Graph.Location iDestination, float sDist)
         {
-            // We try to find a path 
-
             Pather.Graph.Path mypath = world.CreatePath(iOrigin, iDestination, sDist);
-
             /* We save the PathGraph. Stores every chunk of the map we used in the 
                PPather\PathInfo\{map} folder */
-
             world.Save();
-
             return mypath;
         }
+        public Pather.Graph.Path CalculatePath(Pather.Graph.Location iOrigin, Pather.Graph.Location iDestination, float charHight, float charRadius)
+        {
+            return CalculatePath(iOrigin, iDestination, 5f, charHight, charRadius);
+        }
+        public Pather.Graph.Path CalculatePath(Pather.Graph.Location iOrigin, Pather.Graph.Location iDestination, float sDist, float charHight, float charRadius)
+        {
+            Pather.Graph.Path mypath = world.CreatePath(iOrigin, iDestination, sDist, charHight, charRadius);
+            world.Save();
+            return mypath;
+        }
     }
     
     class Program
     {
-        static void Main(string[] args)
+        static void Main()
         {
 
-            /* This init code is almost copy/pasted from PPather. Depending of where
-            yo are, you can replace Kalimdor with one of:
-            AhnQiraj
-            AhnQirajTemple
-            AlliancePVPBarracks
-            AuchindounDemon
-            AuchindounDraenei
-            AuchindounEthereal
-            AuchindounShadow
-            Azeroth
-            Blackfathom
-            BlackrockDepths
-            BlackRockSpire
-            BlackTemple
-            BlackwingLair
-            bladesedgearena
-            CavernsOfTime
-            CoilfangDraenei
-            CoilfangMarsh
-            CoilfangPumping
-            CoilfangRaid
-            Collin
-            CraigTest
-            DalaranArena
-            DeadminesInstance
-            DeeprunTram
-            development_nonweighted
-            DireMaul
-            EmeraldDream
-            Expansion01
-            GnomeragonInstance
-            GruulsLair
-            HellfireDemon
-            HellfireMilitary
-            HellfireRaid
-            HellfireRampart
-            HillsbradPast
-            HordePVPBarracks
-            HyjalPast
-            Kalimdor
-            Karazahn
-            Mauradon
-            MoltenCore
-            Monastery
-            MonasteryInstances
-            NetherstormBG
-            OnyxiaLairInstance
-            OrgrimmarArena
-            OrgrimmarInstance
-            PVPLordaeron
-            PVPZone01
-            PVPZone02
-            PVPZone03
-            PVPZone04
-            PVPZone05
-            RazorfenDowns
-            RazorfenKraulInstance
-            SchoolofNecromancy
-            ScottTest
-            Shadowfang
-            StormwindJail
-            StormwindPrison
-            Stratholme
-            SunkenTemple
-            Sunwell5Man
-            Sunwell5ManFix
-            SunwellPlateau
-            TanarisInstance
-            TempestKeepArcane
-            TempestKeepAtrium
-            TempestKeepFactory
-            TempestKeepRaid
-            test
-            Uldaman
-            WailingCaverns
-            Zul'gurub
-            ZulAman
-            */
+            //This init code is almost copy/pasted from PPather. Depending of where
+            //yo are, you can replace Kalimdor with one of:
+            //AhnQiraj
+            //AhnQirajTemple
+            //AlliancePVPBarracks
+            //AuchindounDemon
+            //AuchindounDraenei
+            //AuchindounEthereal
+            //AuchindounShadow
+            //Azeroth
+            //Blackfathom
+            //BlackrockDepths
+            //BlackRockSpire
+            //BlackTemple
+            //BlackwingLair
+            //bladesedgearena
+            //CavernsOfTime
+            //CoilfangDraenei
+            //CoilfangMarsh
+            //CoilfangPumping
+            //CoilfangRaid
+            //Collin
+            //CraigTest
+            //DalaranArena
+            //DeadminesInstance
+            //DeeprunTram
+            //development_nonweighted
+            //DireMaul
+            //EmeraldDream
+            //Expansion01
+            //GnomeragonInstance
+            //GruulsLair
+            //HellfireDemon
+            //HellfireMilitary
+            //HellfireRaid
+            //HellfireRampart
+            //HillsbradPast
+            //HordePVPBarracks
+            //HyjalPast
+            //Kalimdor
+            //Karazahn
+            //Mauradon
+            //MoltenCore
+            //Monastery
+            //MonasteryInstances
+            //NetherstormBG
+            //OnyxiaLairInstance
+            //OrgrimmarArena
+            //OrgrimmarInstance
+            //PVPLordaeron
+            //PVPZone01
+            //PVPZone02
+            //PVPZone03
+            //PVPZone04
+            //PVPZone05
+            //RazorfenDowns
+            //RazorfenKraulInstance
+            //SchoolofNecromancy
+            //ScottTest
+            //Shadowfang
+            //StormwindJail
+            //StormwindPrison
+            //Stratholme
+            //SunkenTemple
+            //Sunwell5Man
+            //Sunwell5ManFix
+            //SunwellPlateau
+            //TanarisInstance
+            //TempestKeepArcane
+            //TempestKeepAtrium
+            //TempestKeepFactory
+            //TempestKeepRaid
+            //test
+            //Uldaman
+            //WailingCaverns
+            //Zul'gurub
+            //ZulAman
+            
 
-            WowTriangles.MPQTriangleSupplier mpq = new WowTriangles.MPQTriangleSupplier();
+            var mpq = new MPQTriangleSupplier();
             mpq.SetContinent("Expansion01");
-            WowTriangles.ChunkedTriangleCollection triangleWorld = new WowTriangles.ChunkedTriangleCollection(512);
+            var triangleWorld = new ChunkedTriangleCollection(512);
             triangleWorld.SetMaxCached(9);
             triangleWorld.AddSupplier(mpq);
 
@@ -174,24 +172,24 @@
             /* After the init routines we create a PathGraph object (as before
                you can replace Kalimdor with whatever you need */
 
-            Pather.Graph.PathGraph world = new Pather.Graph.PathGraph("Expansion01", triangleWorld, null);
+            var world = new Pather.Graph.PathGraph("Expansion01", triangleWorld, null);
 
 
 
 
             // Here we define the starting point (somewhere in the orc noob village)
 
-            Pather.Graph.Location origin = new Pather.Graph.Location(240.94f, 2692.39f, 89.74f);
+            var origin = new Pather.Graph.Location(240.94f, 2692.39f, 89.74f);
 
 
 
             // Here we define our destination (somewhere in Razor Hill)
 
-            Pather.Graph.Location destination = new Pather.Graph.Location(189.63f, 2690.94f, 88.71f);
+            var destination = new Pather.Graph.Location(189.63f, 2690.94f, 88.71f);
 
             // We try to find a path 
 
-            Pather.Graph.Path mypath = world.CreatePath(origin, destination, 5f);
+            var mypath = world.CreatePath(origin, destination, 5f);
 
             /* We save the PathGraph. Stores every chunk of the map we used in the 
                PPather\PathInfo\{map} folder */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




babbot-svn Mailing List for BabBot

babbot-svn — SVN Log