Visual studio compile fixes.

This commit is contained in:
Mikko Mononen 2009-06-16 10:03:47 +00:00
parent e638624828
commit b31b9334c3
5 changed files with 10 additions and 9 deletions

Binary file not shown.

Binary file not shown.

View File

@ -176,6 +176,10 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
> >
<File
RelativePath="..\..\Source\ChunkyTriMesh.cpp"
>
</File>
<File <File
RelativePath="..\..\Source\demo.cpp" RelativePath="..\..\Source\demo.cpp"
> >
@ -246,6 +250,10 @@
Filter="h;hpp;hxx;hm;inl;inc;xsd" Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
> >
<File
RelativePath="..\..\Include\ChunkyTriMesh.h"
>
</File>
<File <File
RelativePath="..\..\..\Detour\Include\DetourDebugDraw.h" RelativePath="..\..\..\Detour\Include\DetourDebugDraw.h"
> >

View File

@ -71,14 +71,7 @@ static void calcExtends(BoundsItem* items, int nitems, int imin, int imax,
inline int longestAxis(float x, float y) inline int longestAxis(float x, float y)
{ {
int axis = 0; return y > x ? 1 : 0;
unsigned short maxVal = x;
if (y > maxVal)
{
axis = 1;
maxVal = y;
}
return axis;
} }
static void subdivide(BoundsItem* items, int nitems, int imin, int imax, int trisPerChunk, static void subdivide(BoundsItem* items, int nitems, int imin, int imax, int trisPerChunk,

View File

@ -1556,7 +1556,7 @@ int main(int argc, char *argv[])
if ((int)tileSize > 0) if ((int)tileSize > 0)
{ {
cfg.borderSize = cfg.walkableRadius*2 + 2; cfg.borderSize = cfg.walkableRadius*2 + 2;
cfg.tileSize = tileSize; cfg.tileSize = (int)tileSize;
delete g_tileSet; delete g_tileSet;
g_tileSet = new TileSet; g_tileSet = new TileSet;