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

Tidying

Browse source
This commit is contained in:
David Rowe 2017-07-05 16:00:42 +12:00
parent 1e76729d59
commit 24b1963257
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -396,6 +396,13 @@
isEditing = false;
}
function clearLaser() {
laser.clear();
selection.clear();
highlights.clear();
laseredEntityID = null;
}
function update() {
var wasLaserOn,
handPose,
@ -412,10 +419,7 @@
isLaserOn = Controller.getValue(controllerTrigger) > (isLaserOn ? TRIGGER_OFF_VALUE : TRIGGER_ON_VALUE);
if (!isLaserOn) {
if (wasLaserOn) {
laser.clear();
selection.clear();
highlights.clear();
laseredEntityID = null;
clearLaser();
}
return;
}
@ -425,10 +429,7 @@
if (!handPose.valid) {
isLaserOn = false;
if (wasLaserOn) {
laser.clear();
selection.clear();
highlights.clear();
laseredEntityID = null;
clearLaser();
}
return;
}
@ -449,7 +450,6 @@
// Laser, hover, edit.
isTriggerClicked = Controller.getValue(controllerTriggerClicked);
laser.update(pickRay.origin, pickRay.direction, distance, isTriggerClicked);
if (isTriggerClicked) {
if (isEditing) {
// Perform edit.
@ -487,7 +487,6 @@
laseredEntityID = null;
}
}
}
}
@ -516,7 +515,6 @@
};
};
function update() {
// Main update loop.
updateTimer = null;