Changeset 4305 in orxonox.OLD for orxonox/branches/physics

Timestamp:

May 26, 2005, 4:04:18 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/physics: moved the initialisation to the top

Location:

orxonox/branches/physics/src/subprojects/particles

Files:

• framework.cc (modified) (3 diffs)
• framework.h (modified) (1 diff)

orxonox/branches/physics/src/subprojects/particles/framework.cc

@@ -30 +30 @@
 int verbose;
 
+void Framework::initModule()
+{
+  // Creating a Test Particle System
+  ParticleSystem* system = new ParticleSystem(100000, PARTICLE_SPRITE);
+  system->setLifeSpan(5);
+  system->setConserve(.99);
+  system->setRadius(4, 3, 1, 2);
+  system->setColor(.5,0,0,.5, 1,1,0,1, 0,0,0,0);
+
+  // Creating a Test Particle Emitter
+  ParticleEmitter* emitter = new ParticleEmitter(Vector(0 , 1, 0), M_PI_4, 20, .1);
+  emitter->setType(EMITTER_DOT  );
+  emitter->setSize(0);
+  emitter->setRelCoor(Vector(0,0,0));
+  
+  // Add the Flow from the Emitter into the System
+  ParticleEngine::getInstance()->addConnection(emitter, system);
+}
+
 bool Framework::mainLoop()
 {
@@ -79 +98 @@
     // And poll for events
     SDL_Event event;
-    SDL_PollEvent(&event) ;
+    while(SDL_PollEvent(&event))
     {
       switch (event.type) {
@@ -232 +251 @@
   ResourceManager::getInstance()->setDataDir(DATA_DIRECTORY);
  
-  // Creating a Test Particle System
-  ParticleSystem* system = new ParticleSystem(100000, PARTICLE_SPRITE);
-  system->setLifeSpan(5);
-  system->setConserve(.99);
-  system->setRadius(4, 3, 1, 2);
-  system->setColor(.5,0,0,.5, 1,1,0,1, 0,0,0,0);
-
-  // Creating a Test Particle Emitter
-  ParticleEmitter* emitter = new ParticleEmitter(Vector(0 , 1, 0), M_PI_4, 20, .1);
-  emitter->setType(EMITTER_DOT  );
-  emitter->setSize(0);
-  emitter->setRelCoor(Vector(0,0,0));
-  
-  // Add the Flow from the Emitter into the System
-  ParticleEngine::getInstance()->addConnection(emitter, system);
+
+  initModule();
 
   camera = new Camera();
 
-  State::getInstance()->setCamera(camera, emitter);
+  State::getInstance()->setCamera(camera, camera->getTarget());
 
   camera->setAbsCoor(Vector(10, 10, 0));

orxonox/branches/physics/src/subprojects/particles/framework.h

@@ -27 +27 @@
   ~Framework();
   
+  void initModule();
   bool mainLoop();
   bool draw(float dt);