Changeset 6823 in orxonox.OLD for trunk/src

Timestamp:

Jan 29, 2006, 2:20:46 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: BoxEmitter

Location:

trunk/src/lib/particles

Files:

• Makefile.am (modified) (2 diffs)
• box_emitter.cc (copied) (copied from trunk/src/lib/particles/dot_emitter.cc) (6 diffs)
• box_emitter.h (copied) (copied from trunk/src/lib/particles/dot_emitter.h) (2 diffs)
• dot_emitter.h (modified) (2 diffs)
• particle_system.cc (modified) (1 diff)

trunk/src/lib/particles/Makefile.am

@@ -7 +7 @@
                         particle_emitter.cc \
                         dot_emitter.cc \
+                        box_emitter.cc \
                         \
                         particle_system.cc \
@@ -20 +21 @@
                         particle_emitter.h \
                         dot_emitter.h \
+                        box_emitter.h \
                         \
                         particle_system.h \

trunk/src/lib/particles/box_emitter.cc

@@ -16 +16 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_GRAPHICS
 
-#include "dot_emitter.h"
+#include "box_emitter.h"
 
 #include "particle_system.h"
@@ -28 +28 @@
 
 
-CREATE_FACTORY(DotEmitter, CL_DOT_EMITTER);
+CREATE_FACTORY(BoxEmitter, CL_BOX_EMITTER);
 
 /**
  *  standard constructor
 */
-DotEmitter::DotEmitter(const Vector& direction, float angle, float emissionRate,
-                       float velocity)
-  : ParticleEmitter(direction, angle, emissionRate, velocity)
+BoxEmitter::BoxEmitter(const Vector& size)
 {
   this->init();
+  this->setSize(size);
 }
 
 /**
- *  constructs and loads a DotEmitter from a XML-element
+ *  constructs and loads a BoxEmitter from a XML-element
  * @param root the XML-element to load from
 */
-DotEmitter::DotEmitter(const TiXmlElement* root)
-  : ParticleEmitter()
+BoxEmitter::BoxEmitter(const TiXmlElement* root)
+    : ParticleEmitter()
 {
   this->init();
 
-   if (root != NULL)
-     this->loadParams(root);
+  if (root != NULL)
+    this->loadParams(root);
 }
 
@@ -58 +57 @@
    removes the EmitterSystem from the ParticleEngine
 */
-DotEmitter::~DotEmitter ()
+BoxEmitter::~BoxEmitter ()
 {
   this->setSystem(NULL);
@@ -66 +65 @@
   @brief initializes default values of a ParitcleEmitter
 */
-void DotEmitter::init()
+void BoxEmitter::init()
 {
-  this->setClassID(CL_DOT_EMITTER, "DotEmitter");
+  this->setClassID(CL_BOX_EMITTER, "BoxEmitter");
+  this->setSize(1.0f,1.0f,1.0f);
 }
 
-void DotEmitter::emitParticles(unsigned int count) const
+void BoxEmitter::loadParams(const TiXmlElement* root)
+{
+  ParticleEmitter::loadParams(root);
+
+  LoadParam(root, "size", this, BoxEmitter, setSize)
+  .describe("The Size of the BoxEmitter: x, y, z")
+  .defaultValues(3, 1.0f,1.0f,1.0f);
+}
+
+void BoxEmitter::emitParticles(unsigned int count) const
 {
   Vector inheritVelocity = this->getVelocity() * this->inheritSpeed;
@@ -82 +91 @@
     Vector velocityV = randDir.getNormalized()*this->velocity + inheritVelocity;
 
+    Vector extension = Vector(((float)rand()/RAND_MAX -.5)*this->size.x,
+                              ((float)rand()/RAND_MAX -.5) *this->size.y,
+                              ((float)rand()/RAND_MAX -.5) * this->size.z);
+
+
     // ROTATIONAL CALCULATION (this must not be done for all types of particles.)
     randDir = Vector(rand()-RAND_MAX/2, rand()-RAND_MAX/2, rand()-RAND_MAX/2);
@@ -88 +102 @@
     Quaternion moment = Quaternion(this->momentum + this->momentumRandom, randDir);
 
-    this->getSystem()->addParticle(this->getAbsCoor(), velocityV, orient, moment);
+    this->getSystem()->addParticle(this->getAbsCoor() + extension, velocityV, orient, moment);
 
   }

trunk/src/lib/particles/box_emitter.h

@@ -1 +1 @@
 /*!
- * @file dot_emitter.h
- *  Definition of a DotEmitter
+ * @file box_emitter.h
+ *  Definition of a BoxEmitter
  */
 
-#ifndef _DOT_EMITTER_H
-#define _DOT_EMITTER_H
+#ifndef _BOX_EMITTER_H
+#define _BOX_EMITTER_H
 
 #include "particle_emitter.h"
 
-// Default values
-#define DOT_EMITTER_DEFAULT_SIZE              1.0
-
 //! A class to handle an Emitter.
-class DotEmitter : public ParticleEmitter
+class BoxEmitter : public ParticleEmitter
 {
   friend class ParticleSystem;
 public:
-  DotEmitter(const Vector& direction, float angle = .5,
-             float emissionRate = 1.0, float velocity = 1.0);
-  DotEmitter(const TiXmlElement* root);
-  virtual ~DotEmitter();
+  BoxEmitter(const Vector& size);
+  BoxEmitter(const TiXmlElement* root);
+  virtual ~BoxEmitter();
 
+  virtual void loadParams(const TiXmlElement* root);
 
-  /* controlling the emitter: interface */
-  void tick(float dt);
+  void setSize(float x, float y, float z);
+  void setSize(const Vector& size) { this->setSize(size.x, size.y, size.z); };
 
   virtual void emitParticles(unsigned int count) const;
@@ -32 +29 @@
 
 private:
-  Vector          emitterSize;       //!< The size of the emitter (not for EMITTER_DOT).
-
+  Vector      size;
 };
 
-#endif /* _DOT_EMITTER_H */
+#endif /* _BOX_EMITTER_H */

trunk/src/lib/particles/dot_emitter.h

@@ -8 +8 @@
 
 #include "particle_emitter.h"
-
-// Default values
-#define DOT_EMITTER_DEFAULT_SIZE              1.0
 
 //! A class to handle an Emitter.
@@ -23 +20 @@
 
 
-  /* controlling the emitter: interface */
-  void tick(float dt);
-
   virtual void emitParticles(unsigned int count) const;
 
 private:
   void init();
-
-private:
-  Vector          emitterSize;       //!< The size of the emitter (not for EMITTER_DOT).
-
 };
 

trunk/src/lib/particles/particle_system.cc

@@ -140 +140 @@
   {
     BaseObject* emitter = Factory::fabricate(element);
-    if (emitter->isA(CL_PARTICLE_EMITTER))
-      this->addEmitter(dynamic_cast<ParticleEmitter*>(emitter));
+    if (emitter != NULL)
+    {
+      if (emitter->isA(CL_PARTICLE_EMITTER))
+        this->addEmitter(dynamic_cast<ParticleEmitter*>(emitter));
+      else
+      {
+        PRINTF(2)("Tried to load an Element of type '%s' that should be a ParticleEmitter onto '%s::%s'.\n",
+                  emitter->getClassName(), this->getClassName(), this->getName());
+        delete emitter;
+      }
+    }
     else
     {
-      PRINTF(2)("Tried to load an Element of type '%s' that should be a ParticleEmitter onto '%s::%s'.\n",
-                emitter->getClassName(), this->getClassName(), this->getName());
-      delete emitter;
+      PRINTF(2)("Could not Generate Emitter for system %s::%s (wrong type in XML-format)\n", this->getClassName(), getName());
     }
   }