Flowers blending more into rocks

This commit is contained in:
ericrius1 2016-03-08 16:51:24 -08:00
parent 17454fdb01
commit f7028cef6e
2 changed files with 10 additions and 15 deletions

View file

@ -73,9 +73,10 @@ void mainImage( out vec4 fragColor, in vec2 fragCoord ) {
} }
// simulate ambient occlusion // simulate ambient occlusion
float brightness = pow(radius, 0.8);
vec3 hslColor = iHSLColor + (abs(angle) * 0.02);
vec3 rgbColor =hsl2rgb(iHSLColor); hslColor.z = 0.15 + pow(radius, 2.);
vec3 rgbColor = hsl2rgb(hslColor);
fragColor = vec4(rgbColor, 1.0); fragColor = vec4(rgbColor, 1.0);
} }

View file

@ -39,11 +39,11 @@
_this.flowerHSLColors = [{ _this.flowerHSLColors = [{
hue: 19 / 360, hue: 19 / 360,
saturation: 0.92, saturation: 0.92,
light: 0.41 light: 0.31
}, { }, {
hue: 161 / 360, hue: 161 / 360,
saturation: 0.28, saturation: 0.28,
light: 0.72 light: 0.62
}]; }];
}; };
@ -77,14 +77,9 @@
// Reduces flower overlap // Reduces flower overlap
return; return;
} }
// var xzGrowthRate = randFloat(0.00005, 0.00015); var xzGrowthRate = randFloat(0.00008, 0.00018);
var xzGrowthRate = randFloat(0.0005, 0.0015); var growthRate = {x: xzGrowthRate, y: randFloat(0.001, 0.0035), z: xzGrowthRate};
// 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 = { var flower = {
dimensions: { dimensions: {
x: _this.STARTING_FLOWER_DIMENSIONS.x, x: _this.STARTING_FLOWER_DIMENSIONS.x,
@ -93,8 +88,7 @@
}, },
startingPosition: position, startingPosition: position,
rotation: Quat.rotationBetween(Vec3.UNIT_Y, surfaceNormal), rotation: Quat.rotationBetween(Vec3.UNIT_Y, surfaceNormal),
// maxYDimension: randFloat(0.4, 1.0), maxYDimension: randFloat(0.5, 1.3),
maxYDimension: randFloat(4, 10.0),
// startingHSLColor: { // startingHSLColor: {
// hue: 80 / 360, // hue: 80 / 360,
// saturation: 0.47, // saturation: 0.47,