Updated VC project and fixed compile warnings.
This commit is contained in:
parent
070d591aa8
commit
6271b40ae6
@ -70,9 +70,9 @@ enum dtPolyTypes
|
|||||||
typedef unsigned int dtStatus;
|
typedef unsigned int dtStatus;
|
||||||
|
|
||||||
// High level status.
|
// High level status.
|
||||||
static const unsigned int DT_FAILURE = 1 << 31; // Operation failed.
|
static const unsigned int DT_FAILURE = 1u << 31; // Operation failed.
|
||||||
static const unsigned int DT_SUCCESS = 1 << 30; // Operation succeed.
|
static const unsigned int DT_SUCCESS = 1u << 30; // Operation succeed.
|
||||||
static const unsigned int DT_IN_PROGRESS = 1 << 29; // Operation still in progress.
|
static const unsigned int DT_IN_PROGRESS = 1u << 29; // Operation still in progress.
|
||||||
|
|
||||||
// Detail information for status.
|
// Detail information for status.
|
||||||
static const unsigned int DT_STATUS_DETAIL_MASK = 0x0ffffff;
|
static const unsigned int DT_STATUS_DETAIL_MASK = 0x0ffffff;
|
||||||
|
@ -20,6 +20,7 @@
|
|||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <float.h>
|
#include <float.h>
|
||||||
|
#include <stdlib.h>
|
||||||
#include <new>
|
#include <new>
|
||||||
#include "DetourCrowd.h"
|
#include "DetourCrowd.h"
|
||||||
#include "DetourNavMesh.h"
|
#include "DetourNavMesh.h"
|
||||||
@ -499,7 +500,7 @@ int dtCrowd::getNeighbours(const float* pos, const float height, const float ran
|
|||||||
return n;
|
return n;
|
||||||
}
|
}
|
||||||
|
|
||||||
void dtCrowd::updateMoveRequest(const float dt)
|
void dtCrowd::updateMoveRequest(const float /*dt*/)
|
||||||
{
|
{
|
||||||
// Fire off new requests.
|
// Fire off new requests.
|
||||||
for (int i = 0; i < m_moveRequestCount; ++i)
|
for (int i = 0; i < m_moveRequestCount; ++i)
|
||||||
|
@ -189,7 +189,7 @@ void dtPathCorridor::reset(dtPolyRef ref, const float* pos)
|
|||||||
|
|
||||||
int dtPathCorridor::findCorners(float* cornerVerts, unsigned char* cornerFlags,
|
int dtPathCorridor::findCorners(float* cornerVerts, unsigned char* cornerFlags,
|
||||||
dtPolyRef* cornerPolys, const int maxCorners,
|
dtPolyRef* cornerPolys, const int maxCorners,
|
||||||
dtNavMeshQuery* navquery, const dtQueryFilter* filter)
|
dtNavMeshQuery* navquery, const dtQueryFilter* /*filter*/)
|
||||||
{
|
{
|
||||||
dtAssert(m_path);
|
dtAssert(m_path);
|
||||||
dtAssert(m_npath);
|
dtAssert(m_npath);
|
||||||
|
Binary file not shown.
@ -41,7 +41,7 @@
|
|||||||
<Tool
|
<Tool
|
||||||
Name="VCCLCompilerTool"
|
Name="VCCLCompilerTool"
|
||||||
Optimization="0"
|
Optimization="0"
|
||||||
AdditionalIncludeDirectories="..\..\Contrib\SDL\include;..\..\Include;..\..\..\Detour\Include;..\..\..\DebugUtils\Include;..\..\..\Recast\Include;..\..\Contrib;$(NOINHERIT)"
|
AdditionalIncludeDirectories="..\..\Contrib\fastlz;..\..\Contrib\SDL\include;..\..\Include;..\..\..\DetourCrowd\Include;..\..\..\Detour\Include;..\..\..\DebugUtils\Include;..\..\..\Recast\Include;..\..\Contrib"
|
||||||
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS"
|
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS"
|
||||||
MinimalRebuild="true"
|
MinimalRebuild="true"
|
||||||
BasicRuntimeChecks="3"
|
BasicRuntimeChecks="3"
|
||||||
@ -117,7 +117,7 @@
|
|||||||
Name="VCCLCompilerTool"
|
Name="VCCLCompilerTool"
|
||||||
Optimization="2"
|
Optimization="2"
|
||||||
EnableIntrinsicFunctions="true"
|
EnableIntrinsicFunctions="true"
|
||||||
AdditionalIncludeDirectories="..\..\..\DebugUtils\Include;..\..\Contrib\SDL\include;..\..\Include;..\..\..\Detour\Include;..\..\..\Recast\Include;..\..\Contrib"
|
AdditionalIncludeDirectories="..\..\Contrib\fastlz;..\..\Contrib\SDL\include;..\..\Include;..\..\..\DetourCrowd\Include;..\..\..\Detour\Include;..\..\..\DebugUtils\Include;..\..\..\Recast\Include;..\..\Contrib"
|
||||||
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS"
|
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS"
|
||||||
RuntimeLibrary="2"
|
RuntimeLibrary="2"
|
||||||
EnableFunctionLevelLinking="true"
|
EnableFunctionLevelLinking="true"
|
||||||
@ -271,10 +271,6 @@
|
|||||||
RelativePath="..\..\..\Detour\Include\DetourNode.h"
|
RelativePath="..\..\..\Detour\Include\DetourNode.h"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
|
||||||
RelativePath="..\..\..\Detour\Include\DetourObstacleAvoidance.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
</Filter>
|
</Filter>
|
||||||
<Filter
|
<Filter
|
||||||
Name="Source"
|
Name="Source"
|
||||||
@ -303,10 +299,6 @@
|
|||||||
RelativePath="..\..\..\Detour\Source\DetourNode.cpp"
|
RelativePath="..\..\..\Detour\Source\DetourNode.cpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
|
||||||
RelativePath="..\..\..\Detour\Source\DetourObstacleAvoidance.cpp"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
</Filter>
|
</Filter>
|
||||||
</Filter>
|
</Filter>
|
||||||
<Filter
|
<Filter
|
||||||
@ -323,10 +315,6 @@
|
|||||||
RelativePath="..\..\Include\ConvexVolumeTool.h"
|
RelativePath="..\..\Include\ConvexVolumeTool.h"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
|
||||||
RelativePath="..\..\Include\CrowdManager.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
<File
|
||||||
RelativePath="..\..\Include\CrowdTool.h"
|
RelativePath="..\..\Include\CrowdTool.h"
|
||||||
>
|
>
|
||||||
@ -379,6 +367,10 @@
|
|||||||
RelativePath="..\..\Include\Sample_SoloMeshTiled.h"
|
RelativePath="..\..\Include\Sample_SoloMeshTiled.h"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\..\Include\Sample_TempObstacles.h"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\..\Include\Sample_TileMesh.h"
|
RelativePath="..\..\Include\Sample_TileMesh.h"
|
||||||
>
|
>
|
||||||
@ -419,10 +411,6 @@
|
|||||||
RelativePath="..\..\Source\ConvexVolumeTool.cpp"
|
RelativePath="..\..\Source\ConvexVolumeTool.cpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
|
||||||
RelativePath="..\..\Source\CrowdManager.cpp"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
<File
|
||||||
RelativePath="..\..\Source\CrowdTool.cpp"
|
RelativePath="..\..\Source\CrowdTool.cpp"
|
||||||
>
|
>
|
||||||
@ -479,6 +467,10 @@
|
|||||||
RelativePath="..\..\Source\Sample_SoloMeshTiled.cpp"
|
RelativePath="..\..\Source\Sample_SoloMeshTiled.cpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\..\Source\Sample_TempObstacles.cpp"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\..\Source\Sample_TileMesh.cpp"
|
RelativePath="..\..\Source\Sample_TileMesh.cpp"
|
||||||
>
|
>
|
||||||
@ -545,6 +537,78 @@
|
|||||||
</File>
|
</File>
|
||||||
</Filter>
|
</Filter>
|
||||||
</Filter>
|
</Filter>
|
||||||
|
<Filter
|
||||||
|
Name="DetourCrowd"
|
||||||
|
>
|
||||||
|
<Filter
|
||||||
|
Name="Include"
|
||||||
|
>
|
||||||
|
<File
|
||||||
|
RelativePath="..\..\..\DetourCrowd\Include\DetourCrowd.h"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\..\..\DetourCrowd\Include\DetourLocalBoundary.h"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\..\..\DetourCrowd\Include\DetourObstacleAvoidance.h"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\..\..\DetourCrowd\Include\DetourPathCorridor.h"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\..\..\DetourCrowd\Include\DetourPathQueue.h"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\..\..\DetourCrowd\Include\DetourProximityGrid.h"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
|
</Filter>
|
||||||
|
<Filter
|
||||||
|
Name="Source"
|
||||||
|
>
|
||||||
|
<File
|
||||||
|
RelativePath="..\..\..\DetourCrowd\Source\DetourCrowd.cpp"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\..\..\DetourCrowd\Source\DetourLocalBoundary.cpp"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\..\..\DetourCrowd\Source\DetourObstacleAvoidance.cpp"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\..\..\DetourCrowd\Source\DetourPathCorridor.cpp"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\..\..\DetourCrowd\Source\DetourPathQueue.cpp"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\..\..\DetourCrowd\Source\DetourProximityGrid.cpp"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
|
</Filter>
|
||||||
|
</Filter>
|
||||||
|
<Filter
|
||||||
|
Name="Contrib"
|
||||||
|
>
|
||||||
|
<File
|
||||||
|
RelativePath="..\..\Contrib\fastlz\fastlz.c"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\..\Contrib\fastlz\fastlz.h"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
|
</Filter>
|
||||||
</Files>
|
</Files>
|
||||||
<Globals>
|
<Globals>
|
||||||
</Globals>
|
</Globals>
|
||||||
|
@ -332,7 +332,8 @@ public:
|
|||||||
|
|
||||||
int hitTestObstacle(const float* sp, const float* sq)
|
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)
|
for (int i = 0; i < m_nobst; ++i)
|
||||||
{
|
{
|
||||||
const TempObstacle* ob = &m_obst[i];
|
const TempObstacle* ob = &m_obst[i];
|
||||||
@ -535,7 +536,7 @@ public:
|
|||||||
return true;
|
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;
|
static const int MAX_TIME_USEC = 1000;
|
||||||
|
|
||||||
@ -1172,7 +1173,7 @@ public:
|
|||||||
imguiValue("Click LMB to highlight a tile.");
|
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;
|
m_hitPosSet = true;
|
||||||
rcVcopy(m_hitPos,p);
|
rcVcopy(m_hitPos,p);
|
||||||
@ -1277,7 +1278,7 @@ public:
|
|||||||
virtual void handleStep() {}
|
virtual void handleStep() {}
|
||||||
virtual void handleUpdate(const float /*dt*/) {}
|
virtual void handleUpdate(const float /*dt*/) {}
|
||||||
virtual void handleRender() {}
|
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));
|
imguiDrawRect(280,10,300,100,imguiRGBA(0,0,0,64));
|
||||||
|
|
||||||
char text[64];
|
char text[64];
|
||||||
float y = 110-30;
|
int y = 110-30;
|
||||||
|
|
||||||
snprintf(text,64,"Lean Data: %.1fkB", m_tileCache->getRawSize()/1024.0f);
|
snprintf(text,64,"Lean Data: %.1fkB", m_tileCache->getRawSize()/1024.0f);
|
||||||
imguiDrawText(300, y, IMGUI_ALIGN_LEFT, text, imguiRGBA(255,255,255,255));
|
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)
|
if (n < maxTouched)
|
||||||
{
|
{
|
||||||
touched[n].tx = x;
|
touched[n].tx = (short)x;
|
||||||
touched[n].ty = y;
|
touched[n].ty = (short)y;
|
||||||
n++;
|
n++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user