Changeset 6619 in orxonox.OLD for trunk/src/story_entities

Timestamp:

Jan 19, 2006, 6:23:56 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: rendering without the ParticleEngine, so now we are FAST

Location:

trunk/src/story_entities

Files:

• game_world.cc (modified) (3 diffs)
• game_world_data.cc (modified) (4 diffs)

trunk/src/story_entities/game_world.cc

@@ -47 +47 @@
 #include "shell_command.h"
 
-#include "particle_engine.h"
 #include "graphics_engine.h"
 #include "event_handler.h"
@@ -339 +338 @@
     this->dataTank->localCamera->tick(this->dtS);
     AnimationPlayer::getInstance()->tick(this->dtS);
-    ParticleEngine::getInstance()->tick(this->dtS);
     PhysicsEngine::getInstance()->tick(this->dtS);
 
@@ -414 +412 @@
   engine->draw(State::getObjectManager()->getObjectList(OM_GROUP_01));
   engine->draw(State::getObjectManager()->getObjectList(OM_GROUP_01_PROJ));
-  /* draws the particles */
-  ParticleEngine::getInstance()->draw();
 
   if( unlikely( this->showBV))

trunk/src/story_entities/game_world_data.cc

@@ -44 +44 @@
 #include "load_param.h"
 
-#include "particle_engine.h"
 #include "graphics_engine.h"
 #include "event_handler.h"
@@ -115 +114 @@
   /* initialize some graphics engines and graphical elements */
   AnimationPlayer::getInstance();
-  ParticleEngine::getInstance();
   PhysicsEngine::getInstance();
 }
@@ -279 +277 @@
   LoadParamXML(root, "LightManager", LightManager::getInstance(), LightManager, loadParams);
 
-  LoadParamXML(root, "ParticleEngine", ParticleEngine::getInstance(), ParticleEngine, loadParams);
+//  LoadParamXML(root, "ParticleEngine", ParticleEngine::getInstance(), ParticleEngine, loadParams);
   //LoadParamXML(root, "PhysicsEngine", PhysicsEngine::getInstance(), PhysicsEngine, loadParams);
 
@@ -301 +299 @@
   /* delete some garphics and scene eingines */
   delete LightManager::getInstance();
-  delete ParticleEngine::getInstance();
   delete AnimationPlayer::getInstance();
   delete PhysicsEngine::getInstance();