diff --git a/Detour/Include/DetourNavMesh.h b/Detour/Include/DetourNavMesh.h index 474da2b..3c8df28 100644 --- a/Detour/Include/DetourNavMesh.h +++ b/Detour/Include/DetourNavMesh.h @@ -70,9 +70,9 @@ enum dtPolyTypes typedef unsigned int dtStatus; // High level status. -static const unsigned int DT_FAILURE = 1 << 31; // Operation failed. -static const unsigned int DT_SUCCESS = 1 << 30; // Operation succeed. -static const unsigned int DT_IN_PROGRESS = 1 << 29; // Operation still in progress. +static const unsigned int DT_FAILURE = 1u << 31; // Operation failed. +static const unsigned int DT_SUCCESS = 1u << 30; // Operation succeed. +static const unsigned int DT_IN_PROGRESS = 1u << 29; // Operation still in progress. // Detail information for status. static const unsigned int DT_STATUS_DETAIL_MASK = 0x0ffffff; diff --git a/DetourCrowd/Source/DetourCrowd.cpp b/DetourCrowd/Source/DetourCrowd.cpp index a3614d2..bb035e6 100644 --- a/DetourCrowd/Source/DetourCrowd.cpp +++ b/DetourCrowd/Source/DetourCrowd.cpp @@ -20,6 +20,7 @@ #include #include #include +#include #include #include "DetourCrowd.h" #include "DetourNavMesh.h" @@ -499,7 +500,7 @@ int dtCrowd::getNeighbours(const float* pos, const float height, const float ran return n; } -void dtCrowd::updateMoveRequest(const float dt) +void dtCrowd::updateMoveRequest(const float /*dt*/) { // Fire off new requests. for (int i = 0; i < m_moveRequestCount; ++i) diff --git a/DetourCrowd/Source/DetourPathCorridor.cpp b/DetourCrowd/Source/DetourPathCorridor.cpp index 457f163..d53d7b2 100644 --- a/DetourCrowd/Source/DetourPathCorridor.cpp +++ b/DetourCrowd/Source/DetourPathCorridor.cpp @@ -189,7 +189,7 @@ void dtPathCorridor::reset(dtPolyRef ref, const float* pos) int dtPathCorridor::findCorners(float* cornerVerts, unsigned char* cornerFlags, dtPolyRef* cornerPolys, const int maxCorners, - dtNavMeshQuery* navquery, const dtQueryFilter* filter) + dtNavMeshQuery* navquery, const dtQueryFilter* /*filter*/) { dtAssert(m_path); dtAssert(m_npath); diff --git a/RecastDemo/Bin/Recast.exe b/RecastDemo/Bin/Recast.exe index 4cb0d98..27286a4 100644 Binary files a/RecastDemo/Bin/Recast.exe and b/RecastDemo/Bin/Recast.exe differ diff --git a/RecastDemo/Build/VC9/Recast.vcproj b/RecastDemo/Build/VC9/Recast.vcproj index 57a9fed..6d8dfa7 100644 --- a/RecastDemo/Build/VC9/Recast.vcproj +++ b/RecastDemo/Build/VC9/Recast.vcproj @@ -41,7 +41,7 @@ - - - - - - @@ -379,6 +367,10 @@ RelativePath="..\..\Include\Sample_SoloMeshTiled.h" > + + @@ -419,10 +411,6 @@ RelativePath="..\..\Source\ConvexVolumeTool.cpp" > - - @@ -479,6 +467,10 @@ RelativePath="..\..\Source\Sample_SoloMeshTiled.cpp" > + + @@ -545,6 +537,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/RecastDemo/Contrib/fastlzf/README.TXT b/RecastDemo/Contrib/fastlz/README.TXT similarity index 100% rename from RecastDemo/Contrib/fastlzf/README.TXT rename to RecastDemo/Contrib/fastlz/README.TXT diff --git a/RecastDemo/Contrib/fastlzf/fastlz.c b/RecastDemo/Contrib/fastlz/fastlz.c similarity index 100% rename from RecastDemo/Contrib/fastlzf/fastlz.c rename to RecastDemo/Contrib/fastlz/fastlz.c diff --git a/RecastDemo/Contrib/fastlzf/fastlz.h b/RecastDemo/Contrib/fastlz/fastlz.h similarity index 100% rename from RecastDemo/Contrib/fastlzf/fastlz.h rename to RecastDemo/Contrib/fastlz/fastlz.h diff --git a/RecastDemo/Source/Sample_TempObstacles.cpp b/RecastDemo/Source/Sample_TempObstacles.cpp index ea8f308..332ad34 100644 --- a/RecastDemo/Source/Sample_TempObstacles.cpp +++ b/RecastDemo/Source/Sample_TempObstacles.cpp @@ -332,7 +332,8 @@ public: int hitTestObstacle(const float* sp, const float* sq) { - float tmin = FLT_MAX, imin = -1; + float tmin = FLT_MAX; + int imin = -1; for (int i = 0; i < m_nobst; ++i) { const TempObstacle* ob = &m_obst[i]; @@ -535,7 +536,7 @@ public: return true; } - void update(const float dt, rcContext* ctx, dtNavMesh* navmesh, ObstacleSet* obs) + void update(const float /*dt*/, rcContext* ctx, dtNavMesh* navmesh, ObstacleSet* obs) { static const int MAX_TIME_USEC = 1000; @@ -1172,7 +1173,7 @@ public: imguiValue("Click LMB to highlight a tile."); } - virtual void handleClick(const float* /*s*/, const float* p, bool shift) + virtual void handleClick(const float* /*s*/, const float* p, bool /*shift*/) { m_hitPosSet = true; rcVcopy(m_hitPos,p); @@ -1277,7 +1278,7 @@ public: virtual void handleStep() {} virtual void handleUpdate(const float /*dt*/) {} virtual void handleRender() {} - virtual void handleRenderOverlay(double* proj, double* model, int* view) { } + virtual void handleRenderOverlay(double* /*proj*/, double* /*model*/, int* /*view*/) { } }; @@ -1543,7 +1544,7 @@ void Sample_TempObstacles::handleRenderOverlay(double* proj, double* model, int* imguiDrawRect(280,10,300,100,imguiRGBA(0,0,0,64)); char text[64]; - float y = 110-30; + int y = 110-30; snprintf(text,64,"Lean Data: %.1fkB", m_tileCache->getRawSize()/1024.0f); imguiDrawText(300, y, IMGUI_ALIGN_LEFT, text, imguiRGBA(255,255,255,255)); @@ -1597,8 +1598,8 @@ int Sample_TempObstacles::calcTouchedTiles(const float minx, const float minz, c { if (n < maxTouched) { - touched[n].tx = x; - touched[n].ty = y; + touched[n].tx = (short)x; + touched[n].ty = (short)y; n++; } }