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

Merge pull request #704 from Ventrella/particles

Browse source 
more code cleanup
This commit is contained in:
Philip Rosedale 2013-07-18 11:08:18 -07:00
commit e6cd90fa37
4 changed files with 79 additions and 137 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
interface/src/Application.cpp
View file

@ -73,7 +73,7 @@ using namespace std;
static char STAR_FILE[] = "http://s3-us-west-1.amazonaws.com/highfidelity/stars.txt"; static char STAR_FILE[] = "http://s3-us-west-1.amazonaws.com/highfidelity/stars.txt";
static char STAR_CACHE_FILE[] = "cachedStars.txt"; static char STAR_CACHE_FILE[] = "cachedStars.txt";
static const bool TESTING_PARTICLE_SYSTEM = false; static const bool TESTING_PARTICLE_SYSTEM = true;
static const int BANDWIDTH_METER_CLICK_MAX_DRAG_LENGTH = 6; // farther dragged clicks are ignored static const int BANDWIDTH_METER_CLICK_MAX_DRAG_LENGTH = 6; // farther dragged clicks are ignored
@ -3510,23 +3510,13 @@ void Application::updateParticleSystem(float deltaTime) {
_particleSystem.setShowingEmitter(_coolDemoParticleEmitter, true); _particleSystem.setShowingEmitter(_coolDemoParticleEmitter, true);
glm::vec3 particleEmitterPosition = glm::vec3(5.0f, 1.0f, 5.0f); glm::vec3 particleEmitterPosition = glm::vec3(5.0f, 1.0f, 5.0f);
_particleSystem.setEmitterPosition(_coolDemoParticleEmitter, particleEmitterPosition); _particleSystem.setEmitterPosition(_coolDemoParticleEmitter, particleEmitterPosition);
float radius = 0.01f;
glm::vec4 color(0.0f, 0.0f, 0.0f, 1.0f);
glm::vec3 velocity(0.0f, 0.1f, 0.0f); glm::vec3 velocity(0.0f, 0.1f, 0.0f);
float lifespan = 100000.0f; float lifespan = 100000.0f;
_particleSystem.emitParticlesNow(_coolDemoParticleEmitter, 1500, velocity, lifespan);
// determine a collision sphere
glm::vec3 collisionSpherePosition = glm::vec3( 5.0f, 0.5f, 5.0f );
float collisionSphereRadius = 0.5f;
_particleSystem.setCollisionSphere(_coolDemoParticleEmitter, collisionSpherePosition, collisionSphereRadius);
_particleSystem.emitParticlesNow(_coolDemoParticleEmitter, 1500, radius, color, velocity, lifespan);
} }
// signal that the particle system has been initialized // signal that the particle system has been initialized
_particleSystemInitialized = true; _particleSystemInitialized = true;
// apply a preset color palette
_particleSystem.setOrangeBlueColorPalette();
} else { } else {
// update the particle system // update the particle system
@ -3547,6 +3537,7 @@ void Application::updateParticleSystem(float deltaTime) {
ParticleSystem::ParticleAttributes attributes; ParticleSystem::ParticleAttributes attributes;
attributes.radius = 0.01f; attributes.radius = 0.01f;
attributes.color = glm::vec4( 1.0f, 1.0f, 1.0f, 1.0f);
attributes.gravity = 0.0f + 0.05f * sinf( t * 0.52f ); attributes.gravity = 0.0f + 0.05f * sinf( t * 0.52f );
attributes.airFriction = 2.5 + 2.0f * sinf( t * 0.32f ); attributes.airFriction = 2.5 + 2.0f * sinf( t * 0.32f );
attributes.jitter = 0.05f + 0.05f * sinf( t * 0.42f ); attributes.jitter = 0.05f + 0.05f * sinf( t * 0.42f );
@ -3563,7 +3554,7 @@ void Application::updateParticleSystem(float deltaTime) {
attributes.gravity = 0.0f; attributes.gravity = 0.0f;
} }
_particleSystem.setParticleAttributes(_coolDemoParticleEmitter, attributes); _particleSystem.setParticleAttributes(_coolDemoParticleEmitter, attributes);
} }
_particleSystem.setUpDirection(glm::vec3(0.0f, 1.0f, 0.0f)); _particleSystem.setUpDirection(glm::vec3(0.0f, 1.0f, 0.0f));

