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

Merge branch 'master' of https://github.com/highfidelity/hifi into animenu

Browse source
This commit is contained in:
Andrzej Kapolka 2014-05-22 16:42:09 -07:00
commit 5b65406012
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
examples/editModels.js
View file

@ -666,13 +666,17 @@ Menu.menuItemEvent.connect(function(menuItem){
print("menuItemEvent() in JS... menuItem=" + menuItem); print("menuItemEvent() in JS... menuItem=" + menuItem);
if (menuItem == "Delete Model") { if (menuItem == "Delete Model") {
if (leftController.grabbing) { if (leftController.grabbing) {
print(" Delete Model.... controller.modelID="+ leftController.modelID); print(" Delete Model.... leftController.modelID="+ leftController.modelID);
Models.deleteModel(leftController.modelID); Models.deleteModel(leftController.modelID);
leftController.grabbing = false; leftController.grabbing = false;
} else if (rightController.grabbing) { } else if (rightController.grabbing) {
print(" Delete Model.... controller.modelID="+ rightController.modelID); print(" Delete Model.... rightController.modelID="+ rightController.modelID);
Models.deleteModel(rightController.modelID); Models.deleteModel(rightController.modelID);
rightController.grabbing = false; rightController.grabbing = false;
} else if (modelSelected) {
print(" Delete Model.... selectedModelID="+ selectedModelID);
Models.deleteModel(selectedModelID);
modelSelected = false;
} else { } else {
print(" Delete Model.... not holding..."); print(" Delete Model.... not holding...");
} }