diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-17 16:56:21 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-17 16:56:21 +0300 |
| commit | 0ef7a9b39cf72da1211039ab22bdf8f9f6a2c984 (patch) | |
| tree | 6f51ef179497265b5bff2a355471ae5dc9643ad2 /indra/llmath/llcoordframe.cpp | |
| parent | 9e24b300d02e5627ea0d304d412cb683ec2de3a4 (diff) | |
| parent | d3d349ae0f17a72481f30b9354b9367b1cd3b639 (diff) | |
Merge pull request #2856 from secondlife/marchcat/c-develop
Develop → Maint C sync
Diffstat (limited to 'indra/llmath/llcoordframe.cpp')
| -rw-r--r-- | indra/llmath/llcoordframe.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/llmath/llcoordframe.cpp b/indra/llmath/llcoordframe.cpp index 7e1f350ab5..f9ecea1a4a 100644 --- a/indra/llmath/llcoordframe.cpp +++ b/indra/llmath/llcoordframe.cpp @@ -26,7 +26,6 @@ #include "linden_common.h" -//#include "vmath.h" #include "v3math.h" #include "m3math.h" #include "v4math.h" @@ -332,9 +331,9 @@ void LLCoordFrame::rotate(const LLMatrix3 &rotation_matrix) // Rotate 2 normalized orthogonal vectors in direction from `source` to `target` static void rotate2(LLVector3& source, LLVector3& target, F32 angle) { - double sx = source[VX], sy = source[VY], sz = source[VZ]; - double tx = target[VX], ty = target[VY], tz = target[VZ]; - double c = cos(angle), s = sin(angle); + F32 sx = source[VX], sy = source[VY], sz = source[VZ]; + F32 tx = target[VX], ty = target[VY], tz = target[VZ]; + F32 c = cos(angle), s = sin(angle); source.set(sx * c + tx * s, sy * c + ty * s, sz * c + tz * s); target.set(tx * c - sx * s, ty * c - sy * s, tz * c - sz * s); |