Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-08 14:12:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Clean up code and add comments.

Browse source
This commit is contained in:
r3tk0n 2019-02-28 13:08:05 -08:00
parent ca740c6254
commit a72b02cd25
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -83,14 +83,11 @@ Script.include("/~/system/libraries/controllers.js");
100,
makeLaserParams(this.hand, false));
//enableDispatcherModule("LeftFarGrabEntity", leftFarGrabEntity);
//enableDispatcherModule("RightFarGrabEntity", rightFarGrabEntity);
this.getOtherModule = function () {
// Used to fetch other module.
return getEnabledModuleByName(this.hand === RIGHT_HAND ? ("LeftFarGrabEntity") : ("RightFarGrabEntity"));
};
// Get the rotation of the fargrabbed entity.
this.getTargetRotation = function () {
if (this.targetIsNull()) {
return null;
@ -108,10 +105,12 @@ Script.include("/~/system/libraries/controllers.js");
return (_this.hand === RIGHT_HAND ? _this.leftTrigger : _this.rightTrigger);
}
// Activation criteria for rotating a fargrabbed entity. If we're changing the mapping, this is where to do it.
this.shouldManipulateTarget = function () {
return (_this.getOffhandTrigger() > TRIGGER_ON_VALUE) ? true : false;
};
// Get the delta between the current rotation and where the controller was when manipulation started.
this.calculateEntityRotationManipulation = function (controllerRotation) {
return Quat.multiply(controllerRotation, Quat.inverse(this.initialControllerRotation));
};
@ -303,11 +302,14 @@ Script.include("/~/system/libraries/controllers.js");
this.lastJointRotation = Quat.multiply(doubleRot, this.initialEntityRotation);
this.setJointRotation(this.lastJointRotation);
} else {
// If we were manipulating but the user isn't currently expressing this intent, we want to know so we preserve the rotation
// between manipulations without ending the fargrab.
if (this.manipulating) {
this.initialEntityRotation = this.lastJointRotation;
this.wasManipulating = true;
}
this.manipulating = false;
// Reset the inital controller position.
this.initialControllerRotation = Quat.IDENTITY;
}
this.setJointTranslation(newTargetPosLocal);