Changeset 4726 in orxonox.OLD for orxonox

Timestamp:

Jun 28, 2005, 10:33:14 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: more loading procedures, fixed small bugs in loadparam

Location:

orxonox/trunk/src

Files:

• lib/particles/particle_emitter.cc (modified) (5 diffs)
• lib/particles/particle_emitter.h (modified) (3 diffs)
• lib/particles/particle_engine.cc (modified) (3 diffs)
• lib/particles/particle_engine.h (modified) (3 diffs)
• lib/particles/particle_system.cc (modified) (6 diffs)
• story_entities/world.cc (modified) (5 diffs)
• subprojects/particles/particle_fun.cc (modified) (1 diff)
• util/loading/load_param.h (modified) (1 diff)

orxonox/trunk/src/lib/particles/particle_emitter.cc

@@ -30 +30 @@
 CREATE_FACTORY(ParticleEmitter);
 
-
 /**
    \brief standard constructor
@@ -37 +36 @@
                   float velocity)
 {
-  this->setClassID(CL_PARTICLE_EMITTER, "ParticleEmitter");
-  this->type = EMITTER_DOT;
-  this->emitterSize = 1.0;
+  this->init();
+
   this->direction = direction;
-  this->setInheritSpeed(0);
   this->setSpread(angle);
   this->setEmissionRate(emissionRate);
@@ -55 +52 @@
 ParticleEmitter::ParticleEmitter(const TiXmlElement* root)
 {
-   this->setClassID(CL_PARTICLE_EMITTER, "ParticleEmitter");
-
-   this->saveTime = 0.0;
+  this->init();
 
    if (root)
@@ -76 +71 @@
 
 /**
+  \brief initializes default values of a ParitcleEmitter
+*/
+void ParticleEmitter::init()
+{
+  this->setClassID(CL_PARTICLE_EMITTER, "ParticleEmitter");
+
+  this->type = PARTICLE_EMITTER_DEFAULT_TYPE;
+  this->emitterSize = PARTICLE_EMITTER_DEFAULT_SIZE;
+  this->setInheritSpeed(PARTICLE_EMITTER_DEFAULT_INHERIT_SPEED);
+  this->setEmissionRate(PARTICLE_EMITTER_DEFAULT_EMISSION_RATE);
+  this->setSize(PARTICLE_EMITTER_DEFAULT_SIZE);
+
+  this->saveTime = 0.0;
+}
+
+/**
    \brief loads a ParticleEmitter from a XML-element
    \param root the XML-element to load from
@@ -103 +114 @@
   LoadParam<ParticleEmitter>(root, "spread", this, &ParticleEmitter::setSpread)
     .describe("The angle the particles are emitted from (angle, deviation)");
+
+
+  LoadParam<ParticleEmitter>(root, "emission-direction", this, &ParticleEmitter::setDirection);
 }
 

orxonox/trunk/src/lib/particles/particle_emitter.h

@@ -12 +12 @@
 class ParticleSystem;
 class TiXmlElement;
+
+// Default values
+#define PARTICLE_EMITTER_DEFAULT_SIZE              1.0
+#define PARTICLE_EMITTER_DEFAULT_EMISSION_RATE     50
+#define PARTICLE_EMITTER_DEFAULT_TYPE              EMITTER_DOT
+#define PARTICLE_EMITTER_DEFAULT_INHERIT_SPEED     0.0
+#define PARTICLE_EMITTER_DEFAULT_SPREAD            M_PI
 
 //! The form of the Emitter to emit from
@@ -31 +38 @@
   virtual ~ParticleEmitter(void);
 
+  void init();
   void loadParams(const TiXmlElement* root);
 
@@ -47 +55 @@
   void setEmissionVelocity(float velocity, float randomVelocity = 0.0);
   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
 
   /** \returns the type of the emitter */

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

@@ -24 +24 @@
 #include "debug.h"
 #include "stdlibincl.h"
+#include "load_param.h"
 
 using namespace std;
