Changeset 4349 in orxonox.OLD

Timestamp:

May 28, 2005, 12:10:30 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: ParticleEngine now has a draw-function, that makes sense

Location:

orxonox/trunk/src

Files:

• lib/graphics/particles/particle_engine.cc (modified) (2 diffs)
• lib/graphics/particles/particle_engine.h (modified) (1 diff)
• lib/graphics/particles/particle_system.cc (modified) (1 diff)
• lib/graphics/particles/particle_system.h (modified) (1 diff)
• story_entities/world.cc (modified) (1 diff)
• subprojects/framework.cc (modified) (1 diff)
• subprojects/framework.h (modified) (1 diff)
• subprojects/importer/importer.cc (modified) (1 diff)
• subprojects/particles/particle_fun.cc (modified) (1 diff)

orxonox/trunk/src/lib/graphics/particles/particle_engine.cc

@@ -253 +253 @@
    \param dt the time passed in seconds (since the last Frame)
 */
-void ParticleEngine::draw(float dt)
+void ParticleEngine::draw() const
 {
   tIterator<ParticleSystem>* tmpIt = systemList->getIterator();
@@ -259 +259 @@
   while(tmpSys)
     {
-      tmpSys->draw(dt);
+      tmpSys->draw();
       tmpSys = tmpIt->nextElement();
     }

orxonox/trunk/src/lib/graphics/particles/particle_engine.h

@@ -28 +28 @@
 
   void tick(float dt);
-  void draw(float dt);
+  void draw(void) const;
 
   void addSystem(ParticleSystem* system);

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

@@ -309 +309 @@
    This is just the fastest Way to do this, but will most likely be changed in the future.
 */
-void ParticleSystem::draw(float dt)
+void ParticleSystem::draw(void) const
 {
   glPushAttrib(GL_ENABLE_BIT);

orxonox/trunk/src/lib/graphics/particles/particle_system.h

@@ -98 +98 @@
 
   void tick(float dt);
-  void draw(float dt);
+  void draw(void) const;
 
   void debug(void);

orxonox/trunk/src/story_entities/world.cc

@@ -816 +816 @@
 
   TextEngine::getInstance()->draw();
-  particleEngine->draw(this->dtS); //!< \todo should be dts like in the Trunk;
+  particleEngine->draw(); //!< \todo should be dts like in the Trunk;
 
   lightMan->draw(); // must be at the end of the drawing procedure, otherwise Light cannot be handled as PNodes //

orxonox/trunk/src/subprojects/framework.cc

@@ -57 +57 @@
   glLoadIdentity(); // Reset the view
   
-  this->moduleDraw(dt);
+  this->moduleDraw();
   
   camera->apply();

orxonox/trunk/src/subprojects/framework.h

@@ -45 +45 @@
   void moduleEventHandler(SDL_Event* event);
   void moduleTick(float dt);
-  void moduleDraw(float dt);
+  void moduleDraw(void) const;
   
   void moduleHelp(void) const;

orxonox/trunk/src/subprojects/importer/importer.cc

@@ -68 +68 @@
 }
 
-void Framework::moduleDraw(float dt)
+void Framework::moduleDraw(void) const
 {
   obj->draw();

orxonox/trunk/src/subprojects/particles/particle_fun.cc

@@ -60 +60 @@
 }
 
-void Framework::moduleDraw(float dt)
-{
-  ParticleEngine::getInstance()->draw(dt);
+void Framework::moduleDraw() const
+{
+  ParticleEngine::getInstance()->draw();
 }