From f7028cef6ed1c2f5e4779fd03af323c8d6827eee Mon Sep 17 00:00:00 2001
From: ericrius1 <ericrius1>
Date: Tue, 8 Mar 2016 16:51:24 -0800
Subject: [PATCH] Flowers blending more into rocks

---
 .../DomainContent/Home/plant/flower.fs         |  7 ++++---
 .../Home/plant/growingPlantEntityScript.js     | 18 ++++++------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/unpublishedScripts/DomainContent/Home/plant/flower.fs b/unpublishedScripts/DomainContent/Home/plant/flower.fs
index 5aed4e7ca0..b67c910074 100644
--- a/unpublishedScripts/DomainContent/Home/plant/flower.fs
+++ b/unpublishedScripts/DomainContent/Home/plant/flower.fs
@@ -73,9 +73,10 @@ void mainImage( out vec4 fragColor, in vec2 fragCoord ) {
     }
 
     // simulate ambient occlusion
-
-  
-    vec3 rgbColor =hsl2rgb(iHSLColor);
+    float brightness = pow(radius, 0.8);
+    vec3 hslColor = iHSLColor + (abs(angle) * 0.02);
+    hslColor.z = 0.15 + pow(radius, 2.);
+    vec3 rgbColor = hsl2rgb(hslColor);
     fragColor = vec4(rgbColor, 1.0);
 }
 
diff --git a/unpublishedScripts/DomainContent/Home/plant/growingPlantEntityScript.js b/unpublishedScripts/DomainContent/Home/plant/growingPlantEntityScript.js
index 1cf639cd2c..7fb6bb731d 100644
--- a/unpublishedScripts/DomainContent/Home/plant/growingPlantEntityScript.js
+++ b/unpublishedScripts/DomainContent/Home/plant/growingPlantEntityScript.js
@@ -39,11 +39,11 @@
         _this.flowerHSLColors = [{
             hue: 19 / 360,
             saturation: 0.92,
-            light: 0.41
+            light: 0.31
         }, {
             hue: 161 / 360,
             saturation: 0.28,
-            light: 0.72
+            light: 0.62
         }];
 
     };
@@ -77,14 +77,9 @@
                 // Reduces flower overlap
                 return;
             }
-            // var xzGrowthRate = randFloat(0.00005, 0.00015);
-            var xzGrowthRate = randFloat(0.0005, 0.0015);
-            // var growthRate = {x: xzGrowthRate, y: randFloat(0.001, 0.0025, z: xzGrowthRate)};
-            var growthRate = {
-                x: xzGrowthRate,
-                y: randFloat(0.01, 0.025),
-                z: xzGrowthRate
-            };
+            var xzGrowthRate = randFloat(0.00008, 0.00018);
+            var growthRate = {x: xzGrowthRate, y: randFloat(0.001, 0.0035), z: xzGrowthRate};
+    
             var flower = {
                 dimensions: {
                     x: _this.STARTING_FLOWER_DIMENSIONS.x,
@@ -93,8 +88,7 @@
                 },
                 startingPosition: position,
                 rotation: Quat.rotationBetween(Vec3.UNIT_Y, surfaceNormal),
-                // maxYDimension: randFloat(0.4, 1.0),
-                maxYDimension: randFloat(4, 10.0),
+                maxYDimension: randFloat(0.5, 1.3),
                 // startingHSLColor: {
                 //     hue: 80 / 360,
                 //     saturation: 0.47,