Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 19:06:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add plane/finitecheck tests for OOB intersection-vectors (this should fix vmap-related freezes) - patch by Gyullo

Browse Source 
--HG--
branch : trunk
This commit is contained in:
click
2010-06-17 20:38:46 +02:00
parent bc704b4a55
commit aa74cac7cb
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/server/collision/Maps/MapTree.cpp
View File

@@ -146,19 +146,32 @@ namespace VMAP
bool StaticMapTree::isInLineOfSight(const Vector3& pos1, const Vector3& pos2) const
{
bool result = true;
bool result = false;
float maxDist = (pos2 - pos1).magnitude();
// valid map coords should *never ever* produce float overflow, but this would produce NaNs too
ASSERT(maxDist < std::numeric_limits<float>::max());
//ASSERT(maxDist < std::numeric_limits<float>::max());
// prevent NaN values which can cause BIH intersection to enter infinite loop
if (maxDist < 1e-10f)
return true;
// direction with length of 1
G3D::Plane checkPlane = G3D::Plane(pos1, pos2, (pos2 - pos1));
G3D::Ray ray = G3D::Ray::fromOriginAndDirection(pos1, (pos2 - pos1)/maxDist);
float resultDist = getIntersectionTime(ray, maxDist, true);
if (resultDist < maxDist)
Vector3 checkFinite = ray.intersection(checkPlane);
if (!checkFinite.isFinite())
{
result = false;
ray = G3D::Ray::fromOriginAndDirection(pos1, -((pos2 - pos1)/maxDist));
checkFinite = ray.intersection(checkPlane);
}
if (checkFinite.isFinite())
{
float resultDist = getIntersectionTime(ray, maxDist, true);
if (resultDist >= maxDist)
{
result = true;
}
}
return result;
}