Changeset 6619 in orxonox.OLD

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

Files:

• lib/event/event_handler.cc (modified) (1 diff)
• lib/particles/Makefile.am (modified) (1 diff)
• lib/particles/engine (added)
• lib/particles/engine/particle_engine.cc (moved) (moved from trunk/src/lib/particles/particle_engine.cc)
• lib/particles/engine/particle_engine.h (moved) (moved from trunk/src/lib/particles/particle_engine.h)
• lib/particles/particle_emitter.cc (modified) (6 diffs)
• lib/particles/particle_emitter.h (modified) (5 diffs)
• lib/particles/particle_system.cc (modified) (4 diffs)
• story_entities/game_world.cc (modified) (3 diffs)
• story_entities/game_world_data.cc (modified) (4 diffs)
• world_entities/projectiles/bomb.cc (modified) (1 diff)
• world_entities/projectiles/guided_missile.cc (modified) (4 diffs)
• world_entities/projectiles/laser.cc (modified) (3 diffs)
• world_entities/projectiles/rocket.cc (modified) (4 diffs)
• world_entities/projectiles/test_bullet.cc (modified) (4 diffs)

trunk/src/lib/event/event_handler.cc

@@ -262 +262 @@
     SDL_WM_GrabInput(SDL_GRAB_OFF);
   else
-    ;//SDL_WM_GrabInput(SDL_GRAB_ON);
+    SDL_WM_GrabInput(SDL_GRAB_ON);
 }
 

trunk/src/lib/particles/Makefile.am

@@ -4 +4 @@
 noinst_LIBRARIES = libORXparticles.a
 
-libORXparticles_a_SOURCES = particle_engine.cc \
-                            particle_emitter.cc \
+libORXparticles_a_SOURCES = particle_emitter.cc \
                             particle_system.cc \
                             quick_animation.cc
 
 
-noinst_HEADERS= particle_engine.h \
-                particle_emitter.h \
+noinst_HEADERS= particle_emitter.h \
                 particle_system.h \
                 quick_animation.h

trunk/src/lib/particles/particle_emitter.cc

@@ -19 +19 @@
 
 #include "particle_system.h"
-#include "particle_engine.h"
 
 #include "load_param.h"
@@ -44 +43 @@
   this->setEmissionVelocity(velocity);
 
-  ParticleEngine::getInstance()->addEmitter(this);
 }
 
@@ -57 +55 @@
    if (root != NULL)
      this->loadParams(root);
-
-   ParticleEngine::getInstance()->addEmitter(this);
 }
 
@@ -68 +64 @@
 ParticleEmitter::~ParticleEmitter ()
 {
-  ParticleEngine::getInstance()->removeEmitter(this);
 }
 
@@ -84 +79 @@
   this->setSize(PARTICLE_EMITTER_DEFAULT_SIZE);
 
+  this->system = NULL;
+
   this->saveTime = 0.0;
 }
@@ -118 +115 @@
 
   LoadParam(root, "emission-direction", this, ParticleEmitter, setDirection);
+}
+
+void ParticleEmitter::setSystem(ParticleSystem* system)
+{
+  if (system != NULL)
+    system->addEmitter(this);
+  else if (this->system != NULL)
+    this->system->removeEmitter(this);
+  this->system = system;
 }
 

trunk/src/lib/particles/particle_emitter.h

@@ -21 +21 @@
 
 //! The form of the Emitter to emit from
