Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 19:59:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename func

Browse source
This commit is contained in:
David Back 2018-09-12 16:06:14 -07:00
parent 06504ade88
commit 7768e08510
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1178,7 +1178,7 @@ SelectionDisplay = (function() {
return controllerComputePickRay() || Camera.computePickRay(x, y); return controllerComputePickRay() || Camera.computePickRay(x, y);
} }
function getControllerAvatarFramePosition(pickRay) { function getControllerAvatarFramePositionFromPickRay(pickRay) {
var controllerPosition = Vec3.subtract(pickRay.origin, MyAvatar.position); var controllerPosition = Vec3.subtract(pickRay.origin, MyAvatar.position);
controllerPosition = Vec3.multiplyQbyV(Quat.inverse(MyAvatar.orientation), controllerPosition); controllerPosition = Vec3.multiplyQbyV(Quat.inverse(MyAvatar.orientation), controllerPosition);
return controllerPosition; return controllerPosition;
@ -2255,7 +2255,7 @@ SelectionDisplay = (function() {
previousPickRay = pickRay; previousPickRay = pickRay;
beginMouseEvent = event; beginMouseEvent = event;
if (that.triggered()) { if (that.triggered()) {
beginControllerPosition = getControllerAvatarFramePosition(pickRay); beginControllerPosition = getControllerAvatarFramePositionFromPickRay(pickRay);
} }
}; };
@ -2332,7 +2332,7 @@ SelectionDisplay = (function() {
var dimensionChange; var dimensionChange;
if (controllerTrigger) { if (controllerTrigger) {
var controllerPosition = getControllerAvatarFramePosition(pickRay); var controllerPosition = getControllerAvatarFramePositionFromPickRay(pickRay);
var vecControllerDifference = Vec3.subtract(controllerPosition, beginControllerPosition); var vecControllerDifference = Vec3.subtract(controllerPosition, beginControllerPosition);
var controllerDifference = vecControllerDifference.x + vecControllerDifference.y + var controllerDifference = vecControllerDifference.x + vecControllerDifference.y +
vecControllerDifference.z; vecControllerDifference.z;