|
|
@ -334,12 +334,11 @@ public:
|
|
|
|
CVector mulVector(const CVector &v) const;
|
|
|
|
CVector mulVector(const CVector &v) const;
|
|
|
|
/// Multiply a point. ie v.w=1 so the Translation component do affect result. Projection doesn't affect result.
|
|
|
|
/// Multiply a point. ie v.w=1 so the Translation component do affect result. Projection doesn't affect result.
|
|
|
|
CVector mulPoint(const CVector &v) const;
|
|
|
|
CVector mulPoint(const CVector &v) const;
|
|
|
|
|
|
|
|
CVector3F mulPoint(const CVector3F &v) const;
|
|
|
|
/** Multiply a point. \sa mulPoint
|
|
|
|
/** Multiply a point. \sa mulPoint
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
CVector operator*(const CVector &v) const
|
|
|
|
NL_FORCE_INLINE CVector operator*(const CVector &v) const { return mulPoint(v); }
|
|
|
|
{
|
|
|
|
NL_FORCE_INLINE CVector3F operator*(const CVector3F &v) const { return mulPoint(v); }
|
|
|
|
return mulPoint(v);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/// Multiply with an homogeneous vector
|
|
|
|
/// Multiply with an homogeneous vector
|
|
|
|
CVectorH operator*(const CVectorH& v) const;
|
|
|
|
CVectorH operator*(const CVectorH& v) const;
|
|
|
@ -363,11 +362,11 @@ public:
|
|
|
|
friend CPlane operator*(const CPlane &p, const CMatrix &m);
|
|
|
|
friend CPlane operator*(const CPlane &p, const CMatrix &m);
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef NL_HAS_SSE2
|
|
|
|
#ifdef NL_HAS_SSE2
|
|
|
|
inline CMatrix44F &getMatrix() { testExpandRot(); testExpandProj(); return MF; }
|
|
|
|
inline CMatrix44F &getMatrix44F() { testExpandRot(); testExpandProj(); return MF; }
|
|
|
|
inline const CMatrix44F &getMatrix() const { testExpandRot(); testExpandProj(); return MF; }
|
|
|
|
inline const CMatrix44F &getMatrix44F() const { testExpandRot(); testExpandProj(); return MF; }
|
|
|
|
#else
|
|
|
|
#else
|
|
|
|
inline CMatrix44F &getMatrix() { return reinterpret_cast<CMatrix44F &>(*this); }
|
|
|
|
inline CMatrix44F &getMatrix44F() { return reinterpret_cast<CMatrix44F &>(*this); }
|
|
|
|
inline const CMatrix44F &getMatrix() const { return reinterpret_cast<const CMatrix44F &>(*this); }
|
|
|
|
inline const CMatrix44F &getMatrix44F() const { return reinterpret_cast<const CMatrix44F &>(*this); }
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
private:
|
|
|
|
private:
|
|
|
|