@@ -82 +83 @@
 
 /**
+  \brief loads the ParticleEngines settings and connections between particles and emitters
+  \param root the XML-element to load this from.
+ */
+void ParticleEngine::loadParams(const TiXmlElement* root)
+{
+  const TiXmlElement* element = root->FirstChildElement();
+  while( element != NULL)
+  {
+    LoadParam<ParticleEngine>(element, "connect", this, &ParticleEngine::addConnection, true)
+        .describe("connects an Emitter to a System (emitterName, systemName)");
+    element = element->NextSiblingElement();
+  }
+}
+
+
+
+/**
    \brief Adds a System to the System list.
 
@@ -99 +117 @@
 {
   this->emitterList->add(emitter);
+}
+
+/**
+  \brief Connects a ParticleSystem to a ParticleSystem thus emitting Particles.
+  \param emitter the Emitter to connect to the System
+  \param system the System to connect to the Emitter
+*/
+void ParticleEngine::addConnection(const char* emitter, const char* system)
+{
+  ParticleEmitter* tmpEmit = this->getEmitterByName(emitter);
+  ParticleSystem* tmpSys = this->getSystemByName(system);
+
+  if (tmpEmit != NULL && tmpSys != NULL)
+    this->addConnection(tmpEmit, tmpSys);
+  else
+  {
+    if (tmpEmit == NULL)
+      PRINTF(2)("Emitter %s not found in the List of emitters, not connecting to %s\n", emitter, system);
+    if (tmpEmit == NULL)
+      PRINTF(2)("System %s not found in the List of emitters, not connecting to %s\n", system, emitter);
+  }
 }
 

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

@@ -8 +8 @@
 
 #include "base_object.h"
+
 #include "particle_system.h"
 #include "particle_emitter.h"
+
+#include "tinyxml.h"
 
 // FORWARD DEFINITION
@@ -34 +37 @@
   inline static ParticleEngine* getInstance(void) { if (!singletonRef) singletonRef = new ParticleEngine();  return singletonRef; };
 
+  void loadParams(const TiXmlElement* root);
+
   void tick(float dt);
   void draw(void) const;
@@ -40 +45 @@
   void addEmitter(ParticleEmitter* emitter);
   void addConnection(ParticleEmitter* emitter, ParticleSystem* system);
+  void addConnection(const char* emitter, const char* system);
+
 
   bool removeSystem(ParticleSystem* system);

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

@@ -127 +127 @@
 
   LoadParam<ParticleSystem>(root, "type", this, &ParticleSystem::setType)
-      .describe("sets the type of the Particles, (DOT, SPARK, SPRITE or MODEL)");
-
-  LoadParam<ParticleSystem>(root, "model", this, &ParticleSystem::setModel)
-      .describe("sets a model to be loaded on top of this System (also sets type to Model)");
+      .describe("sets the type of the Particles, (dot, spark, sprite or model)");
 
   // PER-PARTICLE-ATTRIBUTES:
@@ -149 +146 @@
 void ParticleSystem::setType(const char* particleType)
 {
-  if (strcmp(particleType, "DOTS"))
+  if (!strcmp(particleType, "dot"))
     this->setType(PARTICLE_DOT);
-  else if (strcmp(particleType, "SPARKS"))
+  else if(!strcmp(particleType, "spark"))
     this->setType(PARTICLE_SPARK);
-  else if (strcmp(particleType, "MODELS"))
+  else if(!strcmp(particleType, "model"))
     this->setType(PARTICLE_MODEL);
   else // if (strcmp(particleType, "SPRITE"))
@@ -187 +184 @@
       //  material->setTransparency(.5);
         break;
-      case PARTICLE_MODEL:
-        if (!this->model)
-        {
-          PRINTF(2)("Model not loaded yet, please do this through ParticleSystem::loadModel()");
-          this->setType(PARTICLE_SPRITE);
-        }
-        break;
-    }
+  }
 }
 
@@ -207 +197 @@
 {
   this->material = material;
-}
-
-/**
- * sets a Model to the Particles
- * @param modelName the Name of the Model to load
- */
-void ParticleSystem::setModel(const char* modelName)
-{
-  if (this->model)
-    ResourceManager::getInstance()->unload(this->model);
-  if (modelName)
-  {
-    this->model = (Model*)ResourceManager::getInstance()->load(modelName, OBJ, RP_LEVEL);
-    this->setType(PARTICLE_MODEL);
-  }
-  else
-  {
-    this->model = NULL;
-    this->setType(PARTICLE_SPRITE);
-  }
 }
 
@@ -505 +475 @@
           drawPart = drawPart->next;
         }
+        else
+          printf("no model loaded onto ParticleSystem-%s\n", this->getName());
       }
       break;
