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

cleanup

Browse source
This commit is contained in:
Jeffrey Ventrella 2013-07-31 12:38:40 -07:00
parent 2901b58059
commit 89f36a7eb7
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
interface/src/Application.cpp
View file

@ -3679,8 +3679,8 @@ void Application::updateParticleSystem(float deltaTime) {
// update the particle system // update the particle system
static bool emitting = true; static bool emitting = true;
static float t = 0.0f; static float effectsTimer = 0.0f;
t += deltaTime; effectsTimer += deltaTime;
if (_coolDemoParticleEmitter != -1) { if (_coolDemoParticleEmitter != -1) {
@ -3690,13 +3690,13 @@ void Application::updateParticleSystem(float deltaTime) {
attributes.radius = 0.01f; attributes.radius = 0.01f;
attributes.color = glm::vec4( 1.0f, 1.0f, 1.0f, 1.0f); 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( effectsTimer * 0.52f );
attributes.airFriction = 2.5 + 2.0f * sinf( t * 0.32f ); attributes.airFriction = 2.5 + 2.0f * sinf( effectsTimer * 0.32f );
attributes.jitter = 0.05f + 0.05f * sinf( t * 0.42f ); attributes.jitter = 0.05f + 0.05f * sinf( effectsTimer * 0.42f );
attributes.emitterAttraction = 0.015f + 0.015f * cosf( t * 0.6f ); attributes.emitterAttraction = 0.015f + 0.015f * cosf( effectsTimer * 0.6f );
attributes.tornadoForce = 0.0f + 0.03f * sinf( t * 0.7f ); attributes.tornadoForce = 0.0f + 0.03f * sinf( effectsTimer * 0.7f );
attributes.neighborAttraction = 0.1f + 0.1f * cosf( t * 0.8f ); attributes.neighborAttraction = 0.1f + 0.1f * cosf( effectsTimer * 0.8f );
attributes.neighborRepulsion = 0.2f + 0.2f * sinf( t * 0.4f ); attributes.neighborRepulsion = 0.2f + 0.2f * sinf( effectsTimer * 0.4f );
attributes.bounce = 1.0f; attributes.bounce = 1.0f;
attributes.usingCollisionSphere = true; attributes.usingCollisionSphere = true;
attributes.collisionSpherePosition = glm::vec3( 5.0f, 0.5f, 5.0f ); attributes.collisionSpherePosition = glm::vec3( 5.0f, 0.5f, 5.0f );
@ -3715,9 +3715,11 @@ void Application::updateParticleSystem(float deltaTime) {
_particleSystem.setUpDirection(glm::vec3(0.0f, 1.0f, 0.0f)); _particleSystem.setUpDirection(glm::vec3(0.0f, 1.0f, 0.0f));
_particleSystem.simulate(deltaTime); _particleSystem.simulate(deltaTime);
const float EMIT_RATE_IN_SECONDS = 0.0;
if (_coolDemoParticleEmitter != -1) { if (_coolDemoParticleEmitter != -1) {
if (emitting) { if (emitting) {
_particleSystem.setEmitterRate(_coolDemoParticleEmitter, 0.0); // stop emitter _particleSystem.setEmitterRate(_coolDemoParticleEmitter, EMIT_RATE_IN_SECONDS); // stop emitter
emitting = false; emitting = false;
} }
} }