diff --git a/RecastDemo/Bin/Recast.exe b/RecastDemo/Bin/Recast.exe index 6dc193f..f77ac66 100644 Binary files a/RecastDemo/Bin/Recast.exe and b/RecastDemo/Bin/Recast.exe differ diff --git a/RecastDemo/Build/VC9/Recast.suo b/RecastDemo/Build/VC9/Recast.suo index 1027909..8d4c6cc 100644 Binary files a/RecastDemo/Build/VC9/Recast.suo and b/RecastDemo/Build/VC9/Recast.suo differ diff --git a/RecastDemo/Build/VC9/Recast.vcproj b/RecastDemo/Build/VC9/Recast.vcproj index 0c24cfc..8121244 100644 --- a/RecastDemo/Build/VC9/Recast.vcproj +++ b/RecastDemo/Build/VC9/Recast.vcproj @@ -176,6 +176,10 @@ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > + + @@ -246,6 +250,10 @@ Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" > + + diff --git a/RecastDemo/Source/ChunkyTriMesh.cpp b/RecastDemo/Source/ChunkyTriMesh.cpp index c877a9a..68819b7 100644 --- a/RecastDemo/Source/ChunkyTriMesh.cpp +++ b/RecastDemo/Source/ChunkyTriMesh.cpp @@ -71,14 +71,7 @@ static void calcExtends(BoundsItem* items, int nitems, int imin, int imax, inline int longestAxis(float x, float y) { - int axis = 0; - unsigned short maxVal = x; - if (y > maxVal) - { - axis = 1; - maxVal = y; - } - return axis; + return y > x ? 1 : 0; } static void subdivide(BoundsItem* items, int nitems, int imin, int imax, int trisPerChunk, diff --git a/RecastDemo/Source/demo.cpp b/RecastDemo/Source/demo.cpp index c4e0df1..947c02f 100644 --- a/RecastDemo/Source/demo.cpp +++ b/RecastDemo/Source/demo.cpp @@ -1556,7 +1556,7 @@ int main(int argc, char *argv[]) if ((int)tileSize > 0) { cfg.borderSize = cfg.walkableRadius*2 + 2; - cfg.tileSize = tileSize; + cfg.tileSize = (int)tileSize; delete g_tileSet; g_tileSet = new TileSet;