Skip to content
This repository has been archived by the owner on Dec 14, 2024. It is now read-only.

Commit

Permalink
Merge pull request #64 from Barsonax/v2.2.0
Browse files Browse the repository at this point in the history
V2.2.0
  • Loading branch information
Barsonax authored Feb 18, 2018
2 parents 5ac569e + 4001d35 commit bfc9c05
Show file tree
Hide file tree
Showing 129 changed files with 16,895 additions and 1,739 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -144,3 +144,8 @@
/Source/Code/Pathfindax.Example/bin
/Source/Code/Pathfindax.Example/obj
/.vs
/Source/Code/Pathfindax.Benchmarks/obj
/Source/Code/Pathfindax.Benchmarks/bin
*.psess
*.vspx
/OpenAL32.dll
2 changes: 1 addition & 1 deletion AppData.dat
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<startScene dataType="Struct" type="Duality.ContentRef`1[[Duality.Resources.Scene]]">
<contentPath dataType="String">Data\Examples\PotentialFieldPathfinderExample.Scene.res</contentPath>
</startScene>
<version dataType="UInt">1861</version>
<version dataType="UInt">2121</version>
<websiteUrl dataType="String">http://www.adamslair.net</websiteUrl>
</root>
<!-- XmlFormatterBase Document Separator -->
9 changes: 5 additions & 4 deletions Data/Examples/BigMapExample.Scene.res
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,7 @@
</item>
<item dataType="Struct" type="Duality.Plugins.Pathfindax.Components.AstarPathfinderComponent" id="2699352515">
<_x003C_AmountOfThreads_x003E_k__BackingField dataType="Int">1</_x003C_AmountOfThreads_x003E_k__BackingField>
<_x003C_Heuristic_x003E_k__BackingField dataType="Struct" type="Pathfindax.Algorithms.ManhattanDistance" id="2870379281" />
<_x003C_MaxClearance_x003E_k__BackingField dataType="Int">5</_x003C_MaxClearance_x003E_k__BackingField>
<active dataType="Bool">true</active>
<gameobj dataType="ObjectRef">612087133</gameobj>
Expand Down Expand Up @@ -433,13 +434,13 @@
<ignoreParent dataType="Bool">false</ignoreParent>
<parentTransform />
<pos dataType="Struct" type="Duality.Vector3">
<X dataType="Float">-3993.3335</X>
<Y dataType="Float">2566.6665</Y>
<X dataType="Float">2896</X>
<Y dataType="Float">2160</Y>
<Z dataType="Float">0</Z>
</pos>
<posAbs dataType="Struct" type="Duality.Vector3">
<X dataType="Float">-3993.3335</X>
<Y dataType="Float">2566.6665</Y>
<X dataType="Float">2896</X>
<Y dataType="Float">2160</Y>
<Z dataType="Float">0</Z>
</posAbs>
<scale dataType="Float">1</scale>
Expand Down
2,463 changes: 2,457 additions & 6 deletions Data/Examples/FlowFieldPathfinderExample.Scene.res

Large diffs are not rendered by default.

