Showing the changes to interface/src/ParticleSystem.cpp (1 of 1 file). Show all
Unified · Split
| @@ -28,7 +28,6 @@ ParticleSystem::ParticleSystem() { · 27 unmodified lines | |||
| 28 | for (unsigned int emitterIndex = 0; emitterIndex < MAX_EMITTERS; emitterIndex++) { | 28 | for (unsigned int emitterIndex = 0; emitterIndex < MAX_EMITTERS; emitterIndex++) { |
| 29 | 29 | ||
| 30 | Emitter * e = &_emitter[emitterIndex]; | 30 | Emitter * e = &_emitter[emitterIndex]; |
| 31 | |||
| 32 | e->position = glm::vec3(0.0f, 0.0f, 0.0f); | 31 | e->position = glm::vec3(0.0f, 0.0f, 0.0f); |
| 33 | e->direction = glm::vec3(0.0f, 1.0f, 0.0f); | 32 | e->direction = glm::vec3(0.0f, 1.0f, 0.0f); |
| 34 | e->visible = false; | 33 | e->visible = false; |
| @@ -42,31 +41,7 @@ ParticleSystem::ParticleSystem() { · 7 unmodified lines | |||
| 42 | e->particleRenderStyle = PARTICLE_RENDER_STYLE_SPHERE; | 41 | e->particleRenderStyle = PARTICLE_RENDER_STYLE_SPHERE; |
| 43 | 42 | ||
| 44 | for (int lifeStage = 0; lifeStage<NUM_PARTICLE_LIFE_STAGES; lifeStage++) { | 43 | for (int lifeStage = 0; lifeStage<NUM_PARTICLE_LIFE_STAGES; lifeStage++) { |
| 45 | 44 | setParticleAttributesToDefault(&_emitter[emitterIndex].particleAttributes[lifeStage]); | |
| 46 | ParticleAttributes * a = &_emitter[emitterIndex].particleAttributes[lifeStage]; | ||
| 47 | |||
| 48 | setParticleAttributesToDefault(a); | ||
| 49 | |||
| 50 | /* | ||
| 51 | a->radius = DEFAULT_PARTICLE_RADIUS; | ||
| 52 | a->color = glm::vec4(0.0f, 0.0f, 0.0f, 0.0f); | ||
| 53 | a->bounce = DEFAULT_PARTICLE_BOUNCE; | ||
| 54 | a->airFriction = DEFAULT_PARTICLE_AIR_FRICTION; | ||
| 55 | a->gravity = 0.0f; | ||
| 56 | a->jitter = 0.0f; | ||
| 57 | a->emitterAttraction = 0.0f; | ||
| 58 | a->tornadoForce = 0.0f; | ||
| 59 | a->neighborAttraction = 0.0f; | ||
| 60 | a->neighborRepulsion = 0.0f; | ||
| 61 | a->collisionSphereRadius = 0.0f; | ||
| 62 | a->collisionSpherePosition = glm::vec3(0.0f, 0.0f, 0.0f); | ||
| 63 | a->usingCollisionSphere = false; | ||
| 64 | a->collisionPlaneNormal = _upDirection; | ||
| 65 | a->collisionPlanePosition = glm::vec3(0.0f, 0.0f, 0.0f); | ||
| 66 | a->usingCollisionPlane = false; | ||
| 67 | a->modulationAmplitude = 0.0f; | ||
| 68 | a->modulationStyle = COLOR_MODULATION_STYLE_NULL; | ||
| 69 | */ | ||
| 70 | } | 45 | } |
| 71 | }; | 46 | }; |
| 72 | 47 | ||