Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-08 23:47:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

multiple flowers blooming

Browse source
This commit is contained in:
ericrius1 2016-02-12 15:32:07 -08:00
parent b5cc022df0
commit 2c895151f6
2 changed files with 72 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
examples/homeContent/plant/flower.fs
View file

@ -26,9 +26,11 @@ void mainImage( out vec4 fragColor, in vec2 fragCoord ) {
if ( iBloomPct < radius || _position.y > 0) { if ( iBloomPct < radius || _position.y > 0) {
discard; discard;
} }
float brightness = (angle * 10./ (TWO_PI)) + 0.5;
// simulate ambient occlusion
float brightness = pow(radius, 0.7);
float hueOffset = sin(iGlobalTime * .07); float hueOffset = sin(iGlobalTime * .07);
color = hsb2rgb(vec3( abs(angle/20) + hueOffset, 0.8, pow(fract(brightness), 0.3))); color = hsb2rgb(vec3( abs(angle/20) + hueOffset, 0.8, brightness));
fragColor = vec4(color, 1.0); fragColor = vec4(color, 1.0);

140
examples/homeContent/plant/growingPlantEntityScript.js
View file

@ -25,11 +25,77 @@
GrowingPlant.prototype = { GrowingPlant.prototype = {
createFlowers: function() { createFlowers: function() {
for (var i = 0; i < 10; i++) { var NUM_FLOWERS = 20
_this.createFlower(); for (var i = 0; i < NUM_FLOWERS; i++) {
var segment = i / NUM_FLOWERS * Math.PI * 2;
var radius = randFloat(0.13, 0.25);
var position = Vec3.sum(_this.position, {
x: radius * Math.cos(segment),
y: 0.15,
z: radius * Math.sin(segment)
});
print("EBL position " + JSON.stringify(position));
_this.createFlower(position);
} }
}, },
createFlower: function(position) {
var startingFlowerDimensions = {
x: 0.2,
y: 0.001,
z: 0.2
};
var flowerUserData = {
ProceduralEntity: {
shaderUrl: "file:///C:/Users/Eric/hifi/examples/homeContent/plant/flower.fs",
uniforms: {
iBloomPct: 0.5
}
}
};
var flower = Entities.addEntity({
type: "Sphere",
position: position,
dimensions: startingFlowerDimensions,
userData: JSON.stringify(flowerUserData)
});
_this.flowers.push(flower);
var curProps = {
yDimension: startingFlowerDimensions.y,
yPosition: position.y,
bloomPct: flowerUserData.ProceduralEntity.uniforms.iBloomPct
};
var newYDimension = curProps.yDimension + 1;
var endProps = {
yDimension: newYDimension,
yPosition: position.y + newYDimension / 2 + .05,
bloomPct: 1
};
var bloomTween = new TWEEN.Tween(curProps).
to(endProps, 3000).
easing(TWEEN.Easing.Cubic.InOut).
delay(randInt(1000, 5000)).
onUpdate(function() {
// flowerUserData.ProceduralEntity.uniforms.iBloomPct = curProps.bloomPct;
Entities.editEntity(flower, {
dimensions: {
x: startingFlowerDimensions.x,
y: curProps.yDimension,
z: startingFlowerDimensions.z
},
position: {
x: position.x,
y: curProps.yPosition,
z: position.z
},
// userData: JSON.stringify(flowerUserData)
});
}).start();
},
createCactus: function() { createCactus: function() {
var MODEL_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/models/cactus.fbx" var MODEL_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/models/cactus.fbx"
var dimensions = { var dimensions = {
@ -72,76 +138,6 @@
}).start(); }).start();
}, },
createFlower: function() {
var startingFlowerDimensions = {
x: 0.2,
y: 0.001,
z: 0.2
};
var flowerUserData = {
ProceduralEntity: {
shaderUrl: "file:///C:/Users/Eric/hifi/examples/homeContent/plant/flower.fs",
uniforms: {
iBloomPct: 0.5
}
}
};
do {
var x = randFloat(-_this.dimensions.x/3, this.dimensions.x/3);
var z = randFloat(-_this.dimensions.z/3, this.dimensions.z/3);
print("EBL X" + x );
} while(x < 0.1 && z < 0.1);
var startingFlowerPosition = Vec3.sum(_this.position, {
x: x,
y: _this.dimensions.y / 2 - 0.04,
z: z
});
var flower = Entities.addEntity({
type: "Sphere",
position: startingFlowerPosition,
color: {
red: 100,
green: 10,
blue: 100
},
dimensions: startingFlowerDimensions,
userData: JSON.stringify(flowerUserData)
});
_this.flowers.push(flower);
var curProps = {
yDimension: startingFlowerDimensions.y,
yPosition: startingFlowerPosition.y,
bloomPct: flowerUserData.ProceduralEntity.uniforms.iBloomPct
};
var newYDimension = curProps.yDimension + 1;
var endProps = {
yDimension: newYDimension,
yPosition: startingFlowerPosition.y + newYDimension / 2,
bloomPct: 1
};
var bloomTween = new TWEEN.Tween(curProps).
to(endProps, 3000).
easing(TWEEN.Easing.Cubic.InOut).
delay(1000).
onUpdate(function() {
// flowerUserData.ProceduralEntity.uniforms.iBloomPct = curProps.bloomPct;
Entities.editEntity(flower, {
dimensions: {
x: startingFlowerDimensions.x,
y: curProps.yDimension,
z: startingFlowerDimensions.z
},
position: {
x: startingFlowerPosition.x,
y: curProps.yPosition,
z: startingFlowerPosition.z
},
// userData: JSON.stringify(flowerUserData)
});
}).start();
},
preload: function(entityID) { preload: function(entityID) {
print("EBL PRELOAD"); print("EBL PRELOAD");