28 changes: 13 additions & 15 deletions Data/Examples/NonGridRandomMapExample.Scene.res
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,7 @@
<active dataType="Bool">true</active>
<gameobj dataType="ObjectRef">2586665865</gameobj>
</item>
<item dataType="Struct" type="Duality.Plugins.Pathfindax.Components.AstarPathfinderComponent" id="378963951">
<_x003C_AmountOfThreads_x003E_k__BackingField dataType="Int">1</_x003C_AmountOfThreads_x003E_k__BackingField>
<_x003C_MaxClearance_x003E_k__BackingField dataType="Int">5</_x003C_MaxClearance_x003E_k__BackingField>
<_x003C_Pathfinder_x003E_k__BackingField />
<_x003C_PathfinderId_x003E_k__BackingField />
<active dataType="Bool">true</active>
<gameobj dataType="ObjectRef">2586665865</gameobj>
</item>
<item dataType="Struct" type="Duality.Plugins.Pathfindax.Examples.Components.NonGridMouseClickPathfinder" id="1982292920">
<_pathStart />
<_x003C_AgentSize_x003E_k__BackingField dataType="Byte">0</_x003C_AgentSize_x003E_k__BackingField>
<_x003C_Camera_x003E_k__BackingField dataType="Struct" type="Duality.Components.Camera" id="1673634481">
<active dataType="Bool">true</active>
Expand Down Expand Up @@ -118,21 +109,28 @@
</_x003C_Camera_x003E_k__BackingField>
<_x003C_CollisionCategory_x003E_k__BackingField dataType="Enum" type="Pathfindax.Nodes.PathfindaxCollisionCategory" name="Cat1" value="1" />
<_x003C_Path_x003E_k__BackingField />
<_x003C_PathfinderComponent_x003E_k__BackingField dataType="ObjectRef">378963951</_x003C_PathfinderComponent_x003E_k__BackingField>
<_x003C_PathfinderComponent_x003E_k__BackingField dataType="Struct" type="Duality.Plugins.Pathfindax.Components.AstarPathfinderComponent" id="378963951">
<_x003C_AmountOfThreads_x003E_k__BackingField dataType="Int">1</_x003C_AmountOfThreads_x003E_k__BackingField>
<_x003C_Heuristic_x003E_k__BackingField dataType="Struct" type="Pathfindax.Algorithms.ManhattanDistance" id="453066723" />
<_x003C_MaxClearance_x003E_k__BackingField dataType="Int">5</_x003C_MaxClearance_x003E_k__BackingField>
<active dataType="Bool">true</active>
<gameobj dataType="ObjectRef">2586665865</gameobj>
</_x003C_PathfinderComponent_x003E_k__BackingField>
<active dataType="Bool">true</active>
<gameobj dataType="ObjectRef">2586665865</gameobj>
</item>
<item dataType="Struct" type="Duality.Plugins.Pathfindax.Components.NodeNetworkVisualizer" id="2498494768">
<item dataType="Struct" type="Duality.Plugins.Pathfindax.Components.PathVisualizer" id="4019338063">
<_x003C_BoundRadius_x003E_k__BackingField dataType="Float">0</_x003C_BoundRadius_x003E_k__BackingField>
<_x003C_CollisionCategory_x003E_k__BackingField dataType="Enum" type="Pathfindax.Nodes.PathfindaxCollisionCategory" name="Cat1" value="1" />
<_x003C_NodeSize_x003E_k__BackingField dataType="Float">5</_x003C_NodeSize_x003E_k__BackingField>
<_x003C_Thread_x003E_k__BackingField dataType="Int">0</_x003C_Thread_x003E_k__BackingField>
<_x003C_Visualize_x003E_k__BackingField dataType="Bool">true</_x003C_Visualize_x003E_k__BackingField>
<active dataType="Bool">true</active>
<gameobj dataType="ObjectRef">2586665865</gameobj>
</item>
<item dataType="Struct" type="Duality.Plugins.Pathfindax.Components.PathVisualizer" id="4019338063">
<item dataType="ObjectRef">378963951</item>
<item dataType="Struct" type="Duality.Plugins.Pathfindax.Components.NodeNetworkVisualizer" id="2498494768">
<_x003C_BoundRadius_x003E_k__BackingField dataType="Float">0</_x003C_BoundRadius_x003E_k__BackingField>
<_x003C_CollisionCategory_x003E_k__BackingField dataType="Enum" type="Pathfindax.Nodes.PathfindaxCollisionCategory" name="Cat1" value="1" />
<_x003C_NodeSize_x003E_k__BackingField dataType="Float">5</_x003C_NodeSize_x003E_k__BackingField>
<_x003C_Thread_x003E_k__BackingField dataType="Int">0</_x003C_Thread_x003E_k__BackingField>
<_x003C_Visualize_x003E_k__BackingField dataType="Bool">true</_x003C_Visualize_x003E_k__BackingField>
<active dataType="Bool">true</active>
<gameobj dataType="ObjectRef">2586665865</gameobj>
Expand Down
27 changes: 17 additions & 10 deletions Data/Examples/PathFollowerExample.Scene.res
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<tileData dataType="Struct" type="Duality.Plugins.Tilemaps.TilemapData" id="577409533" custom="true">
<body>
<version dataType="Int">3</version>
<data dataType="Array" type="System.Byte[]" id="3824240934">H4sIAAAAAAAEAFNgYGAQYUAHBRgixIFAMFkOof5DqL1kmjUYAcRH6Sj+mztgrqE+GPUfDJhQkyLCaOqAkRx/ByDUQQh1iFSjKdSOCjgYwRQnhOKCUNwQiocRt76h4j9yAT7/nYBQJyHUKQgVDAmsEEaCPKza6Q3w+U8BQilCKCUIRbz/sGqnN8Dmv7tQOQ0IpQmhtEg1mkLtqEAOEmbyeLIaVoDNf/c9wNQ9TzB1zgtCQQTP0UvwHYkewQGw+e9/AAovaGAEKfUZBECMVoZQ1lAqAkJFQqioARGsptRno2AUjIJRMAqGJwAA+5AIv4gRAAA=</data>
<data dataType="Array" type="System.Byte[]" id="3824240934">H4sIAAAAAAAEAFNgYGAQYUAHBRgixIFAMFkOof5DqL1kmjUYAcRH6Sj+mztgrqE+GPUfDJhQkyLCaOqAkRx/ByDUQQh1iFSjKdSOCjgYwRQnhOKCUNwQiocRt76h4j9yAT7/nYBQJyHUKQgVDAmsEEaCPKza6Q3w+U8BQilCKCUIRbz/sGqnN8Dmv7tQOQ0IpQmhtEg1mkLtqEAOEmbyeLIaVoDNf/c9wNQ9TzB1zgtCQQTP0UvwHYkewQGw+e9/AAovaGAEKfUZBECMVoZQ1lAqAkJFQqioARGsptRno2AUjIIhB/5hE/xOb1eMgkEPALFk/K6IEQAA</data>
</body>
</tileData>
<tileset dataType="Struct" type="Duality.ContentRef`1[[Duality.Plugins.Tilemaps.Tileset]]">
Expand Down Expand Up @@ -377,16 +377,16 @@
<_items dataType="Array" type="Duality.Component[]" id="813695631">
<item dataType="ObjectRef">4009962089</item>
<item dataType="Struct" type="Duality.Plugins.Pathfindax.Tilemaps.Components.TilemapNodeGridGenerator" id="828666520">
<_movementPenalties dataType="Array" type="System.Single[]" id="3614682646">1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0.4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1</_movementPenalties>
<_sourceNodeGrid />
<_movementPenalties dataType="Array" type="System.Single[]" id="3614682646">1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0.1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1</_movementPenalties>
<_x003C_ConnectionGenerationMode_x003E_k__BackingField dataType="Enum" type="Pathfindax.Graph.GenerateNodeGridConnections" name="All" value="20" />
<_x003C_CrossCorners_x003E_k__BackingField dataType="Bool">false</_x003C_CrossCorners_x003E_k__BackingField>
<active dataType="Bool">true</active>
<gameobj dataType="ObjectRef">3952684871</gameobj>
</item>
<item dataType="Struct" type="Duality.Plugins.Pathfindax.Components.AstarPathfinderComponent" id="1744982957">
<_x003C_AmountOfThreads_x003E_k__BackingField dataType="Int">1</_x003C_AmountOfThreads_x003E_k__BackingField>
<_x003C_Heuristic_x003E_k__BackingField dataType="Struct" type="Pathfindax.Algorithms.EuclideanDistance" id="1796053751" />
<_x003C_MaxClearance_x003E_k__BackingField dataType="Int">5</_x003C_MaxClearance_x003E_k__BackingField>
<_x003C_Pathfinder_x003E_k__BackingField />
<_x003C_PathfinderId_x003E_k__BackingField />
<active dataType="Bool">true</active>
<gameobj dataType="ObjectRef">3952684871</gameobj>
</item>
Expand Down Expand Up @@ -435,7 +435,7 @@
<active dataType="Bool">true</active>
<children />
<compList dataType="Struct" type="System.Collections.Generic.List`1[[Duality.Component]]" id="496016107">
<_items dataType="Array" type="Duality.Component[]" id="3833294966" length="4">
<_items dataType="Array" type="Duality.Component[]" id="3833294966" length="8">
<item dataType="Struct" type="Duality.Components.Transform" id="4269124107">
<active dataType="Bool">true</active>
<angle dataType="Float">0</angle>
Expand Down Expand Up @@ -487,11 +487,11 @@
<visibilityGroup dataType="Enum" type="Duality.Drawing.VisibilityFlag" name="Group0" value="1" />
</item>
<item dataType="Struct" type="Duality.Plugins.Pathfindax.Examples.Components.PathFollowerComponent" id="1829385283">
<_x003C_AgentSize_x003E_k__BackingField dataType="Byte">1</_x003C_AgentSize_x003E_k__BackingField>
<_x003C_AgentSize_x003E_k__BackingField dataType="Byte">3</_x003C_AgentSize_x003E_k__BackingField>
<_x003C_Camera_x003E_k__BackingField dataType="Struct" type="Duality.Components.Camera" id="1603001729">
<active dataType="Bool">true</active>
<farZ dataType="Float">11000</farZ>
<focusDist dataType="Float">620</focusDist>
<focusDist dataType="Float">590</focusDist>
<gameobj dataType="Struct" type="Duality.GameObject" id="56615252">
<active dataType="Bool">true</active>
<children />
Expand Down Expand Up @@ -581,13 +581,18 @@
</_x003C_Camera_x003E_k__BackingField>
<_x003C_CollisionCategory_x003E_k__BackingField dataType="Enum" type="Pathfindax.Nodes.PathfindaxCollisionCategory" name="Cat1" value="1" />
<_x003C_MovementSpeed_x003E_k__BackingField dataType="Float">8</_x003C_MovementSpeed_x003E_k__BackingField>
<_x003C_Path_x003E_k__BackingField />
<_x003C_PathfinderComponent_x003E_k__BackingField dataType="ObjectRef">1744982957</_x003C_PathfinderComponent_x003E_k__BackingField>
<active dataType="Bool">true</active>
<gameobj dataType="ObjectRef">4211846889</gameobj>
</item>
<item dataType="Struct" type="Duality.Plugins.Pathfindax.Components.PathVisualizer" id="1349551791">
<_x003C_BoundRadius_x003E_k__BackingField dataType="Float">0</_x003C_BoundRadius_x003E_k__BackingField>
<_x003C_Visualize_x003E_k__BackingField dataType="Bool">true</_x003C_Visualize_x003E_k__BackingField>
<active dataType="Bool">true</active>
<gameobj dataType="ObjectRef">4211846889</gameobj>
</item>
</_items>
<_size dataType="Int">3</_size>
<_size dataType="Int">4</_size>
</compList>
<compMap dataType="Struct" type="System.Collections.Generic.Dictionary`2[[System.Type],[Duality.Component]]" id="289342152" surrogate="true">
<header />
Expand All @@ -596,11 +601,13 @@
<item dataType="ObjectRef">4173822160</item>
<item dataType="Type" id="2152382894" value="Duality.Components.Renderers.SpriteRenderer" />
<item dataType="Type" id="2951473866" value="Duality.Plugins.Pathfindax.Examples.Components.PathFollowerComponent" />
<item dataType="Type" id="346186526" value="Duality.Plugins.Pathfindax.Components.PathVisualizer" />
</keys>
<values dataType="Array" type="System.Object[]" id="2466648544">
<item dataType="ObjectRef">4269124107</item>
<item dataType="ObjectRef">1385498873</item>
<item dataType="ObjectRef">1829385283</item>
<item dataType="ObjectRef">1349551791</item>
</values>
</body>
</compMap>
Expand Down
4 changes: 1 addition & 3 deletions Data/Examples/PathSpammerExample.Scene.res
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,8 @@
</item>
<item dataType="Struct" type="Duality.Plugins.Pathfindax.Components.AstarPathfinderComponent" id="324856514">
<_x003C_AmountOfThreads_x003E_k__BackingField dataType="Int">1</_x003C_AmountOfThreads_x003E_k__BackingField>
<_x003C_Heuristic_x003E_k__BackingField dataType="Struct" type="Pathfindax.Algorithms.ManhattanDistance" id="3803477850" />
<_x003C_MaxClearance_x003E_k__BackingField dataType="Int">5</_x003C_MaxClearance_x003E_k__BackingField>
<_x003C_Pathfinder_x003E_k__BackingField />
<_x003C_PathfinderId_x003E_k__BackingField />
<active dataType="Bool">true</active>
<gameobj dataType="ObjectRef">2532558428</gameobj>
</item>
Expand Down Expand Up @@ -165,7 +164,6 @@
<compList dataType="Struct" type="System.Collections.Generic.List`1[[Duality.Component]]" id="3719019467">
<_items dataType="Array" type="Duality.Component[]" id="4252602870" length="4">
<item dataType="Struct" type="Duality.Plugins.Pathfindax.Examples.Components.PathfindaxPathSpammerComponent" id="3274627541">
<_frameCounter dataType="Int">0</_frameCounter>
<_randomGenerator dataType="Struct" type="System.Random" id="2433592613">
<inext dataType="Int">0</inext>
<inextp dataType="Int">21</inextp>
Expand Down
Loading

0 comments on commit bfc9c05

Please sign in to comment.