Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-02 11:00:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix frame of reference for rotations.

Browse source
This commit is contained in:
r3tk0n 2019-02-26 12:46:46 -08:00
parent 2a04d2b9c5
commit f3b65d06ad
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/system/controllers/controllerModules/farGrabEntity.js
View file

@ -242,15 +242,13 @@ Script.include("/~/system/libraries/controllers.js");
var pose = Controller.getPoseValue((this.getDominantHand() ? Controller.Standard.RightHand : Controller.Standard.LeftHand)); var pose = Controller.getPoseValue((this.getDominantHand() ? Controller.Standard.RightHand : Controller.Standard.LeftHand));
if (pose.valid) { if (pose.valid) {
if (!this.manipulating) { if (!this.manipulating) {
//this.initialEntityRotation = Quat.multiply(this.getTargetRotation(), Quat.inverse(MyAvatar.orientation)); // Avatar frame.
this.initialEntityRotation = this.getTargetRotation(); // Worldframe. this.initialEntityRotation = this.getTargetRotation(); // Worldframe.
this.initialControllerRotation = Quat.multiply(MyAvatar.orientation, pose.rotation); // Worldframe. this.initialControllerRotation = Quat.multiply(pose.rotation, MyAvatar.orientation); // Worldframe.
//this.initialEntityRotation = Quat.multiply(this.getTargetRotation(), Quat.inverse(MyAvatar.orientation));
this.manipulating = true; this.manipulating = true;
} }
} }
var rot = Quat.multiply(MyAvatar.orientation, pose.rotation); var rot = Quat.multiply(pose.rotation, MyAvatar.orientation);
var rotBetween = this.calculateEntityRotationManipulation(rot); var rotBetween = this.calculateEntityRotationManipulation(rot);
this.setJointRotation(Quat.multiply(rotBetween, this.initialEntityRotation)); this.setJointRotation(Quat.multiply(rotBetween, this.initialEntityRotation));
} else { } else {