vive settings

amandaghassaei · May 11, 2017 · 87df520 · 87df520
1 parent 47e12a5
commit 87df520
Show file tree

Hide file tree

Showing 76 changed files with 693 additions and 63 deletions.
diff --git a/README.md b/README.md
diff --git a/assets/Curved/creaseMesh.txt b/assets/Curved/creaseMesh.txt
diff --git a/assets/Curved/curvedcrease2.svg b/assets/Curved/curvedcrease2.svg
diff --git a/assets/Origami/hypar.svg b/assets/Origami/hypar.svg
diff --git a/assets/Origami/randlettflappingbird.svg b/assets/Origami/randlettflappingbird.svg
diff --git a/assets/Origami/singlesquaretwist.svg b/assets/Origami/singlesquaretwist.svg
diff --git a/assets/Origami/squaretwistManyAngles.svg b/assets/Origami/squaretwistManyAngles.svg
diff --git a/assets/PolygonUnfolding/cubeunwrapping.svg b/assets/PolygonUnfolding/cubeunwrapping.svg
diff --git a/assets/Tessellations/honeycomb_333_cp.svg b/assets/Tessellations/honeycomb_333_cp.svg
diff --git a/assets/Tessellations/hyperbolic_limit_cp.svg b/assets/Tessellations/hyperbolic_limit_cp.svg
diff --git a/assets/Tessellations/miura-ori.svg b/assets/Tessellations/miura-ori.svg
diff --git a/assets/Tessellations/oval_tessellation_cp.svg b/assets/Tessellations/oval_tessellation_cp.svg
diff --git a/assets/Tessellations/rattanweaveLang.svg b/assets/Tessellations/rattanweaveLang.svg
diff --git a/assets/Tessellations/reschbarbell.svg b/assets/Tessellations/reschbarbell.svg
diff --git a/assets/Tessellations/reschtritessellation.svg b/assets/Tessellations/reschtritessellation.svg
diff --git a/assets/Tessellations/waterbomb.svg b/assets/Tessellations/waterbomb.svg
diff --git a/assets/Tessellations/waterbombTwist.svg b/assets/Tessellations/waterbombTwist.svg
diff --git a/assets/Tessellations/wedged_double_faced.svg b/assets/Tessellations/wedged_double_faced.svg
diff --git a/assets/Tests/SimpleVertex.svg b/assets/Tests/SimpleVertex.svg
diff --git a/assets/Tests/SimpleVertex2.svg b/assets/Tests/SimpleVertex2.svg
diff --git a/assets/Tests/TwoTri.svg b/assets/Tests/TwoTri.svg
diff --git a/assets/attrib.txt b/assets/attrib.txt
diff --git a/assets/examplepattern.jpg b/assets/examplepattern.jpg
diff --git a/assets/patternwithtriangulations.jpg b/assets/patternwithtriangulations.jpg
diff --git a/css/main.css b/css/main.css
diff --git a/css/nav.css b/css/nav.css
diff --git a/dependencies/CopyShader.js b/dependencies/CopyShader.js
diff --git a/dependencies/Detector.js b/dependencies/Detector.js
diff --git a/dependencies/EffectComposer.js b/dependencies/EffectComposer.js
diff --git a/dependencies/FileSaver.min.js b/dependencies/FileSaver.min.js
diff --git a/dependencies/MaskPass.js b/dependencies/MaskPass.js
diff --git a/dependencies/OrbitControls.js b/dependencies/OrbitControls.js
diff --git a/dependencies/OrthographicTrackballControls.js b/dependencies/OrthographicTrackballControls.js
diff --git a/dependencies/Projector.js b/dependencies/Projector.js
diff --git a/dependencies/RenderPass.js b/dependencies/RenderPass.js
diff --git a/dependencies/SSAOShader.js b/dependencies/SSAOShader.js
diff --git a/dependencies/SVGLoader.js b/dependencies/SVGLoader.js
diff --git a/dependencies/SVGRenderer.js b/dependencies/SVGRenderer.js
diff --git a/dependencies/ShaderPass.js b/dependencies/ShaderPass.js
diff --git a/dependencies/TrackballControls.js b/dependencies/TrackballControls.js
diff --git a/dependencies/VRControls.js b/dependencies/VRControls.js
diff --git a/dependencies/VREffect.js b/dependencies/VREffect.js
diff --git a/dependencies/ViveController.js b/dependencies/ViveController.js
diff --git a/dependencies/WebVR.js b/dependencies/WebVR.js
diff --git a/dependencies/binary_stl_writer.js b/dependencies/binary_stl_writer.js
diff --git a/dependencies/bootstrap.min.css b/dependencies/bootstrap.min.css
diff --git a/dependencies/flat-ui.min.css b/dependencies/flat-ui.min.css
diff --git a/dependencies/flat-ui.min.js b/dependencies/flat-ui.min.js
diff --git a/dependencies/jquery-3.1.1.min.js b/dependencies/jquery-3.1.1.min.js
diff --git a/dependencies/jquery-ui.min.css b/dependencies/jquery-ui.min.css
diff --git a/dependencies/jquery-ui.min.js b/dependencies/jquery-ui.min.js
diff --git a/dependencies/numeric-1.2.6.js b/dependencies/numeric-1.2.6.js
diff --git a/dependencies/numeric-1.2.6.min.js b/dependencies/numeric-1.2.6.min.js
diff --git a/favicon.ico b/favicon.ico
diff --git a/fonts/glyphicons/flat-ui-icons-regular.ttf b/fonts/glyphicons/flat-ui-icons-regular.ttf
diff --git a/index.html b/index.html
@@ -353,7 +353,7 @@
     <script type="text/javascript" src="dependencies/flat-ui.min.js"></script>
     <script type="text/javascript" src="dependencies/three.js"></script>
     <script type="text/javascript" src="dependencies/binary_stl_writer.js"></script>
