Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-10 19:29:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add 2x rotation multiplier.

Browse source
This commit is contained in:
r3tk0n 2019-02-26 19:16:45 -08:00
parent 42b62ff2d5
commit 7c515ccd45
1 changed files with 2 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -252,7 +252,8 @@ Script.include("/~/system/libraries/controllers.js");
var rot = Quat.multiply(pose.rotation, MyAvatar.orientation);
var rotBetween = this.calculateEntityRotationManipulation(rot);
this.lastJointRotation = Quat.multiply(rotBetween, this.initialEntityRotation);
var doubleRot = Quat.multiply(rotBetween, rotBetween);
this.lastJointRotation = Quat.multiply(doubleRot, this.initialEntityRotation);
this.setJointRotation(this.lastJointRotation);
} else {
if (this.manipulating) {
@ -359,8 +360,6 @@ Script.include("/~/system/libraries/controllers.js");
grabMapping = Controller.newMapping(mappingName);
grabMapping.from(Controller.Standard.LT).peek().to(_this.getLeftTrigger);
grabMapping.from(Controller.Standard.RT).peek().to(_this.getRightTrigger);
grabMapping.from(Controller.Standard.LeftGrip).peek().to(_this.setLeftGrip);
grabMapping.from(Controller.Standard.RightGrip).peek().to(_this.setRightGrip);
Controller.enableMapping(mappingName);
};
@ -375,8 +374,6 @@ Script.include("/~/system/libraries/controllers.js");
this.leftTrigger = 0.0;
this.rightTrigger = 0.0;
this.leftGrip = 0.0;
this.rightGrip = 0.0;
this.getDominantHand = function () {
return (MyAvatar.getDominantHand() === "left") ? LEFT_HAND : RIGHT_HAND;
@ -402,22 +399,6 @@ Script.include("/~/system/libraries/controllers.js");
return (MyAvatar.getDominantHand() === "left") ? (_this.rightTrigger) : (_this.leftTrigger);
};
this.setLeftGrip = function (value) {
this.leftGrip = value;
};
this.setRightGrip = function (value) {
this.rightGrip = value;
};
this.getDominantGrip = function () {
return (MyAvatar.getDominantHand() === "left" ? (_this.leftGrip) : (_this.rightGrip));
};
this.getOffhandGrip = function () {
return (MyAvatar.getDominantHand() === "left" ? (_this.rightGrip) : (_this.leftGrip));
};
this.shouldShowLaser = function () {
return (_this.getOffHandTrigger() > TRIGGER_ON_VALUE) ? true : false;
};