Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-13 22:49:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Apply edit and highlight after calculating both hands' inputs

Browse source
This commit is contained in:
David Rowe 2017-07-07 14:45:49 +12:00
parent c2159bc52a
commit cab2caaf27
1 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
scripts/vr-edit/vr-edit.js
View file

@ -371,7 +371,8 @@
NO_EXCLUDE_IDS = [],
VISIBLE_ONLY = true,
isTriggerPressed = false,
handPose,
intersection = {},
isLaserOn = false,
hoveredEntityID = null,
@ -386,6 +387,9 @@
initialSelectionOrientation,
laserEditingDistance,
doEdit,
doHighlight,
laser,
selection,
highlights;
@ -406,7 +410,7 @@
selection = new Selection();
highlights = new Highlights(hand);
function startEditing(handPose) {
function startEditing() {
var selectionPositionAndOrientation;
initialHandPosition = Vec3.sum(Vec3.multiplyQbyV(MyAvatar.orientation, handPose.translation), MyAvatar.position);
@ -419,7 +423,7 @@
isEditing = true;
}
function applyEdit(handPose) {
function applyEdit() {
var handPosition,
handOrientation,
deltaOrientation,
@ -456,13 +460,13 @@
entitySize,
size,
wasLaserOn,
handPose,
handPosition,
handOrientation,
deltaOrigin,
pickRay,
intersection,
laserLength,
isTriggerPressed,
isTriggerClicked,
wasEditing,
i,
@ -539,10 +543,12 @@
}
// Highlight / edit.
doEdit = false;
doHighlight = false;
if (isTriggerClicked) {
if (isEditing) {
// Perform edit.
applyEdit(handPose);
doEdit = true;
} else if (intersection.intersects) {
// Start editing.
if (intersection.entityID !== hoveredEntityID) {
@ -553,7 +559,7 @@
if (isLaserOn) {
laserEditingDistance = laserLength;
}
startEditing(handPose);
startEditing();
}
} else {
wasEditing = isEditing;
@ -566,7 +572,7 @@
if (wasEditing || intersection.entityID !== hoveredEntityID) {
hoveredEntityID = intersection.entityID;
selection.select(hoveredEntityID);
highlights.display(intersection.handSelected, selection.selection());
doHighlight = true;
}
} else {
// Unhover entities.
@ -579,6 +585,14 @@
}
}
function apply() {
if (doEdit) {
applyEdit();
} else if (doHighlight) {
highlights.display(intersection.handSelected, selection.selection());
}
}
function destroy() {
if (laser) {
laser.destroy();
@ -600,6 +614,7 @@
return {
update: update,
apply: apply,
destroy: destroy
};
};
@ -610,6 +625,8 @@
hands[LEFT_HAND].update();
hands[RIGHT_HAND].update();
hands[LEFT_HAND].apply();
hands[RIGHT_HAND].apply();
updateTimer = Script.setTimeout(update, UPDATE_LOOP_TIMEOUT);
}