From 02ab0e5ccc8373f3c6d4ad84282014a331eb8656 Mon Sep 17 00:00:00 2001 From: Amanda Ghassaei <amandaghassaei@gmail.com> Date: Wed, 4 Oct 2017 14:48:55 -0700 Subject: [PATCH] small changes --- js/VRInterface.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/js/VRInterface.js b/js/VRInterface.js index aa0ff6f..21065c8 100644 --- a/js/VRInterface.js +++ b/js/VRInterface.js @@ -178,7 +178,7 @@ function initViveInterface(globals){ globals.vertTol = 3; globals.importer.importDemoFile(url); } - examplesMenu.name("Examples, current file: " + val); + examplesMenu.name("Examples - current file: " + val); }); }); @@ -353,6 +353,7 @@ function initViveInterface(globals){ globals.nodePositionHasChanged = true; continue; } + if (states[i]) continue;//using the gui var cast = new THREE.Raycaster(position, tDirection, 0, 1); var intersects = cast.intersectObjects(globals.model.getMesh(), false); @@ -417,7 +418,7 @@ function initViveInterface(globals){ for (var i=0;i<keys.length;i++){ var group = examples[keys[i]]; if (group[globals.url]){ - return ", current file: " + group[globals.url]; + return " - current file: " + group[globals.url]; } } return ""; -- GitLab