mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-01 19:09:40 +00:00
Code Issues Releases Wiki Activity

Remove workaround for Ogre 1.8 (no longer supported)

Browse source
This commit is contained in:
scrawl 2014-10-02 16:15:56 +02:00
parent 861cc26aa6
commit eda296f1e3
1 changed files with 1 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
components/terrain/quadtreenode.cpp
View file

@ -73,38 +73,6 @@ namespace
return NULL; return NULL;
} }
// Ogre::AxisAlignedBox::distance is broken in 1.8.
Ogre::Real distance(const Ogre::AxisAlignedBox& box, const Ogre::Vector3& v)
{
if (box.contains(v))
return 0;
else
{
Ogre::Vector3 maxDist(0,0,0);
const Ogre::Vector3& minimum = box.getMinimum();
const Ogre::Vector3& maximum = box.getMaximum();
if (v.x < minimum.x)
maxDist.x = minimum.x - v.x;
else if (v.x > maximum.x)
maxDist.x = v.x - maximum.x;
if (v.y < minimum.y)
maxDist.y = minimum.y - v.y;
else if (v.y > maximum.y)
maxDist.y = v.y - maximum.y;
if (v.z < minimum.z)
maxDist.z = minimum.z - v.z;
else if (v.z > maximum.z)
maxDist.z = v.z - maximum.z;
return maxDist.length();
}
}
// Create a 2D quad // Create a 2D quad
void makeQuad(Ogre::SceneManager* sceneMgr, float left, float top, float right, float bottom, Ogre::MaterialPtr material) void makeQuad(Ogre::SceneManager* sceneMgr, float left, float top, float right, float bottom, Ogre::MaterialPtr material)
{ {
@ -270,7 +238,7 @@ bool QuadTreeNode::update(const Ogre::Vector3 &cameraPos)
if (mBounds.isNull()) if (mBounds.isNull())
return true; return true;
float dist = distance(mWorldBounds, cameraPos); float dist = mWorldBounds.distance(cameraPos);
// Make sure our scene node is attached // Make sure our scene node is attached
if (!mSceneNode->isInSceneGraph()) if (!mSceneNode->isInSceneGraph())