Revert "Revert "forces""

This reverts commit ed74bfc.

Author: Ayush Seth

Fraternal Tree.js

@@ -2,7 +2,7 @@ var tree = [];
 var flowers = [];
 var branchNumber = 0;
 var shrink, shake, intensity, grow = false,
-    shed, grav, flsize;
+    shed, gravity, flsize, grav, wind_dir, windcheck;
 
 function setup() {
     createCanvas(600, 600);
@@ -28,15 +28,32 @@ function setup() {
     grows.position(100, 370);
     grows.mousePressed(growFlowers);
 
-    grav = createVector(0, 2);
+    gravity = createVector(0, 0.3);
+    grav = createCheckbox("Gravity", true);
+
+    windcheck = createCheckbox("Wind ON/OFF", false);
+
+    wind_dir = createRadio();
+    wind_dir.option("Left");
+    wind_dir.option("Right");
+    wind_dir.value("Right");
 
 }
+var wind;
 
 function draw() {
+    
     background(51);
     fill(255);
     textSize(24);
     text("Number of branches = " + branchNumber, 15, 30);
+    
+    if(windcheck.checked()) {
+        if(wind_dir.value() == "Left")
+            wind = createVector(-0.2, 0);
+        else if(wind_dir.value() == "Right")
+            wind = createVector(0.2, 0);        
+    }
     for (var i = 0; i < tree.length; i++) {
         tree[i].show();
         if (tree[i].flower)
@@ -47,10 +64,15 @@ function draw() {
         if (!tree[i].grown && grow && tree[i].flower) {
             tree[i].growFlower();
         }
-        if (shed && tree[i].flower && !tree[i].flower.done) {
-            tree[i].flower.shed();
-            tree[i].flower.applyForce(grav);
-        }
+        if (shed && tree[i].flower) {
+            if(grav.checked()) {
+                tree[i].flower.applyForce(gravity);
+            }
+            if(windcheck.checked())
+                tree[i].flower.applyForce(wind);         
+            if(!tree[i].flower.done)
+                tree[i].flower.shed();
+        }       
     }
 }
 

flower.js

@@ -21,7 +21,7 @@ function Flower(branch) {
 
         this.acceleration.mult(0);
         if (this.done)
-            this.lifespan -= 2;
+            this.lifespan-=0.8;
     }
     this.shed = function() {
         this.applyForce(createVector(random(-1, 1), random(-1, -0.1)));