Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 09:34:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

display current pitch/yaw/roll in rotation overlays

Browse source
This commit is contained in:
ZappoMan 2014-10-08 19:30:43 -07:00
parent 18f3a208f7
commit 4558caf431
1 changed files with 30 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
examples/libraries/entitySelectionTool.js
View file

@ -561,7 +561,6 @@ SelectionDisplay = (function () {
} }
print("select() with mode:" + mode);
var rotateHandlesVisible = true; var rotateHandlesVisible = true;
var translateHandlesVisible = true; var translateHandlesVisible = true;
var stretchHandlesVisible = true; var stretchHandlesVisible = true;
@ -1506,6 +1505,14 @@ SelectionDisplay = (function () {
if (!entitySelected || mode !== "ROTATE_YAW") { if (!entitySelected || mode !== "ROTATE_YAW") {
return; // not allowed return; // not allowed
} }
var pickRay = Camera.computePickRay(event.x, event.y);
var result = Overlays.findRayIntersection(pickRay);
print("result.intersects:" + result.intersects);
print("result.overlayID:" + overlayNames[result.overlayID]);
print("result.distance:" + result.distance);
print("result.face:" + result.face);
Vec3.print("result.intersection:", result.intersection);
}; };
that.rotatePitch = function(event) { that.rotatePitch = function(event) {
@ -1691,6 +1698,13 @@ SelectionDisplay = (function () {
var overlayOrientation; var overlayOrientation;
var overlayCenter; var overlayCenter;
var properties = Entities.getEntityProperties(currentSelection);
var angles = Quat.safeEulerAngles(properties.rotation);
var pitch = angles.x;
var yaw = angles.y;
var roll = angles.z;
var currentRotation;
if (result.intersects) { if (result.intersects) {
switch(result.overlayID) { switch(result.overlayID) {
@ -1699,6 +1713,7 @@ SelectionDisplay = (function () {
somethingClicked = true; somethingClicked = true;
overlayOrientation = yawHandleRotation; overlayOrientation = yawHandleRotation;
overlayCenter = yawCenter; overlayCenter = yawCenter;
currentRotation = yaw;
break; break;
case pitchHandle: case pitchHandle:
@ -1706,6 +1721,7 @@ SelectionDisplay = (function () {
somethingClicked = true; somethingClicked = true;
overlayOrientation = pitchHandleRotation; overlayOrientation = pitchHandleRotation;
overlayCenter = pitchCenter; overlayCenter = pitchCenter;
currentRotation = pitch;
break; break;
case rollHandle: case rollHandle:
@ -1713,6 +1729,7 @@ SelectionDisplay = (function () {
somethingClicked = true; somethingClicked = true;
overlayOrientation = rollHandleRotation; overlayOrientation = rollHandleRotation;
overlayCenter = rollCenter; overlayCenter = rollCenter;
currentRotation = roll;
break; break;
default: default:
@ -1725,10 +1742,16 @@ SelectionDisplay = (function () {
print(" somethingClicked:" + somethingClicked); print(" somethingClicked:" + somethingClicked);
print(" mode:" + mode); print(" mode:" + mode);
if (somethingClicked) { if (somethingClicked) {
if (currentRotation < 0) {
currentRotation = currentRotation + 360;
}
// TODO: need to place correctly.... // TODO: need to place correctly....
print(" attempting to show overlays:" + somethingClicked); print(" attempting to show overlays:" + somethingClicked);
print(" currentRotation:" + currentRotation);
Overlays.editOverlay(rotateOverlayInner, Overlays.editOverlay(rotateOverlayInner,
{ {
@ -1741,14 +1764,18 @@ SelectionDisplay = (function () {
{ {
visible: true, visible: true,
rotation: overlayOrientation, rotation: overlayOrientation,
position: overlayCenter position: overlayCenter,
startAt: currentRotation,
endAt: 360
}); });
Overlays.editOverlay(rotateOverlayCurrent, Overlays.editOverlay(rotateOverlayCurrent,
{ {
visible: true, visible: true,
rotation: overlayOrientation, rotation: overlayOrientation,
position: overlayCenter position: overlayCenter,
startAt: 0,
endAt: currentRotation
}); });
Overlays.editOverlay(yawHandle, { visible: false }); Overlays.editOverlay(yawHandle, { visible: false });