ayush-seth
diff --git a/‎Fraternal Tree.js‎
Lines changed: 8 additions & 4 deletions b/‎Fraternal Tree.js‎
Lines changed: 8 additions & 4 deletions
diff --git a/‎flower.js‎
Lines changed: 4 additions & 1 deletion b/‎flower.js‎
Lines changed: 4 additions & 1 deletion
diff --git a/‎index.html‎
Lines changed: 18 additions & 6 deletions b/‎index.html‎
Lines changed: 18 additions & 6 deletions
@@ -14,30 +14,34 @@ function setup() {
     intensity = createSlider(0.1, 2, 0.5, 0);
     intensity.parent("shake");
 
-    flsize = createSlider(5, 15, 10, 0);
+    flsize = createSlider(5, 15, 7, 0);
     flsize.parent("flsize");
 
     shrink = createSlider(0.30, 1, 0.75, 0);
     shrink.parent("shrink");
 
-    var sheds = createButton("SHED FLOWERS");
+    var sheds = createButton("SHED LEAVES");
     sheds.position(100, 400);
     sheds.mousePressed(shedFlowers);
 
-    var grows = createButton("GROW FLOWERS")
+    var grows = createButton("GROW LEAVES")
     grows.position(100, 370);
     grows.mousePressed(growFlowers);
 
     gravity = createVector(0, 0.3);
-    grav = createCheckbox("Gravity", true);
+    grav = createCheckbox("Gravity ON/OFF", true);
+    grav.position(100, 430);
 
     windcheck = createCheckbox("Wind ON/OFF", false);
+    windcheck.position(100, 460);   
 
     wind_dir = createRadio();
+    wind_dir.position(250, 460);
     wind_dir.option("Left");
     wind_dir.option("Right");
     wind_dir.value("Right");
 
+
 }
 var wind;
 
 
@@ -8,7 +8,10 @@ function Flower(branch) {
     this.lifespan = 255;
 
     this.draw = function() {
-        fill(255, 0, 110, this.lifespan);
+        
+        var colour = document.getElementById("colour").jscolor.rgb;
+        fill(colour[0],colour[1],colour[2], this.lifespan);
+        // fill(document.getElementById("colour").jscolor.toHEXString(),,,this.lifespan);
         noStroke();
         ellipse(this.pos.x, this.pos.y, this.size, this.size);
     }
 
@@ -3,17 +3,18 @@
 
 <head>
 	<title>Fractal Tree Generator</title>
-	<script language="javascript" type="text/javascript" src="libraries\p5.js">
+	<script language="javascript" type="text/javascript" src="lib\p5\p5.js">
 	</script>
-	<script language="javascript" type="text/javascript" src="libraries\p5.dom.js">
+	<script language="javascript" type="text/javascript" src="lib\p5\p5.dom.js">
 	</script>
 	<script language="javascript" type="text/javascript" src="Fraternal Tree.js">
 	</script>
 	<script language="javascript" type="text/javascript" src="branch.js">
 	</script>
 	<script language="javascript" type="text/javascript" src="flower.js">
 	</script>
-</head>
+	<script language="javascript" type="text/javascript" src="lib\jscolor\jscolor.js">
+	</script>
 <link href="https://fonts.googleapis.com/css?family=Exo+2" rel="stylesheet">
 <link href="https://fonts.googleapis.com/css?family=Lato" rel="stylesheet">
 <style>
@@ -38,6 +39,9 @@
 	div {
 		color: #fff;
 	}
+	p {
+		color: #fff;
+	}
 </style>
 
 <body>
@@ -46,18 +50,26 @@ <h2>General Instructions</h2>
 	<ul>
 		<li>Click on canvas to create branches.</li>
 		<li>Use the checkbox to control shaking</li>
-		<li>Use the buttons to grow and shed flowers</li>
+		<li>Use the buttons to grow and shed leaves</li>
 	</ul>
 	<div id="shrink">
 		New branch size(Relative to parent branch)
 	</div>
+	
+	<p>Select leaf color :
+	<button id="colour" class="jscolor {valueElement:null,value:'00c42b'}" style="width:50px; height:20px;"></button>
+	</p>
+    
+
+
+	
 	<div id="shake">
 		Intensity of shaking
 	</div>
 	<div id="flsize">
-		Size of flowers
+		Size of leaves
 	</div>
-	<p>Currently working on bug : Creating new branches will make flowers disappear (They reappear if you grow them again)</p>
+	<p>Currently working on bug : Creating new branches will make leaves disappear (They reappear if you grow them again)</p>
 	<br><br>
 </body>
 <script>