summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorWhirly <none@none>2014-08-20 23:41:33 +0100
committerWhirly <none@none>2014-08-20 23:41:33 +0100
commitfc0d618c2f3489e62b28d6e83978d39ea70c1e7e (patch)
tree43f742a945b32bbc41732b89ea307067e515dd0c /indra/newview
parentb021c90e7bccdd0f9a916946e7716a00034254c2 (diff)
STORM-2078 Editing an objects rotation with the rotation rings often causes the object to jump to position <0,0,0> on the region and rotation changes to <0,0,0>
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llmaniprotate.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llmaniprotate.cpp b/indra/newview/llmaniprotate.cpp
index 7861573908..50863ac970 100755
--- a/indra/newview/llmaniprotate.cpp
+++ b/indra/newview/llmaniprotate.cpp
@@ -1241,9 +1241,9 @@ LLQuaternion LLManipRotate::dragUnconstrained( S32 x, S32 y )
LLVector3 axis = mMouseDown % mMouseCur;
axis.normVec();
- F32 angle = acos(mMouseDown * mMouseCur);
+ F32 angle = atan2(sqrtf(axis * axis), mMouseDown * mMouseCur);
LLQuaternion sphere_rot( angle, axis );
-
+
if (is_approx_zero(1.f - mMouseDown * mMouseCur))
{
return LLQuaternion::DEFAULT;
@@ -1638,9 +1638,9 @@ LLQuaternion LLManipRotate::dragConstrained( S32 x, S32 y )
mInSnapRegime = FALSE;
}
- angle = acos(mMouseCur * mMouseDown);
-
- F32 dir = (mMouseDown % mMouseCur) * constraint_axis; // cross product
+ LLVector3 cross_product = mMouseDown % mMouseCur;
+ angle = atan2(sqrtf(cross_product * cross_product), mMouseCur * mMouseDown);
+ F32 dir = cross_product * constraint_axis; // cross product
if( dir < 0.f )
{
angle *= -1.f;