diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-08 11:57:38 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-08 11:57:38 -0500 |
| commit | 634f152004f4b3938239ec2494030079f695b8ab (patch) | |
| tree | d59e9b3e37c93c141829aec44bf4da4e59d7ad10 /indra/llmath | |
| parent | 09b009fc23e75c8403cc9879f7f839d9e2656c02 (diff) | |
| parent | 99d4f573517085ac602514672eab8a45dc002823 (diff) | |
merge up to latest viewer-development
Diffstat (limited to 'indra/llmath')
| -rw-r--r-- | indra/llmath/v3math.cpp | 15 | ||||
| -rw-r--r-- | indra/llmath/v3math.h | 1 |
2 files changed, 16 insertions, 0 deletions
diff --git a/indra/llmath/v3math.cpp b/indra/llmath/v3math.cpp index fd08df02d8..18b15e08c4 100644 --- a/indra/llmath/v3math.cpp +++ b/indra/llmath/v3math.cpp @@ -134,6 +134,21 @@ BOOL LLVector3::clampLength( F32 length_limit ) return changed; } +BOOL LLVector3::clamp(const LLVector3 &min_vec, const LLVector3 &max_vec) +{ + BOOL ret = FALSE; + + if (mV[0] < min_vec[0]) { mV[0] = min_vec[0]; ret = TRUE; } + if (mV[1] < min_vec[1]) { mV[1] = min_vec[1]; ret = TRUE; } + if (mV[2] < min_vec[2]) { mV[2] = min_vec[2]; ret = TRUE; } + + if (mV[0] > max_vec[0]) { mV[0] = max_vec[0]; ret = TRUE; } + if (mV[1] > max_vec[1]) { mV[1] = max_vec[1]; ret = TRUE; } + if (mV[2] > max_vec[2]) { mV[2] = max_vec[2]; ret = TRUE; } + + return ret; +} + // Sets all values to absolute value of their original values // Returns TRUE if data changed diff --git a/indra/llmath/v3math.h b/indra/llmath/v3math.h index dbd38c1c3f..d3fc6fcb2f 100644 --- a/indra/llmath/v3math.h +++ b/indra/llmath/v3math.h @@ -69,6 +69,7 @@ class LLVector3 inline BOOL isFinite() const; // checks to see if all values of LLVector3 are finite BOOL clamp(F32 min, F32 max); // Clamps all values to (min,max), returns TRUE if data changed + BOOL clamp(const LLVector3 &min_vec, const LLVector3 &max_vec); // Scales vector by another vector BOOL clampLength( F32 length_limit ); // Scales vector to limit length to a value void quantize16(F32 lowerxy, F32 upperxy, F32 lowerz, F32 upperz); // changes the vector to reflect quatization |