Changeset 4174 in orxonox.OLD for orxonox/branches

Timestamp:

May 13, 2005, 9:10:07 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/particleEngine: material gets deleted

Location:

orxonox/branches/particleEngine/src

Files:

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

orxonox/branches/particleEngine/src/lib/graphics/particles/particle_system.cc

@@ -35 +35 @@
 {
    this->setClassName ("ParticleSystem");
+   this->material = NULL;
    this->name = NULL;
    this->maxCount = maxCount;
@@ -73 +74 @@
        delete tmpDelPart;
      }
+
+   if (this->material)
+     delete this->material;
 }
 

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

@@ -495 +495 @@
   ParticleSystem* system = new ParticleSystem(1000, PARTICLE_SPARK);
   system->setLifeSpan(.5);
+  system->setConserve(.99);
   system->setRadius(2, 0, 2, 0);