-  typedef enum EMITTER_TYPE
+typedef enum EMITTER_TYPE
 {
   EMITTER_DOT     = 1,
@@ -30 +30 @@
 
 //! A class to handle an Emitter.
-class ParticleEmitter : public PNode {
-
- public:
+class ParticleEmitter : public PNode
+{
+  friend class ParticleSystem;
+public:
   ParticleEmitter(const Vector& direction, float angle = .5,
                   float emissionRate = 1.0, float velocity = 1.0);
@@ -46 +47 @@
   void tick(float dt, ParticleSystem* system);
 
+  void setSystem(ParticleSystem* system);
+  ParticleSystem* getSystem() const { return this->system; };
+
   /* controlling the behavour: these can be used as Animation interfaces */
   void setType(EMITTER_TYPE type);
@@ -56 +60 @@
   void setEmissionMomentum(float momentum, float randomMomentum = 0.0);
 
-  void setDirection(float x, float y, float z) { this->direction = Vector(x,y,z); }; //!< todo this should be done via PNODE
+  void setDirection(float x, float y, float z) { this->direction = Vector(x,y,z); }
+  ; //!< todo this should be done via PNODE
 
   /** @returns the type of the emitter */
@@ -77 +82 @@
   void debug() const;
 
- private:
+
+private:
+  ParticleSystem* system;            //!< The ParticleSystem this Emitter Emits into.
+
   EMITTER_TYPE    type;              //!< The type of emitter this is.
   float           emitterSize;       //!< The size of the emitter (not for EMITTER_DOT).

trunk/src/lib/particles/particle_system.cc

@@ -19 +19 @@
 
 #include "particle_emitter.h"
-#include "particle_engine.h"
 
 #include "field.h"
@@ -69 +68 @@
 ParticleSystem::~ParticleSystem()
 {
-  // delete what has to be deleted here
-   ParticleEngine::getInstance()->removeSystem(this);
-
    // deleting all the living Particles
    while (this->particles)
@@ -108 +104 @@
   this->glID = NULL;
   this->setType(PARTICLE_DEFAULT_TYPE, 1);
-  ParticleEngine::getInstance()->addSystem(this);
 
   this->toList(OM_ENVIRON);
@@ -297 +292 @@
 void ParticleSystem::addEmitter(ParticleEmitter* emitter)
 {
+  assert (emitter != NULL);
+  if (emitter->getSystem() != NULL)
+    emitter->getSystem()->removeEmitter(emitter);
   this->emitters.push_back(emitter);
 }

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();

trunk/src/world_entities/projectiles/bomb.cc

@@ -25 +25 @@
 #include "object_manager.h"
 
-#include "particle_engine.h"
 #include "particle_emitter.h"
 #include "particle_system.h"

trunk/src/world_entities/projectiles/guided_missile.cc

@@ -23 +23 @@
 #include "class_list.h"
 
-#include "particle_engine.h"
 #include "particle_emitter.h"
 #include "particle_system.h"
@@ -113 +112 @@
   }
 
-  ParticleEngine::getInstance()->addConnection(this->emitter, GuidedMissile::trailParticles);
+  this->emitter->setSystem(GuidedMissile::trailParticles);
 
   this->updateNode(0);
@@ -123 +122 @@
 void GuidedMissile::deactivate()
 {
-  ParticleEngine::getInstance()->breakConnections(this->emitter);
+  this->emitter->setSystem(NULL);
   this->lifeCycle = 0.0;
 
@@ -184 +183 @@
   PRINTF(5)("DESTROY GuidedMissile\n");
   this->lifeCycle = .95; //!< @todo calculate this usefully.
-  ParticleEngine::getInstance()->breakConnection(this->emitter, GuidedMissile::trailParticles);
-  ParticleEngine::getInstance()->addConnection(this->emitter, GuidedMissile::explosionParticles);
+  this->emitter->setSystem(GuidedMissile::explosionParticles);
 
   this->emitter->setEmissionRate(1000.0);

trunk/src/world_entities/projectiles/laser.cc

@@ -24 +24 @@
 #include "model.h"
 
-#include "particle_engine.h"
 #include "particle_emitter.h"
 #include "particle_system.h"
@@ -93 +92 @@
 void Laser::deactivate()
 {
-  ParticleEngine::getInstance()->breakConnections(this->emitter);
+  assert (Laser::explosionParticles != NULL);
+  Laser::explosionParticles->removeEmitter(this->emitter);
   this->lifeCycle = 0.0;
 
@@ -130 +130 @@
   PRINTF(5)("DESTROY Laser\n");
   this->lifeCycle = .95; //!< @todo calculate this usefully.
-  ParticleEngine::getInstance()->addConnection(this->emitter, Laser::explosionParticles);
+
+  this->emitter->setSystem(Laser::explosionParticles);
 }
 

trunk/src/world_entities/projectiles/rocket.cc

@@ -23 +23 @@
 #include "class_list.h"
 
-#include "particle_engine.h"
 #include "particle_emitter.h"
 #include "particle_system.h"
@@ -110 +109 @@
   }
 
-  ParticleEngine::getInstance()->addConnection(this->emitter, Rocket::trailParticles);
+  this->emitter->setSystem(Rocket::trailParticles);
 
   this->updateNode(0);
@@ -120 +119 @@
 void Rocket::deactivate()
 {
-  ParticleEngine::getInstance()->breakConnections(this->emitter);
+  this->emitter->setSystem(NULL);
   this->lifeCycle = 0.0;
   this->toList(OM_NULL);
@@ -158 +157 @@
   PRINTF(5)("DESTROY Rocket\n");
   this->lifeCycle = .95; //!< @todo calculate this usefully.
-  ParticleEngine::getInstance()->breakConnection(this->emitter, Rocket::trailParticles);
-  ParticleEngine::getInstance()->addConnection(this->emitter, Rocket::explosionParticles);
+  this->emitter->setSystem(Rocket::explosionParticles);
 
   this->emitter->setEmissionRate(1000.0);

trunk/src/world_entities/projectiles/test_bullet.cc

@@ -23 +23 @@
 #include "class_list.h"
 
-#include "particle_engine.h"
 #include "particle_emitter.h"
 #include "particle_system.h"
@@ -105 +104 @@
   }
 
-  ParticleEngine::getInstance()->addConnection(this->emitter, TestBullet::trailParticles);
+  this->emitter->setSystem(TestBullet::trailParticles);
 
   this->emitter->setEmissionRate(20.0);
@@ -114 +113 @@
 void TestBullet::deactivate()
 {
-  ParticleEngine::getInstance()->breakConnections(this->emitter);
+  this->emitter->setSystem(NULL);
   this->lifeCycle = 0.0;
   this->toList(OM_NULL);
@@ -157 +156 @@
   PRINTF(5)("DESTROY TestBullet\n");
   this->lifeCycle = .95; //!< @todo calculate this usefully.
-  ParticleEngine::getInstance()->breakConnection(this->emitter, TestBullet::trailParticles);
-  ParticleEngine::getInstance()->addConnection(this->emitter, TestBullet::explosionParticles);
+  this->emitter->setSystem(TestBullet::explosionParticles);
 
   this->emitter->setEmissionRate(30.0);