From a236fceeadd0e668d2db967a4fcaa70122c4e7b4 Mon Sep 17 00:00:00 2001
From: ericrius1 <ericrius1>
Date: Tue, 8 Mar 2016 16:58:42 -0800
Subject: [PATCH] color pallete

---
 .../Home/plant/growingPlantEntityScript.js          | 13 +++++++------
 .../DomainContent/Home/plant/growingPlantSpawner.js |  8 ++++----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/unpublishedScripts/DomainContent/Home/plant/growingPlantEntityScript.js b/unpublishedScripts/DomainContent/Home/plant/growingPlantEntityScript.js
index 7fb6bb731d..b6c242f17d 100644
--- a/unpublishedScripts/DomainContent/Home/plant/growingPlantEntityScript.js
+++ b/unpublishedScripts/DomainContent/Home/plant/growingPlantEntityScript.js
@@ -33,8 +33,8 @@
             max: 1000
         };
         _this.canCreateFlower = true;
-        // _this.SHADER_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/shaders/flower.fs?v1";
-        _this.SHADER_URL = "file:///C:/Users/Eric/hifi/unpublishedScripts/DomainContent/Home/plant/flower.fs";
+        _this.SHADER_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/shaders/flower.fs";
+        // _this.SHADER_URL = "file:///C:/Users/Eric/hifi/unpublishedScripts/DomainContent/Home/plant/flower.fs";
 
         _this.flowerHSLColors = [{
             hue: 19 / 360,
@@ -77,8 +77,8 @@
                 // Reduces flower overlap
                 return;
             }
-            var xzGrowthRate = randFloat(0.00008, 0.00018);
-            var growthRate = {x: xzGrowthRate, y: randFloat(0.001, 0.0035), z: xzGrowthRate};
+            var xzGrowthRate = randFloat(0.00006, 0.00016);
+            var growthRate = {x: xzGrowthRate, y: randFloat(0.001, 0.003), z: xzGrowthRate};
     
             var flower = {
                 dimensions: {
@@ -88,7 +88,7 @@
                 },
                 startingPosition: position,
                 rotation: Quat.rotationBetween(Vec3.UNIT_Y, surfaceNormal),
-                maxYDimension: randFloat(0.5, 1.3),
+                maxYDimension: randFloat(0.4, 1.1),
                 // startingHSLColor: {
                 //     hue: 80 / 360,
                 //     saturation: 0.47,
@@ -144,7 +144,8 @@
 
         preload: function(entityID) {
             _this.entityID = entityID;
-        }
+        },
+
     };
 
     // entity scripts always need to return a newly constructed object of our type
diff --git a/unpublishedScripts/DomainContent/Home/plant/growingPlantSpawner.js b/unpublishedScripts/DomainContent/Home/plant/growingPlantSpawner.js
index 7b791f74d3..a48708eb8a 100644
--- a/unpublishedScripts/DomainContent/Home/plant/growingPlantSpawner.js
+++ b/unpublishedScripts/DomainContent/Home/plant/growingPlantSpawner.js
@@ -129,10 +129,10 @@ var waterSpout = Entities.addEntity({
 });
 
 function cleanup() {
-  Entities.deleteEntity(plant);
-  Entities.deleteEntity(bowl);
-  Entities.deleteEntity(waterCan);
-  Entities.deleteEntity(waterSpout);
+  // Entities.deleteEntity(plant);
+  // Entities.deleteEntity(bowl);
+  // Entities.deleteEntity(waterCan);
+  // Entities.deleteEntity(waterSpout);
 }