Changeset 4314 in orxonox.OLD for orxonox/branches

Timestamp:

May 26, 2005, 11:36:24 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/physics: nicer fog trailing our little ship

Location:

orxonox/branches/physics/src

Files:

• lib/graphics/particles/particle_emitter.cc (modified) (2 diffs)
• story_entities/world.cc (modified) (1 diff)
• subprojects/particles/framework.cc (modified) (1 diff)

orxonox/branches/physics/src/lib/graphics/particles/particle_emitter.cc

@@ -82 +82 @@
 void ParticleEmitter::setSize(float emitterSize)
 {
-  this->emitterSize = emitterSize;
+  if (emitterSize > 0.0)
+    this->emitterSize = emitterSize;
+  else
+    emitterSize = 0.0;
 }
 
@@ -94 +97 @@
 void ParticleEmitter::setEmissionRate(float emissionRate)
 {
-  this->emissionRate = emissionRate;
+  if (emissionRate > 0.0)
+    this->emissionRate = emissionRate;
+  else
+    this->emissionRate = 0.0;
 }
 

orxonox/branches/physics/src/story_entities/world.cc

@@ -470 +470 @@
   // Creating a Test Particle Emitter
   ParticleEmitter* emitter = new ParticleEmitter(Vector(-1, 0, 0), M_PI_4, 400, .5);
-  emitter->setType(EMITTER_CUBE);
+  emitter->setType(EMITTER_DOT);
   emitter->setSize(20);
   emitter->setParent(this->localPlayer);

orxonox/branches/physics/src/subprojects/particles/framework.cc

@@ -35 +35 @@
   ParticleSystem* system = new ParticleSystem(100000, PARTICLE_SPRITE);
   system->setLifeSpan(5);
-  system->setConserve(.99);
+  system->setConserve(.999);
   system->setRadius(4, 3, 1, 2);
   system->setColor(.5,0,0,.5, 1,1,0,1, 0,0,0,0);