diff --git a/index.html b/index.html index 64b80141cef501e89a0d642b5fa4ae03c6dc6ddc..bc53472a6deddc7720cd851cd5c5f5bea37b8dfe 100644 --- a/index.html +++ b/index.html @@ -301,14 +301,15 @@ float theta = atan(y, x); float diff = theta-lastTheta[0]; + float origDiff = diff; if (diff < -5.0) { diff += TWO_PI; - theta = lastTheta[0] + diff; } else if (diff > 5.0) { diff -= TWO_PI; - theta = lastTheta[0] + diff; } - gl_FragColor = vec4(theta, theta, lastTheta[2], lastTheta[3]);//[theta, w, normal1Index, normal2Index] + //if (abs(diff)>0.01) diff = 0.0; + theta = lastTheta[0] + diff; + gl_FragColor = vec4(theta, origDiff, lastTheta[2], lastTheta[3]);//[theta, w, normal1Index, normal2Index] } </script> diff --git a/js/ViveInterface.js b/js/ViveInterface.js index 96e57b4aac906af501ca2863f2591552bca3c05f..e2f8dc46f4b0231e2c166bc03275b39b30dbc257 100644 --- a/js/ViveInterface.js +++ b/js/ViveInterface.js @@ -12,6 +12,8 @@ function initViveInterface(globals){ $("#VRoptions").hide(); return; } + $status.html("No device connected."); + $("#VRoptions").show(); var controls, controller1, controller2, effect; diff --git a/js/dynamic/dynamicSolver.js b/js/dynamic/dynamicSolver.js index 6f8c2e4a43dd5056991b73416b04c7440db370ca..2d62332365b241dda8dffb5137f38fa276c63623 100644 --- a/js/dynamic/dynamicSolver.js +++ b/js/dynamic/dynamicSolver.js @@ -174,7 +174,7 @@ function initDynamicSolver(globals){ // globals.gpuMath.readPixels(0, 0, textureDimCreases * vectorLength, height, pixels); // var parsedPixels = new Float32Array(pixels.buffer); // for (var i=0;i<parsedPixels.length;i+=2){ - // if (Math.abs(parsedPixels[i+1])>3.0) console.log(parsedPixels[i+1]); + // if (Math.abs(parsedPixels[i+1])>0.1) console.log(parsedPixels[i+1]); // } // } else { // console.log("here");