Updated win32 project, compile fixes.

This commit is contained in:
Mikko Mononen 2010-01-28 13:53:23 +00:00
parent 1202ee641a
commit 3648ebe765
3 changed files with 26 additions and 10 deletions

Binary file not shown.

View File

@ -284,6 +284,10 @@
<Filter <Filter
Name="Demo" Name="Demo"
> >
<File
RelativePath="..\..\Source\InputGeom.cpp"
>
</File>
<Filter <Filter
Name="Include" Name="Include"
> >
@ -304,11 +308,15 @@
> >
</File> </File>
<File <File
RelativePath="..\..\Include\Sample.h" RelativePath="..\..\Include\NavMeshTesterTool.h"
> >
</File> </File>
<File <File
RelativePath="..\..\Include\Sample_SoloMesh.h" RelativePath="..\..\Include\OffMeshConnectionTool.h"
>
</File>
<File
RelativePath="..\..\Include\Sample.h"
> >
</File> </File>
<File <File
@ -343,6 +351,10 @@
RelativePath="..\..\Source\imguiRenderGL.cpp" RelativePath="..\..\Source\imguiRenderGL.cpp"
> >
</File> </File>
<File
RelativePath="..\..\Include\InputGeom.h"
>
</File>
<File <File
RelativePath="..\..\Source\main.cpp" RelativePath="..\..\Source\main.cpp"
> >
@ -352,11 +364,15 @@
> >
</File> </File>
<File <File
RelativePath="..\..\Source\Sample.cpp" RelativePath="..\..\Source\NavMeshTesterTool.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\Source\Sample_SoloMesh.cpp" RelativePath="..\..\Source\OffMeshConnectionTool.cpp"
>
</File>
<File
RelativePath="..\..\Source\Sample.cpp"
> >
</File> </File>
<File <File

View File

@ -129,12 +129,12 @@ void NavMeshTesterTool::handleMenu()
imguiLabel("Include Flags"); imguiLabel("Include Flags");
if (imguiCheck("Ground", m_filter.includeFlags & DT_POLY_GROUND)) if (imguiCheck("Ground", (m_filter.includeFlags & DT_POLY_GROUND) ? true : false))
{ {
m_filter.includeFlags ^= DT_POLY_GROUND; m_filter.includeFlags ^= DT_POLY_GROUND;
recalc(); recalc();
} }
if (imguiCheck("Off-Mesh Connections", m_filter.includeFlags & DT_POLY_OFFMESH_CONNECTION)) if (imguiCheck("Off-Mesh Connections", (m_filter.includeFlags & DT_POLY_OFFMESH_CONNECTION) ? true : false))
{ {
m_filter.includeFlags ^= DT_POLY_OFFMESH_CONNECTION; m_filter.includeFlags ^= DT_POLY_OFFMESH_CONNECTION;
recalc(); recalc();
@ -142,12 +142,12 @@ void NavMeshTesterTool::handleMenu()
imguiLabel("Exclude Flags"); imguiLabel("Exclude Flags");
if (imguiCheck("Ground", m_filter.excludeFlags & DT_POLY_GROUND)) if (imguiCheck("Ground", (m_filter.excludeFlags & DT_POLY_GROUND) ? true : false))
{ {
m_filter.excludeFlags ^= DT_POLY_GROUND; m_filter.excludeFlags ^= DT_POLY_GROUND;
recalc(); recalc();
} }
if (imguiCheck("Off-Mesh Connections", m_filter.excludeFlags & DT_POLY_OFFMESH_CONNECTION)) if (imguiCheck("Off-Mesh Connections", (m_filter.excludeFlags & DT_POLY_OFFMESH_CONNECTION) ? true : false))
{ {
m_filter.excludeFlags ^= DT_POLY_OFFMESH_CONNECTION; m_filter.excludeFlags ^= DT_POLY_OFFMESH_CONNECTION;
recalc(); recalc();
@ -287,8 +287,8 @@ void NavMeshTesterTool::recalc()
polys, npolys, steerPos, steerPosFlag, steerPosRef)) polys, npolys, steerPos, steerPosFlag, steerPosRef))
break; break;
bool endOfPath = steerPosFlag & DT_STRAIGHTPATH_END; bool endOfPath = (steerPosFlag & DT_STRAIGHTPATH_END) ? true : false;
bool offMeshConnection = steerPosFlag & DT_STRAIGHTPATH_OFFMESH_CONNECTION; bool offMeshConnection = (steerPosFlag & DT_STRAIGHTPATH_OFFMESH_CONNECTION) ? true : false;
// Find movement delta. // Find movement delta.
float delta[3], len; float delta[3], len;