12
interface/src/Hand.cpp
View file

@ -216,9 +216,13 @@ void Hand::updateFingerParticles(float deltaTime) {
if (!_particleSystemInitialized) { if (!_particleSystemInitialized) {
for ( int f = 0; f< NUM_FINGERS_PER_HAND; f ++ ) { for ( int f = 0; f< NUM_FINGERS_PER_HAND; f ++ ) {
_particleSystem.setShowingEmitter(f, true );
_fingerParticleEmitter[f] = _particleSystem.addEmitter(); _fingerParticleEmitter[f] = _particleSystem.addEmitter();
assert( _fingerParticleEmitter[f] != -1 );
ParticleSystem::ParticleAttributes attributes; ParticleSystem::ParticleAttributes attributes;
// set attributes for each life stage of the particle: // set attributes for each life stage of the particle:
@ -277,17 +281,17 @@ void Hand::updateFingerParticles(float deltaTime) {
} else { } else {
fingerDirection = IDENTITY_UP; fingerDirection = IDENTITY_UP;
} }
glm::quat particleEmitterRotation = rotationBetween(palm.getNormal(), fingerDirection);
glm::quat particleEmitterRotation = rotationBetween(IDENTITY_UP, fingerDirection); //glm::quat particleEmitterRotation = glm::angleAxis(0.0f, fingerDirection);
_particleSystem.setEmitterPosition(_fingerParticleEmitter[f], particleEmitterPosition); _particleSystem.setEmitterPosition(_fingerParticleEmitter[f], particleEmitterPosition);
_particleSystem.setEmitterRotation(_fingerParticleEmitter[f], particleEmitterRotation); _particleSystem.setEmitterRotation(_fingerParticleEmitter[f], particleEmitterRotation);
float radius = 0.005f;
const glm::vec4 color(1.0f, 0.6f, 0.0f, 0.5f);
const glm::vec3 velocity = fingerDirection * 0.002f; const glm::vec3 velocity = fingerDirection * 0.002f;
const float lifespan = 1.0f; const float lifespan = 1.0f;
_particleSystem.emitParticlesNow(_fingerParticleEmitter[f], 1, radius, color, velocity, lifespan); _particleSystem.emitParticlesNow(_fingerParticleEmitter[f], 1, velocity, lifespan);
} }
} }
} }

133
interface/src/ParticleSystem.cpp
View file

