forked from Mirrorlandia_minetest/irrlicht
Remove deprecated function transformBox
This commit is contained in:
parent
00dd1f8ef3
commit
af20d9ff86
@ -278,13 +278,6 @@ namespace core
|
|||||||
void transformPlane( const core::plane3d<f32> &in, core::plane3d<f32> &out) const;
|
void transformPlane( const core::plane3d<f32> &in, core::plane3d<f32> &out) const;
|
||||||
|
|
||||||
//! Transforms a axis aligned bounding box
|
//! Transforms a axis aligned bounding box
|
||||||
/** The result box of this operation may not be accurate at all. For
|
|
||||||
correct results, use transformBoxEx() */
|
|
||||||
void transformBox(core::aabbox3d<f32>& box) const;
|
|
||||||
|
|
||||||
//! Transforms a axis aligned bounding box
|
|
||||||
/** The result box of this operation should be accurate, but this operation
|
|
||||||
is slower than transformBox(). */
|
|
||||||
void transformBoxEx(core::aabbox3d<f32>& box) const;
|
void transformBoxEx(core::aabbox3d<f32>& box) const;
|
||||||
|
|
||||||
//! Multiplies this matrix by a 1x4 matrix
|
//! Multiplies this matrix by a 1x4 matrix
|
||||||
@ -963,7 +956,7 @@ namespace core
|
|||||||
|
|
||||||
// We assume the matrix uses rotations instead of negative scaling 2 axes.
|
// We assume the matrix uses rotations instead of negative scaling 2 axes.
|
||||||
// Otherwise it fails even for some simple cases, like rotating around
|
// Otherwise it fails even for some simple cases, like rotating around
|
||||||
// 2 axes by 180° which getScale thinks is a negative scaling.
|
// 2 axes by 180° which getScale thinks is a negative scaling.
|
||||||
if (scale.Y<0 && scale.Z<0)
|
if (scale.Y<0 && scale.Z<0)
|
||||||
{
|
{
|
||||||
scale.Y =-scale.Y;
|
scale.Y =-scale.Y;
|
||||||
@ -1278,22 +1271,6 @@ namespace core
|
|||||||
transformPlane( out );
|
transformPlane( out );
|
||||||
}
|
}
|
||||||
|
|
||||||
//! Transforms the edge-points of a bounding box
|
|
||||||
//! Deprecated as it's usually not what people need (regards only 2 corners, but other corners might be outside the box after transformation)
|
|
||||||
//! Use transformBoxEx instead.
|
|
||||||
template <class T>
|
|
||||||
_IRR_DEPRECATED_ inline void CMatrix4<T>::transformBox(core::aabbox3d<f32>& box) const
|
|
||||||
{
|
|
||||||
#if defined ( USE_MATRIX_TEST )
|
|
||||||
if (isIdentity())
|
|
||||||
return;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
transformVect(box.MinEdge);
|
|
||||||
transformVect(box.MaxEdge);
|
|
||||||
box.repair();
|
|
||||||
}
|
|
||||||
|
|
||||||
//! Transforms a axis aligned bounding box more accurately than transformBox()
|
//! Transforms a axis aligned bounding box more accurately than transformBox()
|
||||||
template <class T>
|
template <class T>
|
||||||
inline void CMatrix4<T>::transformBoxEx(core::aabbox3d<f32>& box) const
|
inline void CMatrix4<T>::transformBoxEx(core::aabbox3d<f32>& box) const
|
||||||
|
Loading…
Reference in New Issue
Block a user