Skip to content

Commit

Permalink
rename CCNavMeshTool to CCNavMeshUtils
Browse files Browse the repository at this point in the history
  • Loading branch information
@super626
super626 committed Jun 15, 2015
1 parent 97ef797 commit 16a0ddc
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 24 deletions.
24 changes: 12 additions & 12 deletions build/cocos2d_libs.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2629,10 +2629,10 @@
B677B0D61B18492D006762CB /* CCNavMeshObstacle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B677B0C51B18492D006762CB /* CCNavMeshObstacle.cpp */; };
B677B0D71B18492D006762CB /* CCNavMeshObstacle.h in Headers */ = {isa = PBXBuildFile; fileRef = B677B0C61B18492D006762CB /* CCNavMeshObstacle.h */; };
B677B0D81B18492D006762CB /* CCNavMeshObstacle.h in Headers */ = {isa = PBXBuildFile; fileRef = B677B0C61B18492D006762CB /* CCNavMeshObstacle.h */; };
B677B0D91B18492D006762CB /* CCNavMeshTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B677B0C71B18492D006762CB /* CCNavMeshTool.cpp */; };
B677B0DA1B18492D006762CB /* CCNavMeshTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B677B0C71B18492D006762CB /* CCNavMeshTool.cpp */; };
B677B0DB1B18492D006762CB /* CCNavMeshTool.h in Headers */ = {isa = PBXBuildFile; fileRef = B677B0C81B18492D006762CB /* CCNavMeshTool.h */; };
B677B0DC1B18492D006762CB /* CCNavMeshTool.h in Headers */ = {isa = PBXBuildFile; fileRef = B677B0C81B18492D006762CB /* CCNavMeshTool.h */; };
B677B0D91B18492D006762CB /* CCNavMeshUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B677B0C71B18492D006762CB /* CCNavMeshUtils.cpp */; };
B677B0DA1B18492D006762CB /* CCNavMeshUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B677B0C71B18492D006762CB /* CCNavMeshUtils.cpp */; };
B677B0DB1B18492D006762CB /* CCNavMeshUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = B677B0C81B18492D006762CB /* CCNavMeshUtils.h */; };
B677B0DC1B18492D006762CB /* CCNavMeshUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = B677B0C81B18492D006762CB /* CCNavMeshUtils.h */; };
B68778F81A8CA82E00643ABF /* CCParticle3DAffector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B68778F01A8CA82E00643ABF /* CCParticle3DAffector.cpp */; };
B68778F91A8CA82E00643ABF /* CCParticle3DAffector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B68778F01A8CA82E00643ABF /* CCParticle3DAffector.cpp */; };
B68778FA1A8CA82E00643ABF /* CCParticle3DAffector.h in Headers */ = {isa = PBXBuildFile; fileRef = B68778F11A8CA82E00643ABF /* CCParticle3DAffector.h */; };
Expand Down Expand Up @@ -5008,8 +5008,8 @@
B677B0C41B18492D006762CB /* CCNavMeshDebugDraw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCNavMeshDebugDraw.h; path = ../cocos/navmesh/CCNavMeshDebugDraw.h; sourceTree = "<group>"; };
B677B0C51B18492D006762CB /* CCNavMeshObstacle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCNavMeshObstacle.cpp; path = ../cocos/navmesh/CCNavMeshObstacle.cpp; sourceTree = "<group>"; };
B677B0C61B18492D006762CB /* CCNavMeshObstacle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCNavMeshObstacle.h; path = ../cocos/navmesh/CCNavMeshObstacle.h; sourceTree = "<group>"; };
B677B0C71B18492D006762CB /* CCNavMeshTool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCNavMeshTool.cpp; path = ../cocos/navmesh/CCNavMeshTool.cpp; sourceTree = "<group>"; };
B677B0C81B18492D006762CB /* CCNavMeshTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCNavMeshTool.h; path = ../cocos/navmesh/CCNavMeshTool.h; sourceTree = "<group>"; };
B677B0C71B18492D006762CB /* CCNavMeshUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCNavMeshUtils.cpp; path = ../cocos/navmesh/CCNavMeshUtils.cpp; sourceTree = "<group>"; };
B677B0C81B18492D006762CB /* CCNavMeshUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCNavMeshUtils.h; path = ../cocos/navmesh/CCNavMeshUtils.h; sourceTree = "<group>"; };
B67C624319D4186F00F11FC6 /* ccShader_3D_ColorNormal.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_3D_ColorNormal.frag; sourceTree = "<group>"; };
B67C624419D4186F00F11FC6 /* ccShader_3D_ColorNormalTex.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_3D_ColorNormalTex.frag; sourceTree = "<group>"; };
B67C624519D4186F00F11FC6 /* ccShader_3D_PositionNormalTex.vert */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_3D_PositionNormalTex.vert; sourceTree = "<group>"; };
Expand Down Expand Up @@ -8685,8 +8685,8 @@
B677B0C41B18492D006762CB /* CCNavMeshDebugDraw.h */,
B677B0C51B18492D006762CB /* CCNavMeshObstacle.cpp */,
B677B0C61B18492D006762CB /* CCNavMeshObstacle.h */,
B677B0C71B18492D006762CB /* CCNavMeshTool.cpp */,
B677B0C81B18492D006762CB /* CCNavMeshTool.h */,
B677B0C71B18492D006762CB /* CCNavMeshUtils.cpp */,
B677B0C81B18492D006762CB /* CCNavMeshUtils.h */,
);
name = navmesh;
sourceTree = "<group>";
Expand Down Expand Up @@ -8973,7 +8973,7 @@
1A57007F180BC5A10088DEC7 /* CCActionInterval.h in Headers */,
B6DD2FDB1B04825B00E47F5F /* DetourLocalBoundary.h in Headers */,
B6CAB3491AF9AA1A00B9B856 /* gim_clip_polygon.h in Headers */,
B677B0DB1B18492D006762CB /* CCNavMeshTool.h in Headers */,
B677B0DB1B18492D006762CB /* CCNavMeshUtils.h in Headers */,
B6CAAFE41AF9A9E100B9B856 /* CCPhysics3D.h in Headers */,
15AE1A7F19AAD40300C27E9E /* b2DistanceJoint.h in Headers */,
B665E3301AA80A6500DDB1C5 /* CCPUOnCountObserverTranslator.h in Headers */,
Expand Down Expand Up @@ -9999,7 +9999,7 @@
B6CAB5341AF9AA1A00B9B856 /* btTransformUtil.h in Headers */,
1A570088180BC5A10088DEC7 /* CCActionPageTurn3D.h in Headers */,
15AE1B9319AADA9A00C27E9E /* UIHelper.h in Headers */,
B677B0DC1B18492D006762CB /* CCNavMeshTool.h in Headers */,
B677B0DC1B18492D006762CB /* CCNavMeshUtils.h in Headers */,
50ABBD9E1925AB4100A911A9 /* ccGLStateCache.h in Headers */,
B665E2111AA80A6500DDB1C5 /* CCPUBaseForceAffector.h in Headers */,
B665E30D1AA80A6500DDB1C5 /* CCPUNoise.h in Headers */,
Expand Down Expand Up @@ -10890,7 +10890,7 @@
B6CAB41F1AF9AA1A00B9B856 /* btMLCPSolver.cpp in Sources */,
46A170E61807CECA005B8026 /* CCPhysicsBody.cpp in Sources */,
B665E40A1AA80A6600DDB1C5 /* CCPUSphereSurfaceEmitterTranslator.cpp in Sources */,
B677B0D91B18492D006762CB /* CCNavMeshTool.cpp in Sources */,
B677B0D91B18492D006762CB /* CCNavMeshUtils.cpp in Sources */,
50ABBDA71925AB4100A911A9 /* CCRenderCommand.cpp in Sources */,
B665E35E1AA80A6500DDB1C5 /* CCPUOnRandomObserverTranslator.cpp in Sources */,
B6CAB2931AF9AA1A00B9B856 /* btCompoundShape.cpp in Sources */,
Expand Down Expand Up @@ -12433,7 +12433,7 @@
D0FD034C1A3B51AA00825BB5 /* CCAllocatorDiagnostics.cpp in Sources */,
B665E31F1AA80A6500DDB1C5 /* CCPUOnClearObserverTranslator.cpp in Sources */,
B665E4331AA80A6600DDB1C5 /* CCPUVertexEmitter.cpp in Sources */,
B677B0DA1B18492D006762CB /* CCNavMeshTool.cpp in Sources */,
B677B0DA1B18492D006762CB /* CCNavMeshUtils.cpp in Sources */,
B665E3C71AA80A6600DDB1C5 /* CCPUScaleVelocityAffector.cpp in Sources */,
B6CAB26E1AF9AA1A00B9B856 /* btSphereSphereCollisionAlgorithm.cpp in Sources */,
50ABBED01925AB6F00A911A9 /* TGAlib.cpp in Sources */,
Expand Down
4 changes: 2 additions & 2 deletions cocos/2d/libcocos2d.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.*
<ClCompile Include="..\navmesh\CCNavMeshAgent.cpp" />
<ClCompile Include="..\navmesh\CCNavMeshDebugDraw.cpp" />
<ClCompile Include="..\navmesh\CCNavMeshObstacle.cpp" />
<ClCompile Include="..\navmesh\CCNavMeshTool.cpp" />
<ClCompile Include="..\navmesh\CCNavMeshUtils.cpp" />
<ClCompile Include="..\network\HttpClient.cpp" />
<ClCompile Include="..\network\SocketIO.cpp" />
<ClCompile Include="..\network\WebSocket.cpp" />
Expand Down Expand Up @@ -1162,7 +1162,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.*
<ClInclude Include="..\navmesh\CCNavMeshAgent.h" />
<ClInclude Include="..\navmesh\CCNavMeshDebugDraw.h" />
<ClInclude Include="..\navmesh\CCNavMeshObstacle.h" />
<ClInclude Include="..\navmesh\CCNavMeshTool.h" />
<ClInclude Include="..\navmesh\CCNavMeshUtils.h" />
<ClInclude Include="..\network\HttpClient.h" />
<ClInclude Include="..\network\HttpRequest.h" />
<ClInclude Include="..\network\HttpResponse.h" />
Expand Down
4 changes: 2 additions & 2 deletions cocos/2d/libcocos2d.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1887,7 +1887,7 @@
<ClCompile Include="..\navmesh\CCNavMeshObstacle.cpp">
<Filter>navmesh</Filter>
</ClCompile>
<ClCompile Include="..\navmesh\CCNavMeshTool.cpp">
<ClCompile Include="..\navmesh\CCNavMeshUtils.cpp">
<Filter>navmesh</Filter>
</ClCompile>
<ClCompile Include="..\base\CCNinePatchImageParser.cpp">
Expand Down Expand Up @@ -3699,7 +3699,7 @@
<ClInclude Include="..\navmesh\CCNavMeshObstacle.h">
<Filter>navmesh</Filter>
</ClInclude>
<ClInclude Include="..\navmesh\CCNavMeshTool.h">
<ClInclude Include="..\navmesh\CCNavMeshUtils.h">
<Filter>navmesh</Filter>
</ClInclude>
<ClInclude Include="..\base\CCNinePatchImageParser.h">
Expand Down
4 changes: 2 additions & 2 deletions cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems
View file
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshAgent.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshDebugDraw.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshObstacle.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshTool.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshUtils.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\network\HttpClient.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\network\HttpRequest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\network\HttpResponse.h" />
Expand Down Expand Up @@ -1043,7 +1043,7 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshAgent.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshDebugDraw.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshObstacle.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshTool.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshUtils.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\network\HttpClient.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\network\SocketIO.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\network\WebSocket.cpp" />
Expand Down
4 changes: 2 additions & 2 deletions ...ibcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1800,7 +1800,7 @@
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshObstacle.h">
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshTool.h">
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshUtils.h">
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\audio\winrt\AudioCachePlayer.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\audio\winrt\AudioEngine-winrt.h" />
Expand Down Expand Up @@ -3437,7 +3437,7 @@
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshObstacle.cpp">
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshTool.cpp">
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshUtils.cpp">
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\audio\AudioEngine.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\audio\winrt\AudioCachePlayer.cpp" />
Expand Down
2 changes: 1 addition & 1 deletion cocos/Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ navmesh/CCNavMesh.cpp \
navmesh/CCNavMeshAgent.cpp \
navmesh/CCNavMeshDebugDraw.cpp \
navmesh/CCNavMeshObstacle.cpp \
navmesh/CCNavMeshTool.cpp \
navmesh/CCNavMeshUtils.cpp \
../external/ConvertUTF/ConvertUTFWrapper.cpp \
../external/ConvertUTF/ConvertUTF.c \
../external/tinyxml2/tinyxml2.cpp \
Expand Down
2 changes: 1 addition & 1 deletion cocos/navmesh/CCNavMesh.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
#include "navmesh/CCNavMeshAgent.h"
#include "navmesh/CCNavMeshDebugDraw.h"
#include "navmesh/CCNavMeshObstacle.h"
#include "navmesh/CCNavMeshTool.h"
#include "navmesh/CCNavMeshUtils.h"


NS_CC_BEGIN
Expand Down
2 changes: 1 addition & 1 deletion cocos/navmesh/CCNavMeshTool.cpp → cocos/navmesh/CCNavMeshUtils.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "navmesh/CCNavMeshTool.h"
#include "navmesh/CCNavMeshUtils.h"
#if CC_USE_NAVMESH

#include "recast/Detour/DetourCommon.h"
Expand Down
0 cocos/navmesh/CCNavMeshTool.h → cocos/navmesh/CCNavMeshUtils.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion cocos/navmesh/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ set(COCOS_NAVMESH_SRC
navmesh/CCNavMeshAgent.cpp
navmesh/CCNavMeshDebugDraw.cpp
navmesh/CCNavMeshObstacle.cpp
navmesh/CCNavMeshTool.cpp
navmesh/CCNavMeshUtils.cpp
)

0 comments on commit 16a0ddc

Please sign in to comment.