mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-01-19 20:24:49 +00:00
Merge pull request #317 from DavidWyand-GG/PointZeroing
zero() method added to all point classes
This commit is contained in:
commit
1ed1a41256
|
|
@ -48,6 +48,7 @@ class Point2I
|
|||
void set(S32 in_x, S32 in_y); ///< Set (x,y) position
|
||||
void setMin(const Point2I&); ///< Store lesser co-ordinates from parameter in this point.
|
||||
void setMax(const Point2I&); ///< Store greater co-ordinates from parameter in this point.
|
||||
void zero(); ///< Zero all values
|
||||
|
||||
//-------------------------------------- Math mutators
|
||||
void neg(); ///< Invert sign of point's co-ordinates.
|
||||
|
|
@ -123,6 +124,8 @@ class Point2F
|
|||
/// @param c Interpolation factor (0.0 .. 1.0).
|
||||
void interpolate(const Point2F& a, const Point2F& b, const F32 c);
|
||||
|
||||
void zero(); ///< Zero all values
|
||||
|
||||
operator F32*() { return &x; }
|
||||
operator const F32*() const { return &x; }
|
||||
|
||||
|
|
@ -213,6 +216,8 @@ class Point2D
|
|||
/// @param c Interpolation factor (0.0 .. 1.0).
|
||||
void interpolate(const Point2D &a, const Point2D &b, const F64 c);
|
||||
|
||||
void zero(); ///< Zero all values
|
||||
|
||||
operator F64*() { return &x; }
|
||||
operator const F64*() const { return &x; }
|
||||
|
||||
|
|
@ -301,6 +306,12 @@ inline void Point2I::setMax(const Point2I& _test)
|
|||
}
|
||||
|
||||
|
||||
inline void Point2I::zero()
|
||||
{
|
||||
x = y = 0;
|
||||
}
|
||||
|
||||
|
||||
inline void Point2I::neg()
|
||||
{
|
||||
x = -x;
|
||||
|
|
@ -483,6 +494,12 @@ inline void Point2F::interpolate(const Point2F& _rFrom, const Point2F& _to, cons
|
|||
}
|
||||
|
||||
|
||||
inline void Point2F::zero()
|
||||
{
|
||||
x = y = 0.0f;
|
||||
}
|
||||
|
||||
|
||||
inline bool Point2F::isZero() const
|
||||
{
|
||||
return (x == 0.0f) && (y == 0.0f);
|
||||
|
|
@ -720,6 +737,12 @@ inline void Point2D::interpolate(const Point2D& _rFrom, const Point2D& _to, cons
|
|||
}
|
||||
|
||||
|
||||
inline void Point2D::zero()
|
||||
{
|
||||
x = y = 0.0;
|
||||
}
|
||||
|
||||
|
||||
inline bool Point2D::isZero() const
|
||||
{
|
||||
return (x == 0.0f) && (y == 0.0f);
|
||||
|
|
|
|||
|
|
@ -54,6 +54,7 @@ class Point3I
|
|||
void set(S32 in_x, S32 in_y, S32 in_z); ///< Set co-ordinates.
|
||||
void setMin(const Point3I&); ///< Store lesser co-ordinates in this point.
|
||||
void setMax(const Point3I&); ///< Store greater co-ordinates in this point.
|
||||
void zero(); ///< Zero all values
|
||||
|
||||
//-------------------------------------- Math mutators
|
||||
void neg(); ///< Invert co-ordinate's signs.
|
||||
|
|
@ -222,6 +223,7 @@ class Point3D
|
|||
void setMax(const Point3D&);
|
||||
|
||||
void interpolate(const Point3D&, const Point3D&, F64);
|
||||
void zero();
|
||||
|
||||
operator F64*() { return (&x); }
|
||||
operator const F64*() const { return &x; }
|
||||
|
|
@ -320,6 +322,11 @@ inline void Point3I::setMax(const Point3I& _test)
|
|||
z = (_test.z > z) ? _test.z : z;
|
||||
}
|
||||
|
||||
inline void Point3I::zero()
|
||||
{
|
||||
x = y = z = 0;
|
||||
}
|
||||
|
||||
inline void Point3I::neg()
|
||||
{
|
||||
x = -x;
|
||||
|
|
@ -810,6 +817,11 @@ inline void Point3D::interpolate(const Point3D& _from, const Point3D& _to, F64 _
|
|||
m_point3D_interpolate( _from, _to, _factor, *this);
|
||||
}
|
||||
|
||||
inline void Point3D::zero()
|
||||
{
|
||||
x = y = z = 0.0;
|
||||
}
|
||||
|
||||
inline bool Point3D::isZero() const
|
||||
{
|
||||
return (x == 0.0f) && (y == 0.0f) && (z == 0.0f);
|
||||
|
|
|
|||
|
|
@ -42,6 +42,8 @@ class Point4I
|
|||
Point4I() {}
|
||||
Point4I(S32 _x, S32 _y, S32 _z, S32 _w);
|
||||
|
||||
void zero(); ///< Zero all values
|
||||
|
||||
S32 x;
|
||||
S32 y;
|
||||
S32 z;
|
||||
|
|
@ -85,6 +87,8 @@ class Point4F
|
|||
/// @param _factor Interpolation factor (0.0 .. 1.0).
|
||||
void interpolate(const Point4F& _pt1, const Point4F& _pt2, F32 _factor);
|
||||
|
||||
void zero();
|
||||
|
||||
operator F32*() { return (&x); }
|
||||
operator const F32*() const { return &x; }
|
||||
|
||||
|
|
@ -111,6 +115,14 @@ class Point4F
|
|||
|
||||
typedef Point4F Vector4F; ///< Points can be vectors!
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
//-------------------------------------- Point4I
|
||||
|
||||
inline void Point4I::zero()
|
||||
{
|
||||
x = y = z = w = 0;
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
//-------------------------------------- Point4F
|
||||
//
|
||||
|
|
@ -149,6 +161,11 @@ inline void Point4F::interpolate(const Point4F& _from, const Point4F& _to, F32 _
|
|||
w = (_from.w * (1.0f - _factor)) + (_to.w * _factor);
|
||||
}
|
||||
|
||||
inline void Point4F::zero()
|
||||
{
|
||||
x = y = z = w = 0.0f;
|
||||
}
|
||||
|
||||
inline Point4F& Point4F::operator=(const Point3F &_vec)
|
||||
{
|
||||
x = _vec.x;
|
||||
|
|
|
|||
Loading…
Reference in a new issue