diff --git a/unpublishedScripts/DomainContent/Home/plant/flower.fs b/unpublishedScripts/DomainContent/Home/plant/flower.fs index 8e35bd1014..d49d283e2c 100644 --- a/unpublishedScripts/DomainContent/Home/plant/flower.fs +++ b/unpublishedScripts/DomainContent/Home/plant/flower.fs @@ -46,7 +46,7 @@ void mainImage( out vec4 fragColor, in vec2 fragCoord ) { color = hsb2rgb(vec3( abs(angle/hueAngleRange) + hueTimeOffset, 0.7, brightness)); - fragColor = vec4(color, 1.0); + fragColor = vec4(1.0, 0.1, 1.0, 1.0); } diff --git a/unpublishedScripts/DomainContent/Home/plant/growingPlantEntityScript.js b/unpublishedScripts/DomainContent/Home/plant/growingPlantEntityScript.js index 1153bd1fdb..15d720bd51 100644 --- a/unpublishedScripts/DomainContent/Home/plant/growingPlantEntityScript.js +++ b/unpublishedScripts/DomainContent/Home/plant/growingPlantEntityScript.js @@ -77,7 +77,10 @@ dimensions: _this.STARTING_FLOWER_DIMENSIONS, userData: JSON.stringify(_this.flowerUserData) }); - var xzGrowthRate = randFloat(0.00005, 0.00015); + // 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 flower = { id: flowerEntityID, dimensions: { @@ -87,12 +90,9 @@ }, startingPosition: position, rotation: flowerRotation, - maxYDimension: randFloat(0.4, 1.0), - growthRate: { - x: xzGrowthRate, - y: randFloat(0.001, 0.0025), - z: xzGrowthRate - } + // maxYDimension: randFloat(0.4, 1.0), + maxYDimension: randFloat(4, 10.0), + growthRate: growthRate }; flower.grow = function() { // grow flower a bit @@ -113,7 +113,8 @@ preload: function(entityID) { _this.entityID = entityID; - var SHADER_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/shaders/flower.fs?v1"; + // var SHADER_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/shaders/flower.fs?v1"; + var SHADER_URL = "file:///C:/Users/Eric/hifi/unpublishedScripts/DomainContent/Home/plant/flower.fs"; _this.flowerUserData = { ProceduralEntity: { shaderUrl: SHADER_URL,