-    <script type="text/javascript" src="dependencies/OrthographicTrackballControls.js"></script>
+    <script type="text/javascript" src="dependencies/TrackballControls.js"></script>
     <script type="text/javascript" src="dependencies/Projector.js"></script>
     <script type="text/javascript" src="dependencies/SVGRenderer.js"></script>
     <script type="text/javascript" src="dependencies/underscore-min.js"></script>

diff --git a/js/3dUI.js b/js/3dUI.js
diff --git a/js/ViveInterface.js b/js/ViveInterface.js
@@ -15,7 +15,7 @@ function initViveInterface(globals){
     $status.html("No device connected.");
     $("#VRoptions").show();
 
-    var mesh = new THREE.Mesh(new THREE.CubeGeometry(1, 1,1 ), new THREE.MeshLambertMaterial({color:0xff0000}));
+    var mesh = new THREE.Mesh(new THREE.CubeGeometry(1,1,1), new THREE.MeshLambertMaterial({color:0xff0000}));
 
     var controls = new THREE.VRControls(globals.threeView.camera);
     controls.standing = true;
@@ -44,16 +44,18 @@ function initViveInterface(globals){
             document.body.appendChild(button);
             var callback = button.onclick;
             button.onclick = function () {
-				if (display.isPresenting) globals.vrEnabled = false;
-                else globals.vrEnabled = true;
+				globals.vrEnabled = !display.isPresenting;
+                var y = 0;
+                if (globals.vrEnabled) y = 1;
+                globals.threeView.modelWrapper.position.set(0,y,0);
+                // var scale = 0.01;
+                // globals.threeView.modelWrapper.scale.set(scale, scale, scale);
                 if (callback) callback();
 			};
-
         } );
     }
 
     function disconnect(){
-
     }
 
     function render(){

diff --git a/js/beam.js b/js/beam.js
diff --git a/js/controls.js b/js/controls.js
diff --git a/js/crease.js b/js/crease.js
diff --git a/js/dynamic/GLBoilerplate.js b/js/dynamic/GLBoilerplate.js
diff --git a/js/dynamic/GPUMath.js b/js/dynamic/GPUMath.js
diff --git a/js/dynamic/dynamicSolver.js b/js/dynamic/dynamicSolver.js
diff --git a/js/globals.js b/js/globals.js
diff --git a/js/importer.js b/js/importer.js
diff --git a/js/main.js b/js/main.js
diff --git a/js/model.js b/js/model.js
@@ -174,7 +174,7 @@ function initModel(globals){
         if (globals.colorMode == "axialStrain") geometry.attributes.color.needsUpdate = true;
         geometry.computeVertexNormals();
         // geometry.computeBoundingBox();
-        // geometry.computeBoundingSphere();
+        geometry.computeBoundingSphere();
     }
 
     var inited = false;
@@ -318,7 +318,7 @@ function initModel(globals){
         geometry.computeBoundingSphere();
         geometry.center();
 
-        var scale = 100/geometry.boundingSphere.radius;
+        var scale = 1/geometry.boundingSphere.radius;
         globals.scale = scale;
 
         object3D.geometry.dispose();

diff --git a/js/node.js b/js/node.js
diff --git a/js/pattern.js b/js/pattern.js
diff --git a/js/saveFOLD.js b/js/saveFOLD.js
diff --git a/js/saveSTL.js b/js/saveSTL.js
diff --git a/js/staticSolver.js b/js/staticSolver.js
diff --git a/js/threeView.js b/js/threeView.js
@@ -6,13 +6,15 @@ function initThreeView(globals) {
 
     var scene = new THREE.Scene();
     var modelWrapper = new THREE.Object3D();
-    var camera = new THREE.OrthographicCamera(window.innerWidth / -2, window.innerWidth / 2, window.innerHeight / 2, window.innerHeight / -2, -10000, 10000);//-40, 40);
+
+    var camera = new THREE.PerspectiveCamera(70, window.innerWidth/window.innerHeight, 0.01, 1000);
+    // var camera = new THREE.OrthographicCamera(window.innerWidth / -2, window.innerWidth / 2, window.innerHeight / 2, window.innerHeight / -2, -10000, 10000);//-40, 40);
     var renderer = new THREE.WebGLRenderer({antialias: true});
     var svgRenderer = new THREE.SVGRenderer();
     var controls;
 
-    var depthMaterial, effectComposer, depthRenderTarget;
-    var ssaoPass;
+    // var depthMaterial, effectComposer, depthRenderTarget;
+    // var ssaoPass;
 
     var animationRunning = false;
     var pauseFlag = false;
@@ -45,52 +47,52 @@ function initThreeView(globals) {
         var directionalLight5 = new THREE.DirectionalLight(0xffffff, 0.3);
         directionalLight5.position.set(0, 30, -100);
         scene.add(directionalLight5);
-        var ambientLight = new THREE.AmbientLight(0xffffff, 0.1);
+        // var ambientLight = new THREE.AmbientLight(0xffffff, 0.1);
         // scene.add(ambientLight);
         //scene.fog = new THREE.FogExp2(0xf4f4f4, 1.7);
         //renderer.setClearColor(scene.fog.color);
 
         scene.add(camera);
 
-        camera.zoom = 5;
+        camera.zoom = 25;
         camera.updateProjectionMatrix();
-        camera.position.x = 200;
-        camera.position.y = 200;
-        camera.position.z = 200;
+        camera.position.x = 10;
+        camera.position.y = 10;
+        camera.position.z = 10;
 
-        controls = new THREE.OrthographicTrackballControls(camera, renderer.domElement);
-        controls.rotateSpeed = 1.5;
-        controls.zoomSpeed = 0.8;
+        controls = new THREE.TrackballControls(camera, renderer.domElement);
+        controls.rotateSpeed = 1.0;
+        controls.zoomSpeed = 1.2;
         controls.noPan = true;
         controls.staticMoving = true;
         controls.dynamicDampingFactor = 0.3;
         controls.addEventListener("change", render);
 
-        var renderPass = new THREE.RenderPass( scene, camera );
+        // var renderPass = new THREE.RenderPass( scene, camera );
 
         // Setup depth pass
-        depthMaterial = new THREE.MeshDepthMaterial();
-        depthMaterial.depthPacking = THREE.RGBADepthPacking;
-        depthMaterial.blending = THREE.NoBlending;
-
-        var pars = { minFilter: THREE.LinearFilter, magFilter: THREE.LinearFilter };
-        depthRenderTarget = new THREE.WebGLRenderTarget( window.innerWidth, window.innerHeight, pars );
-
-        // Setup SSAO pass
-        ssaoPass = new THREE.ShaderPass( THREE.SSAOShader );
-        ssaoPass.renderToScreen = true;
-        //ssaoPass.uniforms[ "tDiffuse" ].value will be set by ShaderPass
-        ssaoPass.uniforms[ "tDepth" ].value = depthRenderTarget.texture;
-        ssaoPass.uniforms[ 'size' ].value.set( window.innerWidth, window.innerHeight );
-        ssaoPass.uniforms[ 'cameraNear' ].value = camera.near;
-        ssaoPass.uniforms[ 'cameraFar' ].value = camera.far;
-        ssaoPass.uniforms[ 'onlyAO' ].value = 0;
-        ssaoPass.uniforms[ 'aoClamp' ].value = 0.7;
-        ssaoPass.uniforms[ 'lumInfluence' ].value = 0.8;
-        // Add pass to effect composer
-        effectComposer = new THREE.EffectComposer( renderer );
-        effectComposer.addPass( renderPass );
-        effectComposer.addPass( ssaoPass );
+        // depthMaterial = new THREE.MeshDepthMaterial();
+        // depthMaterial.depthPacking = THREE.RGBADepthPacking;
+        // depthMaterial.blending = THREE.NoBlending;
+
+        // var pars = { minFilter: THREE.LinearFilter, magFilter: THREE.LinearFilter };
+        // depthRenderTarget = new THREE.WebGLRenderTarget( window.innerWidth, window.innerHeight, pars );
+        //
+        // // Setup SSAO pass
+        // ssaoPass = new THREE.ShaderPass( THREE.SSAOShader );
+        // ssaoPass.renderToScreen = true;
+        // //ssaoPass.uniforms[ "tDiffuse" ].value will be set by ShaderPass
+        // ssaoPass.uniforms[ "tDepth" ].value = depthRenderTarget.texture;
+        // ssaoPass.uniforms[ 'size' ].value.set( window.innerWidth, window.innerHeight );
+        // ssaoPass.uniforms[ 'cameraNear' ].value = camera.near;
+        // ssaoPass.uniforms[ 'cameraFar' ].value = camera.far;
+        // ssaoPass.uniforms[ 'onlyAO' ].value = 0;
+        // ssaoPass.uniforms[ 'aoClamp' ].value = 0.7;
+        // ssaoPass.uniforms[ 'lumInfluence' ].value = 0.8;
+        // // Add pass to effect composer
+        // effectComposer = new THREE.EffectComposer( renderer );
+        // effectComposer.addPass( renderPass );
+        // effectComposer.addPass( ssaoPass );
     }
 
     function render() {
@@ -126,15 +128,15 @@ function initThreeView(globals) {
             globals.vive.render();
             return;
         }
-        if (globals.ambientOcclusion) {
-            // Render depth into depthRenderTarget
-            scene.overrideMaterial = depthMaterial;
-            renderer.render(scene, camera, depthRenderTarget, true);
-            // Render renderPass and SSAO shaderPass
-            scene.overrideMaterial = null;
-            effectComposer.render();
-            return;
-        }
+        // if (globals.ambientOcclusion) {
+        //     // Render depth into depthRenderTarget
+        //     scene.overrideMaterial = depthMaterial;
+        //     renderer.render(scene, camera, depthRenderTarget, true);
+        //     // Render renderPass and SSAO shaderPass
+        //     scene.overrideMaterial = null;
+        //     effectComposer.render();
+        //     return;
+        // }
         renderer.render(scene, camera);
     }
 
@@ -146,6 +148,7 @@ function initThreeView(globals) {
             });
             return;
         }
+        controls.update();//todo put this above callback?
         requestAnimationFrame(function(){
             if (pauseFlag) {
                 pauseFlag = false;
@@ -172,23 +175,24 @@ function initThreeView(globals) {
 
     function onWindowResize() {
         camera.aspect = window.innerWidth / window.innerHeight;
-        camera.left = -window.innerWidth / 2;
-        camera.right = window.innerWidth / 2;
-        camera.top = window.innerHeight / 2;
-        camera.bottom = -window.innerHeight / 2;
+        // camera.left = -window.innerWidth / 2;
+        // camera.right = window.innerWidth / 2;
+        // camera.top = window.innerHeight / 2;
+        // camera.bottom = -window.innerHeight / 2;
         camera.updateProjectionMatrix();
 
         renderer.setSize(window.innerWidth, window.innerHeight);
+        controls.handleResize();
 
-        var width = window.innerWidth;
-        var height = window.innerHeight;
+        // var width = window.innerWidth;
+        // var height = window.innerHeight;
 
-        ssaoPass.uniforms[ 'size' ].value.set( width, height );
-        var pixelRatio = renderer.getPixelRatio();
-        var newWidth  = Math.floor( width / pixelRatio ) || 1;
-        var newHeight = Math.floor( height / pixelRatio ) || 1;
-        depthRenderTarget.setSize( newWidth, newHeight );
-        effectComposer.setSize( newWidth, newHeight );
+        // ssaoPass.uniforms[ 'size' ].value.set( width, height );
+        // var pixelRatio = renderer.getPixelRatio();
+        // var newWidth  = Math.floor( width / pixelRatio ) || 1;
+        // var newHeight = Math.floor( height / pixelRatio ) || 1;
+        // depthRenderTarget.setSize( newWidth, newHeight );
+        // effectComposer.setSize( newWidth, newHeight );
 
         render();
     }
@@ -242,6 +246,7 @@ function initThreeView(globals) {
         scene: scene,
         camera: camera,
         renderer: renderer,
+        modelWrapper:modelWrapper,
         running: running,
         setScale:setScale,
         saveSVG: saveSVG

diff --git a/logo-active.png b/logo-active.png
diff --git a/logo.png b/logo.png