Made NavMeshPruneTool case consistent with other classes.

This commit is contained in:
Cameron hart 2011-10-03 19:38:24 +00:00
parent 81098f1fc7
commit 588d674c72
4 changed files with 18 additions and 18 deletions

View File

@ -23,7 +23,7 @@
// Prune navmesh to accessible locations from a point. // Prune navmesh to accessible locations from a point.
class NavmeshPruneTool : public SampleTool class NavMeshPruneTool : public SampleTool
{ {
Sample* m_sample; Sample* m_sample;
@ -33,8 +33,8 @@ class NavmeshPruneTool : public SampleTool
bool m_hitPosSet; bool m_hitPosSet;
public: public:
NavmeshPruneTool(); NavMeshPruneTool();
~NavmeshPruneTool(); ~NavMeshPruneTool();
virtual int type() { return TOOL_NAVMESH_PRUNE; } virtual int type() { return TOOL_NAVMESH_PRUNE; }
virtual void init(Sample* sample); virtual void init(Sample* sample);

View File

@ -24,7 +24,7 @@
#include "SDL.h" #include "SDL.h"
#include "SDL_opengl.h" #include "SDL_opengl.h"
#include "imgui.h" #include "imgui.h"
#include "NavmeshPruneTool.h" #include "NavMeshPruneTool.h"
#include "InputGeom.h" #include "InputGeom.h"
#include "Sample.h" #include "Sample.h"
#include "DetourNavMesh.h" #include "DetourNavMesh.h"
@ -219,30 +219,30 @@ static void disableUnvisitedPolys(dtNavMesh* nav, NavmeshFlags* flags)
} }
} }
NavmeshPruneTool::NavmeshPruneTool() : NavMeshPruneTool::NavMeshPruneTool() :
m_flags(0), m_flags(0),
m_hitPosSet(false) m_hitPosSet(false)
{ {
} }
NavmeshPruneTool::~NavmeshPruneTool() NavMeshPruneTool::~NavMeshPruneTool()
{ {
delete m_flags; delete m_flags;
} }
void NavmeshPruneTool::init(Sample* sample) void NavMeshPruneTool::init(Sample* sample)
{ {
m_sample = sample; m_sample = sample;
} }
void NavmeshPruneTool::reset() void NavMeshPruneTool::reset()
{ {
m_hitPosSet = false; m_hitPosSet = false;
delete m_flags; delete m_flags;
m_flags = 0; m_flags = 0;
} }
void NavmeshPruneTool::handleMenu() void NavMeshPruneTool::handleMenu()
{ {
dtNavMesh* nav = m_sample->getNavMesh(); dtNavMesh* nav = m_sample->getNavMesh();
if (!nav) return; if (!nav) return;
@ -261,7 +261,7 @@ void NavmeshPruneTool::handleMenu()
} }
} }
void NavmeshPruneTool::handleClick(const float* /*s*/, const float* p, bool shift) void NavMeshPruneTool::handleClick(const float* /*s*/, const float* p, bool shift)
{ {
if (!m_sample) return; if (!m_sample) return;
InputGeom* geom = m_sample->getInputGeom(); InputGeom* geom = m_sample->getInputGeom();
@ -288,19 +288,19 @@ void NavmeshPruneTool::handleClick(const float* /*s*/, const float* p, bool shif
floodNavmesh(nav, m_flags, ref, 1); floodNavmesh(nav, m_flags, ref, 1);
} }
void NavmeshPruneTool::handleToggle() void NavMeshPruneTool::handleToggle()
{ {
} }
void NavmeshPruneTool::handleStep() void NavMeshPruneTool::handleStep()
{ {
} }
void NavmeshPruneTool::handleUpdate(const float /*dt*/) void NavMeshPruneTool::handleUpdate(const float /*dt*/)
{ {
} }
void NavmeshPruneTool::handleRender() void NavMeshPruneTool::handleRender()
{ {
DebugDrawGL dd; DebugDrawGL dd;
@ -339,7 +339,7 @@ void NavmeshPruneTool::handleRender()
} }
void NavmeshPruneTool::handleRenderOverlay(double* proj, double* model, int* view) void NavMeshPruneTool::handleRenderOverlay(double* proj, double* model, int* view)
{ {
// Tool help // Tool help
const int h = view[3]; const int h = view[3];

View File

@ -33,7 +33,7 @@
#include "DetourNavMeshBuilder.h" #include "DetourNavMeshBuilder.h"
#include "DetourDebugDraw.h" #include "DetourDebugDraw.h"
#include "NavMeshTesterTool.h" #include "NavMeshTesterTool.h"
#include "NavmeshPruneTool.h" #include "NavMeshPruneTool.h"
#include "OffMeshConnectionTool.h" #include "OffMeshConnectionTool.h"
#include "ConvexVolumeTool.h" #include "ConvexVolumeTool.h"
#include "CrowdTool.h" #include "CrowdTool.h"
@ -106,7 +106,7 @@ void Sample_SoloMesh::handleTools()
} }
if (imguiCheck("Prune Navmesh", type == TOOL_NAVMESH_PRUNE)) if (imguiCheck("Prune Navmesh", type == TOOL_NAVMESH_PRUNE))
{ {
setTool(new NavmeshPruneTool); setTool(new NavMeshPruneTool);
} }
if (imguiCheck("Create Off-Mesh Connections", type == TOOL_OFFMESH_CONNECTION)) if (imguiCheck("Create Off-Mesh Connections", type == TOOL_OFFMESH_CONNECTION))
{ {

View File

@ -415,7 +415,7 @@ void Sample_TileMesh::handleTools()
} }
if (imguiCheck("Prune Navmesh", type == TOOL_NAVMESH_PRUNE)) if (imguiCheck("Prune Navmesh", type == TOOL_NAVMESH_PRUNE))
{ {
setTool(new NavmeshPruneTool); setTool(new NavMeshPruneTool);
} }
if (imguiCheck("Create Tiles", type == TOOL_TILE_EDIT)) if (imguiCheck("Create Tiles", type == TOOL_TILE_EDIT))
{ {