Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-08-18 19:52:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Incremental, broken progress.

Browse source
This commit is contained in:
r3tk0n 2019-02-25 14:10:48 -08:00
parent a66c76bf38
commit 52b62784d6
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -243,7 +243,6 @@ Script.include("/~/system/libraries/controllers.js");
var newTargetPosLocal = MyAvatar.worldToJointPoint(newTargetPosition);
var newTargetRotLocal = this.initialEntityRotation;
if (this.shouldManipulateTarget()) {
print("Test this thing.");
var rotBetween = this.calculateEntityRotationManipulation(worldControllerRotation);
var newTargetRotLocal = Quat.multiply(rotBetween, newTargetRotLocal);
}
@ -272,8 +271,9 @@ Script.include("/~/system/libraries/controllers.js");
unhighlightTargetEntity(this.targetEntityID);
this.grabbing = false;
this.potentialEntityWithContextOverlay = false;
var rot = this.getTargetRotation();
MyAvatar.clearJointData(FAR_GRAB_JOINTS[this.hand]); // RKNOTE: Here, we should edit the entity's position and rotation data with the current joint rotation data.
this.setTargetRotation(Quat.multiply(this.lastFarGrabJointRotation, this.initialEntityRotation));
this.setTargetRotation(Quat.multiply(this.lastFarGrabJointRotation, rot));
this.initialEntityRotation = Quat.IDENTITY;
this.targetEntityID = null;
};
@ -472,7 +472,9 @@ Script.include("/~/system/libraries/controllers.js");
};
this.shouldManipulateTarget = function () {
return (this.getDominantGrip() > TRIGGER_ON_VALUE);
//var test = this.getDominantGrip() > TRIGGER_ON_VALUE;
//return test;
return true;
};
this.calculateEntityRotationManipulation = function (controllerRotation) {