Changeset 6630 in orxonox.OLD for trunk/src

Timestamp:

Jan 20, 2006, 9:33:36 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: precache works, and the particle-systems get Linked.. (HACK)

Location:

trunk/src

Files:

• Makefile.am (modified) (2 diffs)
• lib/particles/particle_system.cc (modified) (2 diffs)

trunk/src/Makefile.am

@@ -10 +10 @@
 
 orxonox_CPPFLAGS = -DIS_ORXONOX
+orxonox_LDFLAGS = -u global_ModelParticles_Factory
 
 orxonox_DEPENDENCIES = \
@@ -55 +56 @@
                 $(StoryEntities_SOURCES_) \
                 orxonox.cc \
+                \
+                lib/particles/model_particles.cc \
+                lib/particles/spark_particles.cc \
+                lib/particles/sprite_particles.cc \
+                \
                 subprojects/benchmark.cc
 

trunk/src/lib/particles/particle_system.cc

@@ -260 +260 @@
 void ParticleSystem::precache(unsigned int seconds, unsigned int ticksPerSecond)
 {
+
+  std::list<ParticleEmitter*>::iterator emitter;
+  for (emitter = this->emitters.begin(); emitter != this->emitters.end(); emitter++)
+    (*emitter)->updateNode(.1), (*emitter)->updateNode(.1);
+
   PRINTF(4)("Precaching %s::%s %d seconds %d timesPerSecond\n", this->getClassName(), this->getName(), seconds, ticksPerSecond);
   this->debug();
@@ -275 +280 @@
 void ParticleSystem::tick(float dt)
 {
+  printf("TICKED %f %d\n", dt, this->count);
   Particle* tickPart = particles;  // the particle to Tick
   Particle* prevPart = NULL;