Skip to content

Commit 64d3f59

Browse files
songchengjiangsongchengjiang
committed
add DetourCrowd and DetourTileCache for recast
1 parent 375a899 commit 64d3f59

File tree

4 files changed

+88
-4
lines changed

4 files changed

+88
-4
lines changed

‎recast/Android.mk

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,14 @@ Detour/DetourCommon.cpp \
1414
Detour/DetourNavMesh.cpp \
1515
Detour/DetourNavMeshBuilder.cpp \
1616
Detour/DetourNavMeshQuery.cpp \
17-
Detour/DetourNode.cpp
17+
Detour/DetourNode.cpp \
18+
DetourCrowd/DetourCrowd.cpp \
19+
DetourCrowd/DetourLocalBoundary.cpp \
20+
DetourCrowd/DetourObstacleAvoidance.cpp \
21+
DetourCrowd/DetourPathCorridor.cpp \
22+
DetourCrowd/DetourPathQueue.cpp \
23+
DetourTileCache/DetourTileCache.cpp \
24+
DetourTileCache/DetourTileCacheBuilder.cpp
1825

1926
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/..
2027

‎recast/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@ Detour/DetourNavMesh.cpp
77
Detour/DetourNavMeshBuilder.cpp
88
Detour/DetourNavMeshQuery.cpp
99
Detour/DetourNode.cpp
10+
DetourCrowd/DetourCrowd.cpp
11+
DetourCrowd/DetourLocalBoundary.cpp
12+
DetourCrowd/DetourObstacleAvoidance.cpp
13+
DetourCrowd/DetourPathCorridor.cpp
14+
DetourCrowd/DetourPathQueue.cpp
15+
DetourTileCache/DetourTileCache.cpp
16+
DetourTileCache/DetourTileCacheBuilder.cpp
1017
)
1118

