diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-01-20 15:08:29 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-01-20 15:08:29 -0600 |
| commit | d3e84ea77baa7d60fe225f7b440297e9a49318a6 (patch) | |
| tree | 6687e8f6d74640f726c22ab5418a1025c6af493f /indra | |
| parent | 0a955ae550d3b810da67a17848a6cbc5ef11edb5 (diff) | |
First stab at making model importer act more like scene importer. Upload button still doesn't work.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llmath/m4math.cpp | 17 | ||||
| -rw-r--r-- | indra/llmath/m4math.h | 1 |
2 files changed, 18 insertions, 0 deletions
diff --git a/indra/llmath/m4math.cpp b/indra/llmath/m4math.cpp index 7c7f60154d..3700142982 100644 --- a/indra/llmath/m4math.cpp +++ b/indra/llmath/m4math.cpp @@ -785,6 +785,23 @@ bool operator!=(const LLMatrix4 &a, const LLMatrix4 &b) return FALSE; } +bool operator<(const LLMatrix4& a, const LLMatrix4 &b) +{ + U32 i, j; + for (i = 0; i < NUM_VALUES_IN_MAT4; i++) + { + for (j = 0; j < NUM_VALUES_IN_MAT4; j++) + { + if (a.mMatrix[i][j] != b.mMatrix[i][j]) + { + return a.mMatrix[i][j] < b.mMatrix[i][j]; + } + } + } + + return false; +} + const LLMatrix4& operator*=(LLMatrix4 &a, F32 k) { U32 i, j; diff --git a/indra/llmath/m4math.h b/indra/llmath/m4math.h index de981b7646..6007b96bd9 100644 --- a/indra/llmath/m4math.h +++ b/indra/llmath/m4math.h @@ -237,6 +237,7 @@ public: friend bool operator==(const LLMatrix4 &a, const LLMatrix4 &b); // Return a == b friend bool operator!=(const LLMatrix4 &a, const LLMatrix4 &b); // Return a != b + friend bool operator<(const LLMatrix4 &a, const LLMatrix4& b); // Return a < b friend const LLMatrix4& operator+=(LLMatrix4 &a, const LLMatrix4 &b); // Return a + b friend const LLMatrix4& operator-=(LLMatrix4 &a, const LLMatrix4 &b); // Return a - b |