TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 16:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed possible divide by zero issues.

Browse source 
Fixed several areas in the point class that could have a divide by zero
issue.
This commit is contained in:
Nathan Bowhay 2015-02-03 12:13:06 -08:00
parent 105c2b68f7
commit c7e0d83587
1 changed files with 28 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Engine/source/math/mPoint3.h
View file

@ -233,11 +233,13 @@ class Point3D
bool isZero() const; bool isZero() const;
F64 len() const; F64 len() const;
F64 lenSquared() const; F64 lenSquared() const;
F64 magnitudeSafe() const;
//-------------------------------------- Mathematical mutators //-------------------------------------- Mathematical mutators
public: public:
void neg(); void neg();
void normalize(); void normalize();
void normalizeSafe();
void normalize(F64 val); void normalize(F64 val);
void convolve(const Point3D&); void convolve(const Point3D&);
void convolveInverse(const Point3D&); void convolveInverse(const Point3D&);
@ -728,11 +730,13 @@ inline Point3F& Point3F::operator*=(const Point3F &_vec)
inline Point3F Point3F::operator/(const Point3F &_vec) const inline Point3F Point3F::operator/(const Point3F &_vec) const
{ {
AssertFatal(_vec.x != 0.0f && _vec.y != 0.0f && _vec.z != 0.0f, "Error, div by zero attempted");
return Point3F(x / _vec.x, y / _vec.y, z / _vec.z); return Point3F(x / _vec.x, y / _vec.y, z / _vec.z);
} }
inline Point3F& Point3F::operator/=(const Point3F &_vec) inline Point3F& Point3F::operator/=(const Point3F &_vec)
{ {
AssertFatal(_vec.x != 0.0f && _vec.y != 0.0f && _vec.z != 0.0f, "Error, div by zero attempted");
x /= _vec.x; x /= _vec.x;
y /= _vec.y; y /= _vec.y;
z /= _vec.z; z /= _vec.z;
@ -855,7 +859,8 @@ inline F64 Point3D::lenSquared() const
inline F64 Point3D::len() const inline F64 Point3D::len() const
{ {
return mSqrtD(x*x + y*y + z*z); F64 temp = x*x + y*y + z*z;
return (temp > 0.0) ? mSqrtD(x*x + y*y + z*z) : 0.0;
} }
inline void Point3D::normalize() inline void Point3D::normalize()
@ -863,6 +868,28 @@ inline void Point3D::normalize()
m_point3D_normalize(*this); m_point3D_normalize(*this);
} }
inline F64 Point3D::magnitudeSafe() const
{
if( isZero() )
{
return 0.0;
}
else
{
return len();
}
}
inline void Point3D::normalizeSafe()
{
F64 vmag = magnitudeSafe();
if( vmag > POINT_EPSILON )
{
*this *= F64(1.0 / vmag);
}
}
inline void Point3D::normalize(F64 val) inline void Point3D::normalize(F64 val)
{ {
m_point3D_normalize_f(*this, val); m_point3D_normalize_f(*this, val);