Changeset 4493 in orxonox.OLD for orxonox/trunk/src/lib/particles/particle_system.cc

Timestamp:

Jun 3, 2005, 2:10:47 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: inheritSpeed now property of particle_emitter. system not friend emitter anymore

File:

• orxonox/trunk/src/lib/particles/particle_system.cc (modified) (4 diffs)

orxonox/trunk/src/lib/particles/particle_system.cc

@@ -42 +42 @@
   this->setClassID(CL_PARTICLE_SYSTEM, "ParticleSystem");
   this->material = NULL;
-  this->name = NULL;
   this->maxCount = maxCount;
   this->count = 0;
@@ -49 +48 @@
   this->setConserve(1);
   this->setLifeSpan(1);
-  this->setInheritSpeed(0);
   this->glID = NULL;
   this->setType(type, 1);
@@ -123 +121 @@
 {
   this->material = material;
-}
-
-/**
-   \brief how much of the speed from the ParticleEmitter should flow onto the ParticleSystem
-   \param value a Value between zero and one
-
-   if you want to change the value of this variable during emission time (to make it more dynamic)
-   you may want to use the animation class
-*/
-void ParticleSystem::setInheritSpeed(float value)
-{
-  if (unlikely(value > 1.0))
-    this->inheritSpeed = 1;
-  else if (unlikely(value < 0.0))
-    this->inheritSpeed = 0;
-  else
-    this->inheritSpeed = value;
 }
 
@@ -453 +434 @@
 void ParticleSystem::debug(void)
 {
-  PRINT(0)("  ParticleSystem %s\n", this->name);
+  PRINT(0)("  ParticleSystem %s\n", this->getName());
   PRINT(0)("  ParticleCount: %d, maximumCount: %d :: filled %d%%\n", this->count, this->maxCount, 100*this->count/this->maxCount);
   if (deadList)