diff options
author | Oz Linden <oz@lindenlab.com> | 2011-05-18 07:33:08 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-05-18 07:33:08 -0400 |
commit | 5eb6cb8d86cf19da79d034df52a0254079f2c95f (patch) | |
tree | cd2853e9c7c2cbf0bce317ca9018a6f4fa46a23f /indra/llmath/v3math.cpp | |
parent | 66c078de5e5a6b685d435f7b1a462d64ca80f35e (diff) | |
parent | 644cbc44871992a95bcd5a6854dfc2a4d56a7b62 (diff) |
merge up latest viewer-development (post mesh)
Diffstat (limited to 'indra/llmath/v3math.cpp')
-rw-r--r-- | indra/llmath/v3math.cpp | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/indra/llmath/v3math.cpp b/indra/llmath/v3math.cpp index 18b15e08c4..e7107dee16 100644 --- a/indra/llmath/v3math.cpp +++ b/indra/llmath/v3math.cpp @@ -206,6 +206,28 @@ const LLVector3& LLVector3::rotVec(const LLQuaternion &q) return *this; } +const LLVector3& LLVector3::transVec(const LLMatrix4& mat) +{ + setVec( + mV[VX] * mat.mMatrix[VX][VX] + + mV[VY] * mat.mMatrix[VX][VY] + + mV[VZ] * mat.mMatrix[VX][VZ] + + mat.mMatrix[VX][VW], + + mV[VX] * mat.mMatrix[VY][VX] + + mV[VY] * mat.mMatrix[VY][VY] + + mV[VZ] * mat.mMatrix[VY][VZ] + + mat.mMatrix[VY][VW], + + mV[VX] * mat.mMatrix[VZ][VX] + + mV[VY] * mat.mMatrix[VZ][VY] + + mV[VZ] * mat.mMatrix[VZ][VZ] + + mat.mMatrix[VZ][VW]); + + return *this; +} + + const LLVector3& LLVector3::rotVec(F32 angle, const LLVector3 &vec) { if ( !vec.isExactlyZero() && angle ) |