diff --git a/js/VRInterface.js b/js/VRInterface.js index 5bfed181d62136245d17b1d4b4bac680d2c1f274..e98f38517c12413cfaf59a49095aaf11ff41da14 100644 --- a/js/VRInterface.js +++ b/js/VRInterface.js @@ -107,8 +107,8 @@ function initViveInterface(globals){ controller.head = camera; var - meshColorOff = 0x888888, - meshColorOn = 0x555555, + meshColorOff = 0x555555, + meshColorOn = 0x888888, controllerMaterial = new THREE.MeshStandardMaterial({ color: meshColorOff }), @@ -255,7 +255,7 @@ function initViveInterface(globals){ //todo get position and mesh in same reference frame - var cast = new THREE.Raycaster(position, tDirection, 0, 1); + var cast = new THREE.Raycaster(position, tDirection, 0, 0.1); var intersects = cast.intersectObjects(globals.model.getMesh(), false); if (intersects.length>0){ var intersection = intersects[0]; @@ -281,9 +281,7 @@ function initViveInterface(globals){ nodes[i] = nodesArray[nodeIndex]; object3D.position.copy(transformToGlobalCoords(nodes[i].getPosition().clone())); object3D.visible = true; - controllers[i].userData.mesh.material.color.setHex( 0x888888 ); } else { - controllers[i].userData.mesh.material.color.setHex( 0xff0000 ); nodes[i] = null; } diff --git a/js/model.js b/js/model.js index 4c93be7d40d88862cb42cb16b43410076c200d1c..29e168acce742e3ed665ee7d46b523a24b47125c 100755 --- a/js/model.js +++ b/js/model.js @@ -176,7 +176,7 @@ function initModel(globals){ function setGeoUpdates(){ geometry.attributes.position.needsUpdate = true; if (globals.colorMode == "axialStrain") geometry.attributes.color.needsUpdate = true; - // if (globals.userInteractionEnabled || globals.vrEnabled) geometry.computeBoundingBox(); + if (globals.userInteractionEnabled || globals.vrEnabled) geometry.computeBoundingBox(); } function startSolver(){