Changeset 29693

Timestamp:

2015-01-21T15:12:08+13:00 (8 years ago)

Author:

bmt11

Message:

Added slider for wind control but the black box is a bug I have no figured out for some time now
Camera control is disabled whilst using the slider also :)

Location:

other-projects/nz-flag-design/trunk

Files:

• . (modified) (1 prop)
• render-3d/CSS/slider.css (added)
• render-3d/Flag_files/Flag.js (modified) (9 diffs)
• render-3d/Flag_files/slider.js (added)
• render-3d/flag.html (modified) (9 diffs)
• render-3d/images/slider-graphics.png (added)
• render-3d/images/slider-knob.png (added)
• render-3d/images/speed-empty.png (added)
• render-3d/images/speed-full.png (added)

other-projects/nz-flag-design/trunk/render-3d/Flag_files/Flag.js

@@ -62 +62 @@
 
 var wind = true;
-var windStrength = 2;
+
 var windForce = new THREE.Vector3(0,0,0);
 
@@ -107 +107 @@
 // Performs verlet integration
 Particle.prototype.integrate = function(timesq) {
+
     var newPos = this.tmp.subVectors(this.position, this.previous);
     newPos.multiplyScalar(DRAG).add(this.position);
@@ -116 +117 @@
 
     this.a.set(0, 0, 0);
+    
 }
 
@@ -122 +124 @@
 
 function satisifyConstrains(p1, p2, distance) {
+    
     diff.subVectors(p2.position, p1.position);
     var currentDist = diff.length();
@@ -129 +132 @@
     p1.position.add(correctionHalf);
     p2.position.sub(correctionHalf);
-
-    // float difference = (restingDistance - d) / d
-    // im1 = 1 / p1.mass // inverse mass quantities
-    // im2 = 1 / p2.mass
-    // p1.position += delta * (im1 / (im1 + im2)) * stiffness * difference
-
+    
 }
 
@@ -158 +156 @@
 
     // Structural
-
+    
     for (v=0;v<h;v++) {
         for (u=0;u<w;u++) {
@@ -193 +191 @@
         ]);
     }
-
+    
 
     // While many system uses shear and bend springs,
@@ -219 +217 @@
         }
     }
-
-
-    // // Bend
-
-    // var wlen = restDistance * 2;
-    // var hlen = restDistance * 2;
-    // diagonalDist = Math.sqrt(wlen * wlen + hlen * hlen);
-
-    // for (v=0;v<h-1;v++) {
-    //  for (u=0;u<w-1;u++) {
-    //      constrains.push([
-    //          particles[index(u, v)],
-    //          particles[index(u+2, v)],
-    //          wlen
-    //      ]);
-
-    //      constrains.push([
-    //          particles[index(u, v)],
-    //          particles[index(u, v+2)],
-    //          hlen
-    //      ]);
-
-    //      constrains.push([
-    //          particles[index(u, v)],
-    //          particles[index(u+2, v+2)],
-    //          diagonalDist
-    //      ]);
-
-    //      constrains.push([
-    //          particles[index(u, v+2)],
-    //          particles[index(u+2, v+2)],
-    //          wlen
-    //      ]);
-
-    //      constrains.push([
-    //          particles[index(u+2, v+2)],
-    //          particles[index(u+2, v+2)],
-    //          hlen
-    //      ]);
-
-    //      constrains.push([
-    //          particles[index(u+2, v)],
-    //          particles[index(u, v+2)],
-    //          diagonalDist
-    //      ]);
-
-    //  }
-    // }
-
-
+    
     this.particles = particles;
     this.constrains = constrains;
@@ -320 +269 @@
         particle.addForce(gravity);
         //
-        // var x = particle.position.x, y = particle.position.y, z = particle.position.z, t=Date.now() / 1000;
-        // windForce.set(Math.sin(x*y*t), Math.cos(z*t), Math.sin(Math.cos(5*x*y*z))).multiplyScalar(100);
-        // particle.addForce(windForce);
+        var x = particle.position.x, y = particle.position.y, z = particle.position.z, t=Date.now() / 1000;
+        //windForce.set(Math.sin(x*y*t), Math.cos(z*t), Math.sin(Math.cos(5*x*y*z))).multiplyScalar(0);
+        particle.addForce(windForce);
         particle.integrate(TIMESTEP_SQ);
     }

other-projects/nz-flag-design/trunk/render-3d/flag.html

@@ -4 +4 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 
-        <title>three.js webgl - 3D Flag hhh</title>
+        <title>3D Representation of Flag</title>
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
@@ -61 +61 @@
         </style>
     <style type="text/css"></style></head>
-
+    
     <body>
+        
         <div id="menuContainer">
             <div id="weatherMenu" style="color : white">
@@ -75 +76 @@
         </div>
         
+        <div id="slider">
+            <div id="speed"></div>
+        </div>
+        
+        <link rel="stylesheet" href="./CSS/slider.css" />
         
         <script type="text/javascript">
+            
+            /*              JQUERY SLIDER                   */
+            
+            
+            
+            
+            /*----------------------------------------------*/
+        
             var open = false;
             function openclose(){
@@ -103 +117 @@
         <script type="text/javascript" src="./weather/sun.js"></script>
         <script type="text/javascript" src="./Flag_files/ColladaLoader.js"></script>
+        <script type="text/javascript" src="./Flag_files/slider.js"></script>
         
         <script type="text/javascript" src="./Flag_files/KeyboardState.js"></script>
 
+        <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.2/jquery-ui.min.js"></script>
+        
         <script type="x-shader/x-fragment" id="fragmentShaderDepth">
 
@@ -330 +347 @@
                 mesh.castShadow = false;
                 scene.add( mesh );
-
-                /*var tmp = mesh.position
-                var gg = new THREE.BoxGeometry( 100, 100, 100 );
-                var mesh = new THREE.Mesh( gg, poleMat );
-                mesh.position.y = tmp.y - 740;
-                mesh.position.x = tmp.x; //125
-                mesh.position.z = tmp.z;
-                mesh.receiveShadow = true;
-                mesh.castShadow = false;
-                scene.add( mesh );*/
-
 
                 //
@@ -428 +434 @@
                     object.position.z = -165;
                     scene.add( object );
+                    
                     initial = false;
                     object.customDepthMaterial = new THREE.ShaderMaterial( { uniforms: uniforms, vertexShader: vertexShader, fragmentShader: fragmentShader } );
@@ -475 +482 @@
                 
                 var timer = Date.now() * 0.0002;
-    
-                keyboard.update();
-                if( keyboard.down("A")) {
-                    flagSelector--;
-                    if(flagSelector < 0) flagSelector = flags.length-1;
-                    createFlag();
-
-                }else if(keyboard.down("D")) {
-                    flagSelector++;
-                    if(flagSelector >= flags.length) flagSelector = 0;  
-                    createFlag();
-                }
                 
                 var p = cloth.particles;
@@ -500 +495 @@
                 clothGeometry.normalsNeedUpdate = true;
                 clothGeometry.verticesNeedUpdate = true;
-                
-
-                
+
                 if(raining && weatherSystem.type != rainSystem){
                     snowing = false;
@@ -526 +519 @@
 
             }
-
-        </script><div><canvas width="1366" height="600"></canvas>
+        
+        </script>
+        
 </body></html>