@ -21,36 +21,35 @@ ParticleSystem::ParticleSystem() {
_numParticles = 0; _numParticles = 0;
_upDirection = glm::vec3(0.0f, 1.0f, 0.0f); // default _upDirection = glm::vec3(0.0f, 1.0f, 0.0f); // default
for (unsigned int e = 0; e < MAX_EMITTERS; e++) { for (unsigned int emitterIndex = 0; emitterIndex < MAX_EMITTERS; emitterIndex++) {
_emitter[e].position = glm::vec3(0.0f, 0.0f, 0.0f); _emitter[emitterIndex].position = glm::vec3(0.0f, 0.0f, 0.0f);
_emitter[e].rotation = glm::quat(); _emitter[emitterIndex].rotation = glm::quat();
_emitter[e].right = IDENTITY_RIGHT; _emitter[emitterIndex].visible = false;
_emitter[e].up = IDENTITY_UP; _emitter[emitterIndex].baseParticle.alive = false;
_emitter[e].front = IDENTITY_FRONT; _emitter[emitterIndex].baseParticle.age = 0.0f;
_emitter[e].visible = false; _emitter[emitterIndex].baseParticle.lifespan = 0.0f;
_emitter[e].baseParticle.alive = false; _emitter[emitterIndex].baseParticle.radius = 0.0f;
_emitter[e].baseParticle.age = 0.0f; _emitter[emitterIndex].baseParticle.emitterIndex = 0;
_emitter[e].baseParticle.lifespan = 0.0f; _emitter[emitterIndex].baseParticle.position = glm::vec3(0.0f, 0.0f, 0.0f);
_emitter[e].baseParticle.radius = 0.0f; _emitter[emitterIndex].baseParticle.velocity = glm::vec3(0.0f, 0.0f, 0.0f);
_emitter[e].baseParticle.emitterIndex = 0;
_emitter[e].baseParticle.position = glm::vec3(0.0f, 0.0f, 0.0f);
_emitter[e].baseParticle.velocity = glm::vec3(0.0f, 0.0f, 0.0f);
for (int s = 0; s<NUM_PARTICLE_LIFE_STAGES; s++) { for (int lifeStage = 0; lifeStage<NUM_PARTICLE_LIFE_STAGES; lifeStage++) {
_emitter[e].particleAttributes[s].radius = DEFAULT_PARTICLE_RADIUS;
_emitter[e].particleAttributes[s].color = glm::vec4(0.0f, 0.0f, 0.0f, 0.0f); ParticleAttributes * a = &_emitter[emitterIndex].particleAttributes[lifeStage];
_emitter[e].particleAttributes[s].bounce = DEFAULT_PARTICLE_BOUNCE;
_emitter[e].particleAttributes[s].airFriction = DEFAULT_PARTICLE_AIR_FRICTION; a->radius = DEFAULT_PARTICLE_RADIUS;
_emitter[e].particleAttributes[s].gravity = 0.0f; a->color = glm::vec4(0.0f, 0.0f, 0.0f, 0.0f);
_emitter[e].particleAttributes[s].jitter = 0.0f; a->bounce = DEFAULT_PARTICLE_BOUNCE;
_emitter[e].particleAttributes[s].emitterAttraction = 0.0f; a->airFriction = DEFAULT_PARTICLE_AIR_FRICTION;
_emitter[e].particleAttributes[s].tornadoForce = 0.0f; a->gravity = 0.0f;
_emitter[e].particleAttributes[s].neighborAttraction = 0.0f; a->jitter = 0.0f;
_emitter[e].particleAttributes[s].neighborRepulsion = 0.0f; a->emitterAttraction = 0.0f;
_emitter[e].particleAttributes[s].collisionSphereRadius = 0.0f; a->tornadoForce = 0.0f;
_emitter[e].particleAttributes[s].collisionSpherePosition = glm::vec3(0.0f, 0.0f, 0.0f); a->neighborAttraction = 0.0f;
_emitter[e].particleAttributes[s].usingCollisionSphere = false; a->neighborRepulsion = 0.0f;
a->collisionSphereRadius = 0.0f;
a->collisionSpherePosition = glm::vec3(0.0f, 0.0f, 0.0f);
a->usingCollisionSphere = false;
} }
}; };
@ -79,11 +78,6 @@ int ParticleSystem::addEmitter() {
void ParticleSystem::simulate(float deltaTime) { void ParticleSystem::simulate(float deltaTime) {
// update emitters
for (unsigned int e = 0; e < _numEmitters; e++) {
updateEmitter(e, deltaTime);
}
// update particles // update particles
for (unsigned int p = 0; p < _numParticles; p++) { for (unsigned int p = 0; p < _numParticles; p++) {
if (_particle[p].alive) { if (_particle[p].alive) {
@ -96,23 +90,14 @@ void ParticleSystem::simulate(float deltaTime) {
} }
} }
void ParticleSystem::emitParticlesNow(int e, int num, glm::vec3 velocity, float lifespan) {
void ParticleSystem::updateEmitter(int e, float deltaTime) {
_emitter[e].front = _emitter[e].rotation * IDENTITY_FRONT;
_emitter[e].right = _emitter[e].rotation * IDENTITY_RIGHT;
_emitter[e].up = _emitter[e].rotation * IDENTITY_UP;
}
void ParticleSystem::emitParticlesNow(int e, int num, float radius, glm::vec4 color, glm::vec3 velocity, float lifespan) {
for (unsigned int p = 0; p < num; p++) { for (unsigned int p = 0; p < num; p++) {
createParticle(e, _emitter[e].position, velocity, radius, color, lifespan); createParticle(e, velocity, lifespan);
} }
} }
void ParticleSystem::createParticle(int e, glm::vec3 position, glm::vec3 velocity, float radius, glm::vec4 color, float lifespan) { void ParticleSystem::createParticle(int e, glm::vec3 velocity, float lifespan) {
for (unsigned int p = 0; p < MAX_PARTICLES; p++) { for (unsigned int p = 0; p < MAX_PARTICLES; p++) {
if (!_particle[p].alive) { if (!_particle[p].alive) {
@ -121,12 +106,10 @@ void ParticleSystem::createParticle(int e, glm::vec3 position, glm::vec3 velocit
_particle[p].lifespan = lifespan; _particle[p].lifespan = lifespan;
_particle[p].alive = true; _particle[p].alive = true;
_particle[p].age = 0.0f; _particle[p].age = 0.0f;
_particle[p].position = position;
_particle[p].velocity = velocity; _particle[p].velocity = velocity;
_particle[p].color = color; _particle[p].position = _emitter[e].position;
_particle[p].radius = _emitter[e].particleAttributes[0].radius;
_particle[p].radius = _emitter[e].particleAttributes[0].radius; _particle[p].color = _emitter[e].particleAttributes[0].color;
_particle[p].color = _emitter[e].particleAttributes[0].color;
_numParticles ++; _numParticles ++;
@ -148,23 +131,6 @@ void ParticleSystem::killParticle(int p) {
} }
void ParticleSystem::setOrangeBlueColorPalette() {
for (unsigned int p = 0; p < _numParticles; p++) {
float radian = ((float)p / (float)_numParticles) * PI_TIMES_TWO;
float wave = sinf(radian);
float red = 0.5f + 0.5f * wave;
float green = 0.3f + 0.3f * wave;
float blue = 0.2f - 0.2f * wave;
float alpha = 1.0f;
_particle[p].color = glm::vec4(red, green, blue, alpha);
}
}
void ParticleSystem::setParticleAttributes(int emitterIndex, ParticleAttributes attributes) { void ParticleSystem::setParticleAttributes(int emitterIndex, ParticleAttributes attributes) {
for (int lifeStage = 0; lifeStage < NUM_PARTICLE_LIFE_STAGES; lifeStage ++ ) { for (int lifeStage = 0; lifeStage < NUM_PARTICLE_LIFE_STAGES; lifeStage ++ ) {
@ -201,13 +167,7 @@ void ParticleSystem::updateParticle(int p, float deltaTime) {
int lifeStage = (int)( ageFraction * (NUM_PARTICLE_LIFE_STAGES-1) ); int lifeStage = (int)( ageFraction * (NUM_PARTICLE_LIFE_STAGES-1) );
float lifeStageFraction = ageFraction * ( NUM_PARTICLE_LIFE_STAGES - 1 ) - lifeStage; float lifeStageFraction = ageFraction * ( NUM_PARTICLE_LIFE_STAGES - 1 ) - lifeStage;
/*
if ( p == 0 ) {
printf( "lifespan = %f ageFraction = %f lifeStage = %d lifeStageFraction = %f\n", _particle[p].lifespan, ageFraction, lifeStage, lifeStageFraction );
}
*/
_particle[p].radius _particle[p].radius
= _emitter[_particle[p].emitterIndex].particleAttributes[lifeStage ].radius * (1.0f - lifeStageFraction) = _emitter[_particle[p].emitterIndex].particleAttributes[lifeStage ].radius * (1.0f - lifeStageFraction)
+ _emitter[_particle[p].emitterIndex].particleAttributes[lifeStage+1].radius * lifeStageFraction; + _emitter[_particle[p].emitterIndex].particleAttributes[lifeStage+1].radius * lifeStageFraction;
@ -250,7 +210,11 @@ void ParticleSystem::updateParticle(int p, float deltaTime) {
} }
// apply tornado force // apply tornado force
glm::vec3 tornadoDirection = glm::cross(vectorToHome, myEmitter.up);
glm::vec3 emitterUp = myEmitter.rotation * IDENTITY_UP;
glm::vec3 tornadoDirection = glm::cross(vectorToHome, emitterUp);
_particle[p].velocity += tornadoDirection * myEmitter.particleAttributes[lifeStage].tornadoForce * deltaTime; _particle[p].velocity += tornadoDirection * myEmitter.particleAttributes[lifeStage].tornadoForce * deltaTime;
// apply air friction // apply air friction
@ -294,15 +258,6 @@ void ParticleSystem::updateParticle(int p, float deltaTime) {
_particle[p].age += deltaTime; _particle[p].age += deltaTime;
} }
void ParticleSystem::setCollisionSphere(int e, glm::vec3 position, float radius) {
int lifeStage = 0;
_emitter[e].particleAttributes[lifeStage].usingCollisionSphere = true;
_emitter[e].particleAttributes[lifeStage].collisionSpherePosition = position;
_emitter[e].particleAttributes[lifeStage].collisionSphereRadius = radius;
}
void ParticleSystem::setEmitterBaseParticle(int emitterIndex, bool showing ) { void ParticleSystem::setEmitterBaseParticle(int emitterIndex, bool showing ) {
_emitter[emitterIndex].baseParticle.alive = true; _emitter[emitterIndex].baseParticle.alive = true;
@ -395,10 +350,10 @@ void ParticleSystem::renderParticle(int p) {
void ParticleSystem::renderEmitter(int e, float size) { void ParticleSystem::renderEmitter(int e, float size) {
glm::vec3 r = _emitter[e].right * size; glm::vec3 r = _emitter[e].rotation * IDENTITY_FRONT * size;
glm::vec3 u = _emitter[e].up * size; glm::vec3 u = _emitter[e].rotation * IDENTITY_RIGHT * size;
glm::vec3 f = _emitter[e].front * size; glm::vec3 f = _emitter[e].rotation * IDENTITY_UP * size;
glLineWidth(2.0f); glLineWidth(2.0f);

54
interface/src/ParticleSystem.h
View file

@ -4,7 +4,6 @@
// //
// Created by Jeffrey on July 10, 2013 // Created by Jeffrey on July 10, 2013
// //
//
#ifndef hifi_ParticleSystem_h #ifndef hifi_ParticleSystem_h
#define hifi_ParticleSystem_h #define hifi_ParticleSystem_h
@ -38,57 +37,50 @@ public:
ParticleSystem(); ParticleSystem();
int addEmitter(); // add (create) an emitter and get its unique id int addEmitter(); // add (create new) emitter and get its unique id
void emitParticlesNow(int emitterIndex, int numParticles, float radius, glm::vec4 color, glm::vec3 velocity, float lifespan); void emitParticlesNow(int emitterIndex, int numParticles, glm::vec3 velocity, float lifespan);
void simulate(float deltaTime); void simulate(float deltaTime);
void render(); void render();
void setUpDirection(glm::vec3 upDirection) {_upDirection = upDirection;} // tell particle system which direction is up
void setEmitterBaseParticle(int emitterIndex, bool showing ); void setEmitterBaseParticle(int emitterIndex, bool showing );
void setEmitterBaseParticle(int emitterIndex, bool showing, float radius, glm::vec4 color ); void setEmitterBaseParticle(int emitterIndex, bool showing, float radius, glm::vec4 color );
void setParticleAttributes (int emitterIndex, ParticleAttributes attributes);
void setOrangeBlueColorPalette(); // apply a nice preset color palette to the particles void setParticleAttributes (int emitterIndex, int lifeStage, ParticleAttributes attributes);
void setUpDirection(glm::vec3 upDirection) {_upDirection = upDirection;} // tell particle system which direction is up void setEmitterPosition (int emitterIndex, glm::vec3 position) { _emitter[emitterIndex].position = position; } // set position of emitter
void setParticleAttributes(int emitterIndex, ParticleAttributes attributes); void setEmitterRotation (int emitterIndex, glm::quat rotation) { _emitter[emitterIndex].rotation = rotation; } // set rotation of emitter
void setParticleAttributes(int emitterIndex, int lifeStage, ParticleAttributes attributes); void setShowingEmitter (int emitterIndex, bool showing ) { _emitter[emitterIndex].visible = showing; } // set its visibiity
void setCollisionSphere (int emitterIndex, glm::vec3 position, float radius); // specify a sphere for the particles to collide with
void setEmitterPosition (int emitterIndex, glm::vec3 position) { _emitter[emitterIndex].position = position; } // set position of emitter
void setEmitterRotation (int emitterIndex, glm::quat rotation) { _emitter[emitterIndex].rotation = rotation; } // set rotation of emitter
void setShowingEmitter (int emitterIndex, bool showing ) { _emitter[emitterIndex].visible = showing; } // set its visibiity
private: private:
struct Particle { struct Particle {
bool alive; // is the particle active? bool alive; // is the particle active?
glm::vec3 position; // position glm::vec3 position; // position
glm::vec3 velocity; // velocity glm::vec3 velocity; // velocity
glm::vec4 color; // color (rgba) glm::vec4 color; // color (rgba)
float age; // age in seconds float age; // age in seconds
float radius; // radius float radius; // radius
float lifespan; // how long this particle stays alive (in seconds) float lifespan; // how long this particle stays alive (in seconds)
int emitterIndex; // which emitter created this particle? int emitterIndex; // which emitter created this particle?
}; };
struct Emitter { struct Emitter {
glm::vec3 position; glm::vec3 position;
glm::quat rotation; glm::quat rotation;
glm::vec3 right; // derived from rotation
glm::vec3 up; // derived from rotation
glm::vec3 front; // derived from rotation
bool visible; bool visible;
Particle baseParticle; // a non-physical particle at the emitter position Particle baseParticle; // a non-physical particle at the emitter position
ParticleAttributes particleAttributes[NUM_PARTICLE_LIFE_STAGES]; // the attributes of particles emitted from this emitter ParticleAttributes particleAttributes[NUM_PARTICLE_LIFE_STAGES]; // the attributes of particles emitted from this emitter
}; };
glm::vec3 _upDirection; glm::vec3 _upDirection;
Emitter _emitter[MAX_EMITTERS]; Emitter _emitter[MAX_EMITTERS];
Particle _particle[MAX_PARTICLES]; Particle _particle[MAX_PARTICLES];
int _numParticles; int _numParticles;
int _numEmitters; int _numEmitters;
// private methods // private methods
void updateEmitter(int e, float deltaTime);
void updateParticle(int index, float deltaTime); void updateParticle(int index, float deltaTime);
void createParticle(int e, glm::vec3 position, glm::vec3 velocity, float radius, glm::vec4 color, float lifespan); void createParticle(int e, glm::vec3 velocity, float lifespan);
//void runSpecialEffectsTest(int e, float deltaTime); // for debugging and artistic exploration
void killParticle(int p); void killParticle(int p);
void renderEmitter(int emitterIndex, float size); void renderEmitter(int emitterIndex, float size);
void renderParticle(int p); void renderParticle(int p);