1219
include_directories(

‎recast/proj.win32/librecast.vcxproj

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -13,6 +13,14 @@
1313
<ItemGroup>
1414
<ClCompile Include="..\DebugUtils\DebugDraw.cpp" />
1515
<ClCompile Include="..\DebugUtils\DetourDebugDraw.cpp" />
16+
<ClCompile Include="..\DetourCrowd\DetourCrowd.cpp" />
17+
<ClCompile Include="..\DetourCrowd\DetourLocalBoundary.cpp" />
18+
<ClCompile Include="..\DetourCrowd\DetourObstacleAvoidance.cpp" />
19+
<ClCompile Include="..\DetourCrowd\DetourPathCorridor.cpp" />
20+
<ClCompile Include="..\DetourCrowd\DetourPathQueue.cpp" />
21+
<ClCompile Include="..\DetourCrowd\DetourProximityGrid.cpp" />
22+
<ClCompile Include="..\DetourTileCache\DetourTileCache.cpp" />
23+
<ClCompile Include="..\DetourTileCache\DetourTileCacheBuilder.cpp" />
1624
<ClCompile Include="..\Detour\DetourAlloc.cpp" />
1725
<ClCompile Include="..\Detour\DetourCommon.cpp" />
1826
<ClCompile Include="..\Detour\DetourNavMesh.cpp" />
@@ -23,6 +31,14 @@
2331
<ItemGroup>
2432
<ClInclude Include="..\DebugUtils\DebugDraw.h" />
2533
<ClInclude Include="..\DebugUtils\DetourDebugDraw.h" />
34+
<ClInclude Include="..\DetourCrowd\DetourCrowd.h" />
35+
<ClInclude Include="..\DetourCrowd\DetourLocalBoundary.h" />
36+
<ClInclude Include="..\DetourCrowd\DetourObstacleAvoidance.h" />
37+
<ClInclude Include="..\DetourCrowd\DetourPathCorridor.h" />
38+
<ClInclude Include="..\DetourCrowd\DetourPathQueue.h" />
39+
<ClInclude Include="..\DetourCrowd\DetourProximityGrid.h" />
40+
<ClInclude Include="..\DetourTileCache\DetourTileCache.h" />
41+
<ClInclude Include="..\DetourTileCache\DetourTileCacheBuilder.h" />
2642
<ClInclude Include="..\Detour\DetourAlloc.h" />
2743
<ClInclude Include="..\Detour\DetourAssert.h" />
2844
<ClInclude Include="..\Detour\DetourCommon.h" />
@@ -42,13 +58,13 @@
4258
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
4359
<ConfigurationType>StaticLibrary</ConfigurationType>
4460
<UseDebugLibraries>true</UseDebugLibraries>
45-
<PlatformToolset>v110</PlatformToolset>
61+
<PlatformToolset>v120</PlatformToolset>
4662
<CharacterSet>Unicode</CharacterSet>
4763
</PropertyGroup>
4864
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4965
<ConfigurationType>StaticLibrary</ConfigurationType>
5066
<UseDebugLibraries>false</UseDebugLibraries>
51-
<PlatformToolset>v110</PlatformToolset>
67+
<PlatformToolset>v120</PlatformToolset>
5268
<WholeProgramOptimization>false</WholeProgramOptimization>
5369
<CharacterSet>Unicode</CharacterSet>
5470
</PropertyGroup>

‎recast/proj.win32/librecast.vcxproj.filters

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77
<Filter Include="Detour">
88
<UniqueIdentifier>{0bb8e4f7-4a37-48b6-8fc8-b2ae500329a1}</UniqueIdentifier>
99
</Filter>
10+
<Filter Include="DetourCrowd">
11+
<UniqueIdentifier>{b8f0ec71-f58c-4544-9525-4e9f9c15aa42}</UniqueIdentifier>
12+
</Filter>
13+
<Filter Include="DetourTileCache">
14+
<UniqueIdentifier>{967cc456-81ac-4764-ae7c-4aab608b9fa9}</UniqueIdentifier>
15+
</Filter>
1016
</ItemGroup>
1117
<ItemGroup>
1218
<ClCompile Include="..\DebugUtils\DebugDraw.cpp">
@@ -33,6 +39,30 @@
3339
<ClCompile Include="..\Detour\DetourNode.cpp">
3440
<Filter>Detour</Filter>
3541
</ClCompile>
42+
<ClCompile Include="..\DetourCrowd\DetourCrowd.cpp">
43+
<Filter>DetourCrowd</Filter>
44+
</ClCompile>
45+
<ClCompile Include="..\DetourCrowd\DetourLocalBoundary.cpp">
46+
<Filter>DetourCrowd</Filter>
47+
</ClCompile>
48+
<ClCompile Include="..\DetourCrowd\DetourObstacleAvoidance.cpp">
49+
<Filter>DetourCrowd</Filter>
50+
</ClCompile>
51+
<ClCompile Include="..\DetourCrowd\DetourPathCorridor.cpp">
52+
<Filter>DetourCrowd</Filter>
53+
</ClCompile>
54+
<ClCompile Include="..\DetourCrowd\DetourPathQueue.cpp">
55+
<Filter>DetourCrowd</Filter>
56+
</ClCompile>
57+
<ClCompile Include="..\DetourCrowd\DetourProximityGrid.cpp">
58+
<Filter>DetourCrowd</Filter>
59+
</ClCompile>
60+
<ClCompile Include="..\DetourTileCache\DetourTileCache.cpp">
61+
<Filter>DetourTileCache</Filter>
62+
</ClCompile>
63+
<ClCompile Include="..\DetourTileCache\DetourTileCacheBuilder.cpp">
64+
<Filter>DetourTileCache</Filter>
65+
</ClCompile>
3666
</ItemGroup>
3767
<ItemGroup>
3868
<ClInclude Include="..\DebugUtils\DebugDraw.h">
@@ -68,5 +98,29 @@
6898
<ClInclude Include="..\Detour\DetourStatus.h">
6999
<Filter>Detour</Filter>
70100
</ClInclude>
101+
<ClInclude Include="..\DetourCrowd\DetourCrowd.h">
102+
<Filter>DetourCrowd</Filter>
103+
</ClInclude>
104+
<ClInclude Include="..\DetourCrowd\DetourLocalBoundary.h">
105+
<Filter>DetourCrowd</Filter>
106+
</ClInclude>
107+
<ClInclude Include="..\DetourCrowd\DetourObstacleAvoidance.h">
108+
<Filter>DetourCrowd</Filter>
109+
</ClInclude>
110+
<ClInclude Include="..\DetourCrowd\DetourPathCorridor.h">
111+
<Filter>DetourCrowd</Filter>
112+
</ClInclude>
113+
<ClInclude Include="..\DetourCrowd\DetourPathQueue.h">
114+
<Filter>DetourCrowd</Filter>
115+
</ClInclude>
116+
<ClInclude Include="..\DetourCrowd\DetourProximityGrid.h">
117+
<Filter>DetourCrowd</Filter>
118+
</ClInclude>
119+
<ClInclude Include="..\DetourTileCache\DetourTileCache.h">
120+
<Filter>DetourTileCache</Filter>
121+
</ClInclude>
122+
<ClInclude Include="..\DetourTileCache\DetourTileCacheBuilder.h">
123+
<Filter>DetourTileCache</Filter>
124+
</ClInclude>
71125
</ItemGroup>
72126
</Project>

0 commit comments

Comments
 (0)