Changeset 29693 for other-projects/nz-flag-design/trunk/render-3d/Flag_files

Timestamp:

2015-01-21T15:12:08+13:00 (9 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/Flag_files/Flag.js (modified) (9 diffs)
• render-3d/Flag_files/slider.js (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);
     }