diff options
| author | Palmer <palmer@lindenlab.com> | 2009-12-07 16:03:56 -0800 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2009-12-07 16:03:56 -0800 |
| commit | 85488f54148b2dba02eadcbd50ccbb552638c3c7 (patch) | |
| tree | dbb248900527cac25c307970fb5c817b90b715e7 /indra/llmath/m4math.cpp | |
| parent | ee159d8e742a7281f304fc45b692c111706d294e (diff) | |
| parent | 9d3968bb837828568bf58113b8315c8ca2e8dae1 (diff) | |
Merge of viewer 2 changes
Diffstat (limited to 'indra/llmath/m4math.cpp')
| -rw-r--r-- | indra/llmath/m4math.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/llmath/m4math.cpp b/indra/llmath/m4math.cpp index d8e7b4aaf9..7c7f60154d 100644 --- a/indra/llmath/m4math.cpp +++ b/indra/llmath/m4math.cpp @@ -428,6 +428,17 @@ const LLMatrix4& LLMatrix4::initRotTrans(const LLQuaternion &q, const LLVector return (*this); } +const LLMatrix4& LLMatrix4::initScale(const LLVector3 &scale) +{ + setIdentity(); + + mMatrix[VX][VX] = scale.mV[VX]; + mMatrix[VY][VY] = scale.mV[VY]; + mMatrix[VZ][VZ] = scale.mV[VZ]; + + return (*this); +} + const LLMatrix4& LLMatrix4::initAll(const LLVector3 &scale, const LLQuaternion &q, const LLVector3 &pos) { F32 sx, sy, sz; |