Skip to content

Commit ed74bfc

Browse files
author
Ayush Seth
committed
Revert "forces"
This reverts commit 2a4d3c1.
1 parent 2a4d3c1 commit ed74bfc

File tree

2 files changed

+7
-29
lines changed

2 files changed

+7
-29
lines changed

Fraternal Tree.js

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ var tree = [];
22
var flowers = [];
33
var branchNumber = 0;
44
var shrink, shake, intensity, grow = false,
5-
shed, gravity, flsize, grav, wind_dir, windcheck;
5+
shed, grav, flsize;
66

77
function setup() {
88
createCanvas(600, 600);
@@ -28,32 +28,15 @@ function setup() {
2828
grows.position(100, 370);
2929
grows.mousePressed(growFlowers);
3030

31-
gravity = createVector(0, 0.3);
32-
grav = createCheckbox("Gravity", true);
33-
34-
windcheck = createCheckbox("Wind ON/OFF", false);
35-
36-
wind_dir = createRadio();
37-
wind_dir.option("Left");
38-
wind_dir.option("Right");
39-
wind_dir.value("Right");
31+
grav = createVector(0, 2);
4032

4133
}
42-
var wind;
4334

4435
function draw() {
45-
4636
background(51);
4737
fill(255);
4838
textSize(24);
4939
text("Number of branches = " + branchNumber, 15, 30);
50-
51-
if(windcheck.checked()) {
52-
if(wind_dir.value() == "Left")
53-
wind = createVector(-0.2, 0);
54-
else if(wind_dir.value() == "Right")
55-
wind = createVector(0.2, 0);
56-
}
5740
for (var i = 0; i < tree.length; i++) {
5841
tree[i].show();
5942
if (tree[i].flower)
@@ -64,15 +47,10 @@ function draw() {
6447
if (!tree[i].grown && grow && tree[i].flower) {
6548
tree[i].growFlower();
6649
}
67-
if (shed && tree[i].flower) {
68-
if(grav.checked()) {
69-
tree[i].flower.applyForce(gravity);
70-
}
71-
if(windcheck.checked())
72-
tree[i].flower.applyForce(wind);
73-
if(!tree[i].flower.done)
74-
tree[i].flower.shed();
75-
}
50+
if (shed && tree[i].flower && !tree[i].flower.done) {
51+
tree[i].flower.shed();
52+
tree[i].flower.applyForce(grav);
53+
}
7654
}
7755
}
7856

flower.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ function Flower(branch) {
2121

2222
this.acceleration.mult(0);
2323
if (this.done)
24-
this.lifespan-=0.8;
24+
this.lifespan -= 2;
2525
}
2626
this.shed = function() {
2727
this.applyForce(createVector(random(-1, 1), random(-1, -0.1)));

0 commit comments

Comments
 (0)