aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llmath/m4math.h
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/llmath/m4math.h16
1 files changed, 7 insertions, 9 deletions
diff --git a/linden/indra/llmath/m4math.h b/linden/indra/llmath/m4math.h
index 27eb865..96e0a31 100644
--- a/linden/indra/llmath/m4math.h
+++ b/linden/indra/llmath/m4math.h
@@ -1,6 +1,6 @@
1/** 1/**
2 * @file m4math.h 2 * @file m4math.h
3 * @brief LLMatrix3 class header file. 3 * @brief LLMatrix4 class header file.
4 * 4 *
5 * $LicenseInfo:firstyear=2000&license=viewergpl$ 5 * $LicenseInfo:firstyear=2000&license=viewergpl$
6 * 6 *
@@ -101,9 +101,13 @@ class LLMatrix4
101public: 101public:
102 F32 mMatrix[NUM_VALUES_IN_MAT4][NUM_VALUES_IN_MAT4]; 102 F32 mMatrix[NUM_VALUES_IN_MAT4][NUM_VALUES_IN_MAT4];
103 103
104 LLMatrix4(); // Initializes Matrix to identity matrix 104 // Initializes Matrix to identity matrix
105 LLMatrix4()
106 {
107 setIdentity();
108 }
105 explicit LLMatrix4(const F32 *mat); // Initializes Matrix to values in mat 109 explicit LLMatrix4(const F32 *mat); // Initializes Matrix to values in mat
106 explicit LLMatrix4(const LLMatrix3 &mat); // Initializes Matrix to valuee in mat and sets position to (0,0,0) 110 explicit LLMatrix4(const LLMatrix3 &mat); // Initializes Matrix to values in mat and sets position to (0,0,0)
107 explicit LLMatrix4(const LLQuaternion &q); // Initializes Matrix with rotation q and sets position to (0,0,0) 111 explicit LLMatrix4(const LLQuaternion &q); // Initializes Matrix with rotation q and sets position to (0,0,0)
108 112
109 LLMatrix4(const LLMatrix3 &mat, const LLVector4 &pos); // Initializes Matrix to values in mat and pos 113 LLMatrix4(const LLMatrix3 &mat, const LLVector4 &pos); // Initializes Matrix to values in mat and pos
@@ -240,12 +244,6 @@ public:
240 friend std::ostream& operator<<(std::ostream& s, const LLMatrix4 &a); // Stream a 244 friend std::ostream& operator<<(std::ostream& s, const LLMatrix4 &a); // Stream a
241}; 245};
242 246
243
244inline LLMatrix4::LLMatrix4()
245{
246 setIdentity();
247}
248
249inline const LLMatrix4& LLMatrix4::setIdentity() 247inline const LLMatrix4& LLMatrix4::setIdentity()
250{ 248{
251 mMatrix[0][0] = 1.f; 249 mMatrix[0][0] = 1.f;