Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

get controller position from avatar frame

Browse source
This commit is contained in:
David Back 2018-09-12 16:02:43 -07:00
parent 55a4c55f78
commit 1b8e9ed906
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
scripts/system/libraries/entitySelectionTool.js
View file

@ -1177,6 +1177,12 @@ SelectionDisplay = (function() {
function generalComputePickRay(x, y) {
return controllerComputePickRay() || Camera.computePickRay(x, y);
}
function getControllerAvatarFramePosition(pickRay) {
var controllerPosition = Vec3.subtract(pickRay.origin, MyAvatar.position);
controllerPosition = Vec3.multiplyQbyV(Quat.inverse(MyAvatar.orientation), controllerPosition);
return controllerPosition;
}
function getDistanceToCamera(position) {
var cameraPosition = Camera.getPosition();
@ -2248,10 +2254,8 @@ SelectionDisplay = (function() {
previousPickRay = pickRay;
beginMouseEvent = event;
if (that.triggered()) {
beginControllerPosition = that.triggeredHand === Controller.Standard.LeftHand ?
MyAvatar.getLeftHandPosition() : MyAvatar.getRightHandPosition();
beginControllerPosition = getControllerAvatarFramePosition(pickRay);
}
};
@ -2328,8 +2332,7 @@ SelectionDisplay = (function() {
var dimensionChange;
if (controllerTrigger) {
var controllerPosition = that.triggeredHand === Controller.Standard.LeftHand ?
MyAvatar.getLeftHandPosition() : MyAvatar.getRightHandPosition();
var controllerPosition = getControllerAvatarFramePosition(pickRay);
var vecControllerDifference = Vec3.subtract(controllerPosition, beginControllerPosition);
var controllerDifference = vecControllerDifference.x + vecControllerDifference.y +
vecControllerDifference.z;