Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 18:13:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

In a state where non uniform random vals are clear

Browse source
This commit is contained in:
ericrius1 2015-12-15 18:02:11 -08:00
parent dca83a054e
commit d9c93130e5
2 changed files with 14 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
examples/flowArts/lightBall/lightBallSpawner.js
View file

@ -12,21 +12,9 @@ var raveRoom = Entities.addEntity({
}); });
var colorPalette = [{ var colorPalette = [{
red: 250, red: 25,
green: 137, green: 20,
blue: 162 blue: 162
}, {
red: 204,
green: 244,
blue: 249
}, {
red: 146,
green: 206,
blue: 116
}, {
red: 240,
green: 87,
blue: 129
}]; }];
@ -34,7 +22,7 @@ var containerBall = Entities.addEntity({
type: "Sphere", type: "Sphere",
position: center, position: center,
dimensions: {x: .1, y: .1, z: .1}, dimensions: {x: .1, y: .1, z: .1},
color: {red: 1500, green: 10, blue: 50}, color: {red: 15, green: 10, blue: 150},
collisionsWillMove: true, collisionsWillMove: true,
userData: JSON.stringify({ userData: JSON.stringify({
grabbableKey: { grabbableKey: {
@ -90,13 +78,13 @@ var lightBall = Entities.addEntity({
isEmitting: true, isEmitting: true,
"name": "ParticlesTest Emitter", "name": "ParticlesTest Emitter",
"colorStart": {red: 200, green: 20, blue: 40}, "colorStart": {red: 200, green: 20, blue: 40},
color: {red: 10, green: 0, blue: 255}, color: {red: 200, green: 200, blue: 255},
"colorFinish": {red: 250, green: 200, blue:255}, "colorFinish": {red: 25, green: 20, blue:255},
"maxParticles": 100000, "maxParticles": 100000,
"lifespan": 2, "lifespan": 5,
"emitRate": 10000, "emitRate": 500,
"emitSpeed": .2, "emitSpeed": .02,
"speedSpread": .01, "speedSpread": .0,
"emitDimensions": { "emitDimensions": {
"x": 0, "x": 0,
"y": 0, "y": 0,
@ -112,9 +100,9 @@ var lightBall = Entities.addEntity({
"z": 0 "z": 0
}, },
"accelerationSpread": { "accelerationSpread": {
"x": .01, "x": .00,
"y": .01, "y": .00,
"z": .01 "z": .00
}, },
"particleRadius": 0.04, "particleRadius": 0.04,
"radiusSpread": 0, "radiusSpread": 0,
@ -124,9 +112,8 @@ var lightBall = Entities.addEntity({
"alphaSpread": .5, "alphaSpread": .5,
"alphaStart": 0, "alphaStart": 0,
"alphaFinish": 0.5, "alphaFinish": 0.5,
"additiveBlending": 0,
"textures": "https://hifi-public.s3.amazonaws.com/alan/Particles/Particle-Sprite-Smoke-1.png", "textures": "https://hifi-public.s3.amazonaws.com/alan/Particles/Particle-Sprite-Smoke-1.png",
emitterShouldTrail: false emitterShouldTrail: true
}) })

2
libraries/entities/src/ParticleEffectEntityItem.cpp
View file

@ -645,7 +645,7 @@ ParticleEffectEntityItem::Particle ParticleEffectEntityItem::createParticle() {
std::random_device rd; std::random_device rd;
std::mt19937_64 el(rd()); std::mt19937_64 el(rd());
std::uniform_real_distribution<float> uniform_dist(-1.0, 1.0); std::uniform_real_distribution<float> uniform_dist(0.0, 1.0);
particle.seed = randFloatInRange(-1.0f, 1.0f); particle.seed = randFloatInRange(-1.0f, 1.0f);
if (getEmitterShouldTrail()) { if (getEmitterShouldTrail()) {