diff --git a/libraries/physics/src/ObjectActionTractor.cpp b/libraries/physics/src/ObjectActionTractor.cpp index 87edc858cc..a46aac3f29 100644 --- a/libraries/physics/src/ObjectActionTractor.cpp +++ b/libraries/physics/src/ObjectActionTractor.cpp @@ -72,7 +72,7 @@ bool ObjectActionTractor::getTarget(float deltaTimeStep, glm::quat& rotation, gl angularTimeScale = FLT_MAX; return false; } - rotation = _desiredRotationalTarget * otherWorldOrientation; + rotation = otherWorldOrientation * _desiredRotationalTarget; position = otherWorldOrientation * _desiredPositionalTarget + otherWorldPosition; } else { // we should have an "other" but can't find it, or its collision shape isn't loaded, diff --git a/scripts/system/controllers/controllerModules/farGrabEntity.js b/scripts/system/controllers/controllerModules/farGrabEntity.js index da1f3893dc..dab1aa97af 100644 --- a/scripts/system/controllers/controllerModules/farGrabEntity.js +++ b/scripts/system/controllers/controllerModules/farGrabEntity.js @@ -146,7 +146,7 @@ Script.include("/~/system/libraries/controllers.js"); MyAvatar.setJointRotation(FAR_GRAB_JOINTS[this.hand], { x: 0, y: 0, z: 0, w: 1 }); var args = [this.hand === RIGHT_HAND ? "right" : "left", MyAvatar.sessionUUID]; - Entities.callEntityMethod(targetProps.id, "startNearGrab", args); + Entities.callEntityMethod(targetProps.id, "startDistanceGrab", args); this.targetEntityID = targetProps.id;