Commit d6cca9e7 authored by cutealien's avatar cutealien

Fix CTriangleBBSelector.h which had been broken when...

Fix CTriangleBBSelector.h which had been broken when CTriangleSelector::getTriangle behaviour had been improved (it's overloaded getTriangle no longer got called). Tests collisionResponseAnimator and sceneCollisionManager do now pass again.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4075 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 4c582793
......@@ -58,6 +58,22 @@ void CTriangleBBSelector::getTriangles(core::triangle3df* triangles,
CTriangleSelector::getTriangles(triangles, arraySize, outTriangleCount, transform);
}
void CTriangleBBSelector::getTriangles(core::triangle3df* triangles,
s32 arraySize, s32& outTriangleCount,
const core::aabbox3d<f32>& box,
const core::matrix4* transform) const
{
return getTriangles(triangles, arraySize, outTriangleCount, transform);
}
void CTriangleBBSelector::getTriangles(core::triangle3df* triangles,
s32 arraySize, s32& outTriangleCount,
const core::line3d<f32>& line,
const core::matrix4* transform) const
{
return getTriangles(triangles, arraySize, outTriangleCount, transform);
}
} // end namespace scene
} // end namespace irr
......
......@@ -23,6 +23,16 @@ public:
//! Gets all triangles.
virtual void getTriangles(core::triangle3df* triangles, s32 arraySize, s32& outTriangleCount,
const core::matrix4* transform=0) const;
//! Gets all triangles which lie within a specific bounding box.
void getTriangles(core::triangle3df* triangles, s32 arraySize, s32& outTriangleCount,
const core::aabbox3d<f32>& box, const core::matrix4* transform=0) const;
//! Gets all triangles which have or may have contact with a 3d line.
virtual void getTriangles(core::triangle3df* triangles, s32 arraySize,
s32& outTriangleCount, const core::line3d<f32>& line,
const core::matrix4* transform=0) const;
};
} // end namespace scene
......
Tests finished. 6 tests of 6 passed.
Compiled as DEBUG
Test suite pass at GMT Sun Feb 12 11:40:03 2012
Tests finished. 1 test of 1 passed.
Compiled as RELEASE
Test suite pass at GMT Sun Feb 12 22:15:37 2012
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment