Changeset 4602 in orxonox.OLD for orxonox

Timestamp:

Jun 11, 2005, 6:09:21 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: load-params in particle-system (not finished yet)

Location:

orxonox/trunk

Files:

• ChangeLog (modified) (1 diff)
• src/lib/particles/particle_system.cc (modified) (3 diffs)
• src/lib/particles/particle_system.h (modified) (2 diffs)

orxonox/trunk/ChangeLog

@@ +1 @@
+2005-06-10      Banjamin Grauer <bensch@orxonox.ethz.ch>
+        Established a try on class-derivation and isA function.
+
 2005-06-09      orxonox <info@orxonox.ethz.ch>
         created new Tag 0.3.0-pre-alpha

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

@@ -27 +27 @@
 #include "state.h"
 
-
-// needed to find the Position of the Camera
-#include "world.h"
+#include "tinyxml.h"
 
 using namespace std;
@@ -40 +38 @@
 ParticleSystem::ParticleSystem (unsigned int maxCount, PARTICLE_TYPE type) : PhysicsInterface(this)
 {
-  this->setClassID(CL_PARTICLE_SYSTEM, "ParticleSystem");
-
-  this->material = NULL;
+  this->init();
+
   this->maxCount = maxCount;
-  this->count = 0;
-  this->particles = NULL;
-  this->deadList = NULL;
-  this->setConserve(1);
-  this->setLifeSpan(1);
-  this->glID = NULL;
   this->setType(type, 1);
-  ParticleEngine::getInstance()->addSystem(this);
-}
-
+}
+
+ParticleSystem::ParticleSystem(const TiXmlElement* root) : PhysicsInterface(this)
+{
+  this->init();
+  this->loadParams(root);
+}
 
 /**
@@ -81 +76 @@
    if (this->material)
      delete this->material;
+}
+
+/**
+  \brief initializes the ParticleSystem with default values
+*/
+void ParticleSystem::init(void)
+{
+  this->setClassID(CL_PARTICLE_SYSTEM, "ParticleSystem");
+
+  this->material = NULL;
+  this->maxCount = PARTICLE_DEFAULT_MAX_COUNT;
+  this->count = 0;
+  this->particles = NULL;
+  this->deadList = NULL;
+  this->setConserve(1);
+  this->setLifeSpan(1);
+  this->glID = NULL;
+  this->setType(PARTICLE_DEFAULT_TYPE, 1);
+  ParticleEngine::getInstance()->addSystem(this);
+}
+
+
+/**
+ * loads Parameters from a TiXmlElement
+ * @param root the XML-element to load from.
+ */
+void ParticleSystem::loadParams(const TiXmlElement* root)
+{
+  static_cast<WorldEntity*>(this)->loadParams(root);
+  static_cast<PhysicsInterface*>(this)->loadParams(root);
+
+  //LoadParam<ParticleSystem>(root, "type", this, &ParticleSystem::setType);
+  LoadParam<ParticleSystem>(root, "life-span", this, &ParticleSystem::setLifeSpan);
+  LoadParam<ParticleSystem>(root, "conserve", this, &ParticleSystem::setConserve);
+//   void setLifeSpan(float lifeSpan, float randomLifeSpan = 0.0);
+//   void setConserve(float conserve);
+//
+//   /* Per-Particle-Attributes */
+//   void setRadius(float lifeCycleTime, float radius, float randRadius = 0.0);
+//   void setMass(float lifeCycleTime, float mass, float randMass = 0.0);
+//   void setColor(float lifeCycleTime, GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
+
 }
 

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

@@ -14 +14 @@
 
 #include "quick_animation.h"
+
+// Forward Declaration
+class TiXmlElement;
 
 #define PARTICLE_DOT_MASK              0x000001     //!< A Mask if the Particles should be displayed as DOTs
@@ -66 +69 @@
   ParticleSystem(unsigned int maxCount = PARTICLE_DEFAULT_MAX_COUNT,
                  PARTICLE_TYPE type = PARTICLE_DEFAULT_TYPE);
+  ParticleSystem(const TiXmlElement* root);
   virtual ~ParticleSystem();
+
+  void init(void);
+  void loadParams(const TiXmlElement* root);
 
   void setType(PARTICLE_TYPE particleType, int count = 0);