@@ -595 +567 @@
 void ParticleSystem::debug(void) const
 {
-  PRINT(0)("  ParticleSystem %s\n", this->getName());
+  PRINT(0)("  ParticleSystem %s, type: ", this->getName());
+  {
+      if (this->particleType == PARTICLE_MODEL)
+        PRINT(0)("model");
+      else if (this->particleType == PARTICLE_SPRITE)
+        PRINT(0)("sprite");
+      else if (this->particleType == PARTICLE_DOT)
+        PRINT(0)("dot");
+      else if (this->particleType == PARTICLE_SPARK)
+        PRINT(0)("spark");
+
+      PRINT(0)("\n");
+  }
+
   PRINT(0)("  ParticleCount: %d, maximumCount: %d :: filled %d%%\n", this->count, this->maxCount, 100*this->count/this->maxCount);
   if (deadList)

orxonox/trunk/src/story_entities/world.cc

@@ -39 +39 @@
 #include "light.h"
 #include "text_engine.h"
+#include "load_param.h"
 
 #include "track_manager.h"
@@ -173 +174 @@
 {
   PRINTF(3)("World::~World() - deleting current world\n");
+
+  ParticleEngine::getInstance()->debug();
 
   this->eventHandler->unsubscribe(this->localPlayer);
@@ -376 +379 @@
     }
   this->glmis->draw();
-  // find WorldEntities
+
+  ////////////////////////
+  // find WorldEntities //
+  ////////////////////////
+
   element = root->FirstChildElement("WorldEntities");
 
@@ -403 +410 @@
     }
 
+    //////////////////////////////
+    // LOADING ADDITIONAL STUFF //
+    //////////////////////////////
+
+    LoadParam<ParticleEngine>(root, "ParticleEngine", ParticleEngine::getInstance(), &ParticleEngine::loadParams);
+
   // find Track
   element = root->FirstChildElement( "Track");
@@ -503 +516 @@
 
 
-  ParticleSystem* vulcanSysStone = new ParticleSystem(1000, PARTICLE_SPRITE);
-  vulcanSysStone->setModel("models/vulcanic_stone.obj");
-  vulcanSysStone->setLifeSpan(6);
-  vulcanSysStone->setRadius(0.0, 5.0, 3.0);
-  vulcanSysStone->setMass (0.0, .1);
-
-  ParticleEmitter* vulcanEmitStone = new ParticleEmitter(Vector(0,1,0), .5, 10, 200);
-  vulcanEmitStone->setEmissionVelocity(700, 400);
-  vulcanEmitStone->setType(EMITTER_CUBE);
-  vulcanEmitStone->setSize(40);
-  vulcanEmitStone->setRelCoor(2460,105, 606);
-
-  ParticleEngine::getInstance()->addConnection(vulcanEmitStone, vulcanSysStone);
-  new PhysicsConnection(vulcanSysStone, gravity);
+//   ParticleSystem* vulcanSysStone = new ParticleSystem(1000, PARTICLE_MODEL);
+//   vulcanSysStone->setLifeSpan(6);
+//   vulcanSysStone->setRadius(0.0, 5.0, 3.0);
+//   vulcanSysStone->setMass (0.0, .1);
+//   vulcanSysStone->loadModel("models/vulcanic_stones.obj");
+//
+//   ParticleEmitter* vulcanEmitStone = new ParticleEmitter(Vector(0,1,0), .5, 10, 200);
+//   vulcanEmitStone->setEmissionVelocity(700, 400);
+//   vulcanEmitStone->setType(EMITTER_CUBE);
+//   vulcanEmitStone->setSize(40);
+//   vulcanEmitStone->setRelCoor(2460,105, 606);
+
+//   ParticleEngine::getInstance()->addConnection(vulcanEmitStone, vulcanSysStone);
+//   new PhysicsConnection(vulcanSysStone, gravity);
 
   // SYSTEM OF THE VULCANO

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

@@ -235 +235 @@
           char* modelName = new char[strlen(PINIT_MODEL_DIRECTORY) + strlen(value)+1];
           sprintf(modelName, "%s%s", PINIT_MODEL_DIRECTORY, value);
-          tmpSys->setModel(modelName);
+          tmpSys->loadModel(modelName);
           delete modelName;
         }

orxonox/trunk/src/util/loading/load_param.h

@@ -346 +346 @@
   LoadParam5(l_FLOAT, l_FLOAT, l_FLOAT, l_FLOAT, l_FLOAT);
 
-
+  // loads a Ti-XML-element
   LoadParam(const TiXmlElement* root, const char* paramName, T* pt2Object, void(T::*function)(const TiXmlElement*), bool multi = false)
   : BaseLoadParam(root, pt2Object, paramName, 1, multi, NULL, "XML")