Added rcIngoreUnused which can be called to ignore unused parameters.
This commit is contained in:
parent
a04504f020
commit
b493e7e6f6
@ -549,6 +549,11 @@ static const int RC_NOT_CONNECTED = 0x3f;
|
|||||||
/// @name General helper functions
|
/// @name General helper functions
|
||||||
/// @{
|
/// @{
|
||||||
|
|
||||||
|
/// Used to ignore a function parameter. VS complains about unused parameters
|
||||||
|
/// and this silences the warning.
|
||||||
|
/// @param [in] _ Unused parameter
|
||||||
|
template<class T> void rcIgnoreUnused(const T&) { }
|
||||||
|
|
||||||
/// Swaps the values of the two parameters.
|
/// Swaps the values of the two parameters.
|
||||||
/// @param[in,out] a Value A
|
/// @param[in,out] a Value A
|
||||||
/// @param[in,out] b Value B
|
/// @param[in,out] b Value B
|
||||||
|
@ -208,12 +208,11 @@ void rcCalcGridSize(const float* bmin, const float* bmax, float cs, int* w, int*
|
|||||||
/// See the #rcConfig documentation for more information on the configuration parameters.
|
/// See the #rcConfig documentation for more information on the configuration parameters.
|
||||||
///
|
///
|
||||||
/// @see rcAllocHeightfield, rcHeightfield
|
/// @see rcAllocHeightfield, rcHeightfield
|
||||||
bool rcCreateHeightfield(rcContext* /*ctx*/, rcHeightfield& hf, int width, int height,
|
bool rcCreateHeightfield(rcContext* ctx, rcHeightfield& hf, int width, int height,
|
||||||
const float* bmin, const float* bmax,
|
const float* bmin, const float* bmax,
|
||||||
float cs, float ch)
|
float cs, float ch)
|
||||||
{
|
{
|
||||||
// TODO: VC complains about unref formal variable, figure out a way to handle this better.
|
rcIgnoreUnused(ctx);
|
||||||
// rcAssert(ctx);
|
|
||||||
|
|
||||||
hf.width = width;
|
hf.width = width;
|
||||||
hf.height = height;
|
hf.height = height;
|
||||||
@ -245,13 +244,12 @@ static void calcTriNormal(const float* v0, const float* v1, const float* v2, flo
|
|||||||
/// See the #rcConfig documentation for more information on the configuration parameters.
|
/// See the #rcConfig documentation for more information on the configuration parameters.
|
||||||
///
|
///
|
||||||
/// @see rcHeightfield, rcClearUnwalkableTriangles, rcRasterizeTriangles
|
/// @see rcHeightfield, rcClearUnwalkableTriangles, rcRasterizeTriangles
|
||||||
void rcMarkWalkableTriangles(rcContext* /*ctx*/, const float walkableSlopeAngle,
|
void rcMarkWalkableTriangles(rcContext* ctx, const float walkableSlopeAngle,
|
||||||
const float* verts, int /*nv*/,
|
const float* verts, int /*nv*/,
|
||||||
const int* tris, int nt,
|
const int* tris, int nt,
|
||||||
unsigned char* areas)
|
unsigned char* areas)
|
||||||
{
|
{
|
||||||
// TODO: VC complains about unref formal variable, figure out a way to handle this better.
|
rcIgnoreUnused(ctx);
|
||||||
// rcAssert(ctx);
|
|
||||||
|
|
||||||
const float walkableThr = cosf(walkableSlopeAngle/180.0f*RC_PI);
|
const float walkableThr = cosf(walkableSlopeAngle/180.0f*RC_PI);
|
||||||
|
|
||||||
@ -275,13 +273,12 @@ void rcMarkWalkableTriangles(rcContext* /*ctx*/, const float walkableSlopeAngle,
|
|||||||
/// See the #rcConfig documentation for more information on the configuration parameters.
|
/// See the #rcConfig documentation for more information on the configuration parameters.
|
||||||
///
|
///
|
||||||
/// @see rcHeightfield, rcClearUnwalkableTriangles, rcRasterizeTriangles
|
/// @see rcHeightfield, rcClearUnwalkableTriangles, rcRasterizeTriangles
|
||||||
void rcClearUnwalkableTriangles(rcContext* /*ctx*/, const float walkableSlopeAngle,
|
void rcClearUnwalkableTriangles(rcContext* ctx, const float walkableSlopeAngle,
|
||||||
const float* verts, int /*nv*/,
|
const float* verts, int /*nv*/,
|
||||||
const int* tris, int nt,
|
const int* tris, int nt,
|
||||||
unsigned char* areas)
|
unsigned char* areas)
|
||||||
{
|
{
|
||||||
// TODO: VC complains about unref formal variable, figure out a way to handle this better.
|
rcIgnoreUnused(ctx);
|
||||||
// rcAssert(ctx);
|
|
||||||
|
|
||||||
const float walkableThr = cosf(walkableSlopeAngle/180.0f*RC_PI);
|
const float walkableThr = cosf(walkableSlopeAngle/180.0f*RC_PI);
|
||||||
|
|
||||||
@ -297,10 +294,9 @@ void rcClearUnwalkableTriangles(rcContext* /*ctx*/, const float walkableSlopeAng
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int rcGetHeightFieldSpanCount(rcContext* /*ctx*/, rcHeightfield& hf)
|
int rcGetHeightFieldSpanCount(rcContext* ctx, rcHeightfield& hf)
|
||||||
{
|
{
|
||||||
// TODO: VC complains about unref formal variable, figure out a way to handle this better.
|
rcIgnoreUnused(ctx);
|
||||||
// rcAssert(ctx);
|
|
||||||
|
|
||||||
const int w = hf.width;
|
const int w = hf.width;
|
||||||
const int h = hf.height;
|
const int h = hf.height;
|
||||||
|
@ -1068,6 +1068,7 @@ void CrowdTool::handleToggle()
|
|||||||
|
|
||||||
void CrowdTool::handleUpdate(const float dt)
|
void CrowdTool::handleUpdate(const float dt)
|
||||||
{
|
{
|
||||||
|
rcIgnoreUnused(dt);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CrowdTool::handleRender()
|
void CrowdTool::handleRender()
|
||||||
@ -1076,6 +1077,9 @@ void CrowdTool::handleRender()
|
|||||||
|
|
||||||
void CrowdTool::handleRenderOverlay(double* proj, double* model, int* view)
|
void CrowdTool::handleRenderOverlay(double* proj, double* model, int* view)
|
||||||
{
|
{
|
||||||
|
rcIgnoreUnused(model);
|
||||||
|
rcIgnoreUnused(proj);
|
||||||
|
|
||||||
// Tool help
|
// Tool help
|
||||||
const int h = view[3];
|
const int h = view[3];
|
||||||
int ty = h-40;
|
int ty = h-40;
|
||||||
|
@ -261,8 +261,11 @@ 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)
|
||||||
{
|
{
|
||||||
|
rcIgnoreUnused(s);
|
||||||
|
rcIgnoreUnused(shift);
|
||||||
|
|
||||||
if (!m_sample) return;
|
if (!m_sample) return;
|
||||||
InputGeom* geom = m_sample->getInputGeom();
|
InputGeom* geom = m_sample->getInputGeom();
|
||||||
if (!geom) return;
|
if (!geom) return;
|
||||||
@ -341,9 +344,11 @@ void NavMeshPruneTool::handleRender()
|
|||||||
|
|
||||||
void NavMeshPruneTool::handleRenderOverlay(double* proj, double* model, int* view)
|
void NavMeshPruneTool::handleRenderOverlay(double* proj, double* model, int* view)
|
||||||
{
|
{
|
||||||
|
rcIgnoreUnused(model);
|
||||||
|
rcIgnoreUnused(proj);
|
||||||
|
|
||||||
// Tool help
|
// Tool help
|
||||||
const int h = view[3];
|
const int h = view[3];
|
||||||
|
|
||||||
imguiDrawText(280, h-40, IMGUI_ALIGN_LEFT, "LMB: Click fill area.", imguiRGBA(255,255,255,192));
|
imguiDrawText(280, h-40, IMGUI_ALIGN_LEFT, "LMB: Click fill area.", imguiRGBA(255,255,255,192));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user