Skip to content
Snippets Groups Projects
Commit 4ded45eb authored by Brad Payne (Vir Linden)'s avatar Brad Payne (Vir Linden)
Browse files

Sl-761 - removed the 90-degree fixup, so objects can be moved in a predictable...

Sl-761 - removed the 90-degree fixup, so objects can be moved in a predictable and standard X-forward way in scripts.
parent 44ba5224
No related branches found
No related tags found
No related merge requests found
...@@ -67,10 +67,6 @@ void LLControlAvatar::matchVolumeTransform() ...@@ -67,10 +67,6 @@ void LLControlAvatar::matchVolumeTransform()
} }
#endif #endif
// Avatars seem to 90 degrees off from the rest of the world, this is a fixup.
LLQuaternion fix_axes_rot(-F_PI_BY_TWO, LLVector3(0,0,1));
if (mRootVolp) if (mRootVolp)
{ {
if (mRootVolp->isAttachment()) if (mRootVolp->isAttachment())
...@@ -87,7 +83,7 @@ void LLControlAvatar::matchVolumeTransform() ...@@ -87,7 +83,7 @@ void LLControlAvatar::matchVolumeTransform()
LLQuaternion obj_rot = mRootVolp->mDrawable->getRotation(); LLQuaternion obj_rot = mRootVolp->mDrawable->getRotation();
obj_pos.rotVec(joint_rot); obj_pos.rotVec(joint_rot);
mRoot->setWorldPosition(obj_pos + joint_pos); mRoot->setWorldPosition(obj_pos + joint_pos);
mRoot->setWorldRotation(fix_axes_rot * obj_rot * joint_rot); mRoot->setWorldRotation(obj_rot * joint_rot);
setRotation(mRoot->getRotation()); setRotation(mRoot->getRotation());
} }
else else
...@@ -99,7 +95,7 @@ void LLControlAvatar::matchVolumeTransform() ...@@ -99,7 +95,7 @@ void LLControlAvatar::matchVolumeTransform()
{ {
setPositionAgent(mRootVolp->getRenderPosition()); setPositionAgent(mRootVolp->getRenderPosition());
LLQuaternion obj_rot = mRootVolp->getRotation(); LLQuaternion obj_rot = mRootVolp->getRotation();
LLQuaternion result_rot = fix_axes_rot * obj_rot; LLQuaternion result_rot = obj_rot;
setRotation(result_rot); setRotation(result_rot);
mRoot->setWorldRotation(result_rot); mRoot->setWorldRotation(result_rot);
mRoot->setPosition(mRootVolp->getRenderPosition()); mRoot->setPosition(mRootVolp->getRenderPosition());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment