diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-17 18:47:51 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-17 18:47:51 -0400 |
| commit | cb936d097fd40c743895cb35fce6b292c66e5210 (patch) | |
| tree | c554c33c7576aa567ca2b32ad06ee9af83977059 /indra/llmath/v3math.cpp | |
| parent | 32313dd3c6396324ea8f13285a69c01f38fe1cfc (diff) | |
| parent | bd37b14e9217935b9d70faf04c835c9d4aeda9c7 (diff) | |
pull back fix for STORM-1260 from beta branch
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 ) |