diff options
| author | jackpoz <giacomopoz@gmail.com> | 2015-06-28 19:51:59 +0200 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2015-06-29 15:52:57 +0100 |
| commit | a48f8f4de9c0fc8251fdbb90a09be9e64fc6a19e (patch) | |
| tree | 4df32186bd3a93150021a0592d723d6c51cdad55 /dep/recastnavigation/Detour/Source/DetourNavMeshBuilder.cpp | |
| parent | a51300f8142d5ef2a7965ec4c5be97c5fc1cf33b (diff) | |
Core/Dependencies: Update recast
Update recast to https://github.com/memononen/recastnavigation/commit/1dd5cf1883d61e723fef3d4957cf758c50e7a52b
Fix 2 warnings.
These changes have no effect on MMAPs and it's not needed to re-extact them.
(cherry picked from commit dfa556aaa2fd60f881845d381f71294b945396f6)
Conflicts:
dep/PackageList.txt
Diffstat (limited to 'dep/recastnavigation/Detour/Source/DetourNavMeshBuilder.cpp')
| -rw-r--r-- | dep/recastnavigation/Detour/Source/DetourNavMeshBuilder.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dep/recastnavigation/Detour/Source/DetourNavMeshBuilder.cpp b/dep/recastnavigation/Detour/Source/DetourNavMeshBuilder.cpp index 9d8471b96a1..1bf271bed7a 100644 --- a/dep/recastnavigation/Detour/Source/DetourNavMeshBuilder.cpp +++ b/dep/recastnavigation/Detour/Source/DetourNavMeshBuilder.cpp @@ -16,13 +16,13 @@ // 3. This notice may not be removed or altered from any source distribution. // -#include <math.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <float.h> #include "DetourNavMesh.h" #include "DetourCommon.h" +#include "DetourMath.h" #include "DetourNavMeshBuilder.h" #include "DetourAlloc.h" #include "DetourAssert.h" @@ -202,8 +202,8 @@ static int createBVTree(const unsigned short* verts, const int /*nverts*/, if (z > it.bmax[2]) it.bmax[2] = z; } // Remap y - it.bmin[1] = (unsigned short)floorf((float)it.bmin[1]*ch/cs); - it.bmax[1] = (unsigned short)ceilf((float)it.bmax[1]*ch/cs); + it.bmin[1] = (unsigned short)dtMathFloorf((float)it.bmin[1]*ch/cs); + it.bmax[1] = (unsigned short)dtMathCeilf((float)it.bmax[1]*ch/cs); } int curNode = 0; |