aboutsummaryrefslogtreecommitdiff
path: root/dep
diff options
context:
space:
mode:
authorAokromes <aokromes@gmail.com>2018-09-25 12:41:37 +0200
committerAokromes <aokromes@gmail.com>2018-09-25 12:41:37 +0200
commit58e297da1084599fd0b1db9d51b41f45759ee12d (patch)
treefc9a640b8612f17f7852d7acf897073256a235d9 /dep
parent7baf5b24525551ddf00c88084edb2a1bafeb758d (diff)
Core/Mmaps: Revert a bad change
Closes #22470 by xvwyh this doesn't needs to re-extract mmaps.
Diffstat (limited to 'dep')
-rw-r--r--dep/recastnavigation/Detour/Source/DetourNavMeshQuery.cpp3
-rw-r--r--dep/recastnavigation/recastnavigation.diff9
2 files changed, 1 insertions, 11 deletions
diff --git a/dep/recastnavigation/Detour/Source/DetourNavMeshQuery.cpp b/dep/recastnavigation/Detour/Source/DetourNavMeshQuery.cpp
index fcac11f0729..dafb7d2818e 100644
--- a/dep/recastnavigation/Detour/Source/DetourNavMeshQuery.cpp
+++ b/dep/recastnavigation/Detour/Source/DetourNavMeshQuery.cpp
@@ -100,8 +100,7 @@ inline float dtQueryFilter::getCost(const float* pa, const float* pb,
}
#endif
-static const float H_SCALE = 2.0f; // Search heuristic scale.
-
+static const float H_SCALE = 0.999f; // Search heuristic scale.
dtNavMeshQuery* dtAllocNavMeshQuery()
{
diff --git a/dep/recastnavigation/recastnavigation.diff b/dep/recastnavigation/recastnavigation.diff
index fe0c44a420e..691e017aaaf 100644
--- a/dep/recastnavigation/recastnavigation.diff
+++ b/dep/recastnavigation/recastnavigation.diff
@@ -68,15 +68,6 @@ diff --git a/Detour/Source/DetourNavMeshQuery.cpp b/Detour/Source/DetourNavMeshQ
index 75af102..a263106 100644
--- a/Detour/Source/DetourNavMeshQuery.cpp
+++ b/Detour/Source/DetourNavMeshQuery.cpp
-@@ -100,7 +100,7 @@ inline float dtQueryFilter::getCost(const float* pa, const float* pb,
- }
- #endif
-
--static const float H_SCALE = 0.999f; // Search heuristic scale.
-+static const float H_SCALE = 2.0f; // Search heuristic scale.
-
-
- dtNavMeshQuery* dtAllocNavMeshQuery()
@@ -3623,7 +3623,7 @@ dtStatus dtNavMeshQuery::findDistanceToWall(dtPolyRef startRef, const float* cen
dtVsub(hitNormal, centerPos, hitPos);
dtVnormalize(hitNormal);