- win32 compile fixes
- update vc project
This commit is contained in:
parent
55360f6ee5
commit
8215cd48d1
@ -143,11 +143,12 @@ void rcCalcGridSize(const float* bmin, const float* bmax, float cs, int* w, int*
|
|||||||
*h = (int)((bmax[2] - bmin[2])/cs+0.5f);
|
*h = (int)((bmax[2] - bmin[2])/cs+0.5f);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool rcCreateHeightfield(rcBuildContext* ctx, rcHeightfield& hf, int width, int height,
|
bool rcCreateHeightfield(rcBuildContext* /*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)
|
||||||
{
|
{
|
||||||
rcAssert(ctx);
|
// TODO: VC complains about unref formal variable, figure out a way to handle this better.
|
||||||
|
// rcAssert(ctx);
|
||||||
|
|
||||||
hf.width = width;
|
hf.width = width;
|
||||||
hf.height = height;
|
hf.height = height;
|
||||||
@ -171,12 +172,13 @@ static void calcTriNormal(const float* v0, const float* v1, const float* v2, flo
|
|||||||
rcVnormalize(norm);
|
rcVnormalize(norm);
|
||||||
}
|
}
|
||||||
|
|
||||||
void rcMarkWalkableTriangles(rcBuildContext* ctx, const float walkableSlopeAngle,
|
void rcMarkWalkableTriangles(rcBuildContext* /*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)
|
||||||
{
|
{
|
||||||
rcAssert(ctx);
|
// TODO: VC complains about unref formal variable, figure out a way to handle this better.
|
||||||
|
// rcAssert(ctx);
|
||||||
|
|
||||||
const float walkableThr = cosf(walkableSlopeAngle/180.0f*(float)M_PI);
|
const float walkableThr = cosf(walkableSlopeAngle/180.0f*(float)M_PI);
|
||||||
|
|
||||||
@ -192,12 +194,13 @@ void rcMarkWalkableTriangles(rcBuildContext* ctx, const float walkableSlopeAngle
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void rcClearUnwalkableTriangles(rcBuildContext* ctx, const float walkableSlopeAngle,
|
void rcClearUnwalkableTriangles(rcBuildContext* /*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)
|
||||||
{
|
{
|
||||||
rcAssert(ctx);
|
// TODO: VC complains about unref formal variable, figure out a way to handle this better.
|
||||||
|
// rcAssert(ctx);
|
||||||
|
|
||||||
const float walkableThr = cosf(walkableSlopeAngle/180.0f*(float)M_PI);
|
const float walkableThr = cosf(walkableSlopeAngle/180.0f*(float)M_PI);
|
||||||
|
|
||||||
@ -213,9 +216,10 @@ void rcClearUnwalkableTriangles(rcBuildContext* ctx, const float walkableSlopeAn
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int rcGetHeightFieldSpanCount(rcBuildContext* ctx, rcHeightfield& hf)
|
int rcGetHeightFieldSpanCount(rcBuildContext* /*ctx*/, rcHeightfield& hf)
|
||||||
{
|
{
|
||||||
rcAssert(ctx);
|
// TODO: VC complains about unref formal variable, figure out a way to handle this better.
|
||||||
|
// rcAssert(ctx);
|
||||||
|
|
||||||
const int w = hf.width;
|
const int w = hf.width;
|
||||||
const int h = hf.height;
|
const int h = hf.height;
|
||||||
|
@ -154,11 +154,11 @@ static void addSpan(rcHeightfield& hf, const int x, const int y,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void rcAddSpan(rcBuildContext* ctx, rcHeightfield& hf, const int x, const int y,
|
void rcAddSpan(rcBuildContext* /*ctx*/, rcHeightfield& hf, const int x, const int y,
|
||||||
const unsigned short smin, const unsigned short smax,
|
const unsigned short smin, const unsigned short smax,
|
||||||
const unsigned char area, const int flagMergeThr)
|
const unsigned char area, const int flagMergeThr)
|
||||||
{
|
{
|
||||||
rcAssert(ctx);
|
// rcAssert(ctx);
|
||||||
addSpan(hf, x,y, smin, smax, area, flagMergeThr);
|
addSpan(hf, x,y, smin, smax, area, flagMergeThr);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Binary file not shown.
@ -192,11 +192,7 @@
|
|||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\..\..\Recast\Include\RecastLog.h"
|
RelativePath="..\..\..\Recast\Include\RecastAssert.h"
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\..\..\Recast\Include\RecastTimer.h"
|
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
</Filter>
|
</Filter>
|
||||||
@ -223,10 +219,6 @@
|
|||||||
RelativePath="..\..\..\Recast\Source\RecastFilter.cpp"
|
RelativePath="..\..\..\Recast\Source\RecastFilter.cpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
|
||||||
RelativePath="..\..\..\Recast\Source\RecastLog.cpp"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
<File
|
||||||
RelativePath="..\..\..\Recast\Source\RecastMesh.cpp"
|
RelativePath="..\..\..\Recast\Source\RecastMesh.cpp"
|
||||||
>
|
>
|
||||||
@ -243,10 +235,6 @@
|
|||||||
RelativePath="..\..\..\Recast\Source\RecastRegion.cpp"
|
RelativePath="..\..\..\Recast\Source\RecastRegion.cpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
|
||||||
RelativePath="..\..\..\Recast\Source\RecastTimer.cpp"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
</Filter>
|
</Filter>
|
||||||
</Filter>
|
</Filter>
|
||||||
<Filter
|
<Filter
|
||||||
@ -379,6 +367,10 @@
|
|||||||
RelativePath="..\..\Include\Sample_TileMesh.h"
|
RelativePath="..\..\Include\Sample_TileMesh.h"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\..\Include\SampleInterfaces.h"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\..\Include\SlideShow.h"
|
RelativePath="..\..\Include\SlideShow.h"
|
||||||
>
|
>
|
||||||
@ -463,6 +455,10 @@
|
|||||||
RelativePath="..\..\Source\Sample_TileMesh.cpp"
|
RelativePath="..\..\Source\Sample_TileMesh.cpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\..\Source\SampleInterfaces.cpp"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\..\Source\SlideShow.cpp"
|
RelativePath="..\..\Source\SlideShow.cpp"
|
||||||
>
|
>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user