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

Timestamp:

2015-01-22T14:28:16+13:00 (9 years ago)

Author:

bmt11

Message:

Wind Control is now fully implemented and functioning as expected :)

Location:

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

Files:

• Flag.js (modified) (2 diffs)
• slider.js (modified) (2 diffs)

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

@@ -269 +269 @@
         particle.addForce(gravity);
         //
-        var x = particle.position.x, y = particle.position.y, z = particle.position.z, t=Date.now() / 1000;
+        //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.addForce(windForce);
         particle.integrate(TIMESTEP_SQ);
     }
@@ -291 +291 @@
 
     // Pin Constrains
-    if(Boolean(pinning)){
-        for (i=0, il=pins.length;i<il;i++) {
-            var xy = pins[i];
-            var p = particles[xy];
-            p.position.copy(p.original);
-            p.previous.copy(p.original);
-        }
-    }
-
-}
+    for (i=0, il=pins.length;i<il;i++) {
+        var xy = pins[i];
+        var p = particles[xy];
+        p.position.copy(p.original);
+        p.previous.copy(p.original);
+    }
+}

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

@@ -1 +1 @@
 jQuery(document).ready(function ($) {
     $("#speed").slider({
-        min: 0,
-        max: 100,
-        value: 0,
+        min: 25,
+        max: 300,
+        value: 100,
         animate: true,
         range: 'min',
         slide: function(event, ui) {
-            setSpeed(ui.value/100);
+            setSpeed(ui.value);
         }
     }); 
@@ -20 +20 @@
     
     function setSpeed(speed){
-        windForce.set(speed,100,speed);
+        windStrength = speed;
     }
 });