Changeset 6873 in orxonox.OLD

Timestamp:

Jan 30, 2006, 10:43:00 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: Emitter is emitting correctly

Location:

trunk/src

Files:

• Makefile.am (modified) (1 diff)
• defs/class_id.h (modified) (2 diffs)
• lib/coord/p_node.cc (modified) (6 diffs)
• lib/coord/p_node.h (modified) (2 diffs)
• lib/particles/Makefile.am (modified) (2 diffs)
• lib/particles/plane_emitter.cc (copied) (copied from trunk/src/lib/particles/box_emitter.cc) (7 diffs)
• lib/particles/plane_emitter.h (copied) (copied from trunk/src/lib/particles/box_emitter.h) (2 diffs)

trunk/src/Makefile.am

@@ -60 +60 @@
                 lib/particles/spark_particles.cc \
                 lib/particles/sprite_particles.cc \
+                lib/particles/plane_emitter.cc \
                 \
                 subprojects/benchmark.cc

trunk/src/defs/class_id.h

@@ -269 +269 @@
 
   // Particles
-  CL_PARTICLE_EMITTER           =    0x00a01000,
-  CL_PARTICLE_SYSTEM            =    0x00a02000,
+  CL_PARTICLE_SYSTEM            =    0x00a01000,
   CL_SPRITE_PARTICLES           =    0x00000a01,
   CL_SPARK_PARTICLES            =    0x00000a02,
@@ -276 +275 @@
   CL_DOT_PARTICLES              =    0x00000a04,
   CL_MODEL_PARTICLES            =    0x00000a05,
-  CL_DOT_EMITTER                =    0x00000a06,
-  CL_BOX_EMITTER                =    0x00000a07,
-  CL_SPHERE_EMITTER             =    0x00000a08,
-  CL_MODEL_EMITTER              =    0x00000a09,
+
+  CL_PARTICLE_EMITTER           =    0x00a02000,
+  CL_DOT_EMITTER                =    0x00000a21,
+  CL_PLANE_EMITTER              =    0x00000a22,
+  CL_BOX_EMITTER                =    0x00000a23,
+  CL_SPHERE_EMITTER             =    0x00000a24,
+  CL_MODEL_EMITTER              =    0x00000a25,
 
 

trunk/src/lib/coord/p_node.cc

@@ -139 +139 @@
 
   LoadParam(root, "parent", this, PNode, setParent)
-      .describe("the Name of the Parent of this PNode");
+      .describe("the Name of the Parent to set for this PNode");
 
   LoadParam(root, "parent-mode", this, PNode, setParentMode)
@@ -355 +355 @@
  * main difference is, that here you give a directional vector, that will be translated into a Quaternion
  */
-void PNode::setRelDir (float x, float y, float z)
-{
-  this->setRelDir(Quaternion(Vector(x,y,z), Vector(0,1,0)));
+void PNode::setRelDir (float angle, float x, float y, float z)
+{
+  this->setRelDir(Quaternion(angle, Vector(x,y,z)));
 }
 
@@ -386 +386 @@
  * main difference is, that here you give a directional vector, that will be translated into a Quaternion
  */
-void PNode::setRelDirSoft(float x, float y, float z, float bias)
-{
-  this->setRelDirSoft(Quaternion(Vector(x,y,z), Vector(0,1,0)), bias);
+void PNode::setRelDirSoft(float angle, float x, float y, float z, float bias)
+{
+  this->setRelDirSoft(Quaternion(angle, Vector(x,y,z)), bias);
 }
 
@@ -421 +421 @@
  * main difference is, that here you give a directional vector, that will be translated into a Quaternion
  */
-void PNode::setAbsDir (float x, float y, float z)
-{
-  this->setAbsDir(Quaternion(Vector(x,y,z), Vector(0,1,0)));
+void PNode::setAbsDir (float angle, float x, float y, float z)
+{
+  this->setAbsDir(Quaternion(angle, Vector(x,y,z)));
 }
 
@@ -456 +456 @@
  * main difference is, that here you give a directional vector, that will be translated into a Quaternion
  */
-void PNode::setAbsDirSoft (float x, float y, float z, float bias)
-{
-  this->setAbsDirSoft(Quaternion(Vector(x,y,z), Vector(0,1,0)), bias);
+void PNode::setAbsDirSoft (float angle, float x, float y, float z, float bias)
+{
+  this->setAbsDirSoft(Quaternion(angle, Vector(x,y,z)), bias);
 }
 
@@ -1319 +1319 @@
        fabs( rotz - absDirection.v.z ) > __OFFSET_ROT )
     return true;
-  
+
   return false;
 }

trunk/src/lib/coord/p_node.h

@@ -115 +115 @@
   // ROTATION //
   void setRelDir (const Quaternion& relDir);
-  void setRelDir (float x, float y, float z);
+  void setRelDir (float angle, float x, float y, float z);
   void setRelDirSoft(const Quaternion& relDirSoft, float bias = 1.0);
-  void setRelDirSoft(float x, float y, float z, float bias = 1.0);
+  void setRelDirSoft(float angle, float x, float y, float z, float bias = 1.0);
   /** @returns the relative Direction */
   inline const Quaternion& getRelDir () const { return this->prevRelDirection; };
@@ -125 +125 @@
   inline Vector getRelDirV() const { return this->prevRelDirection.apply(Vector(0,1,0)); };
   void setAbsDir (const Quaternion& absDir);
-  void setAbsDir (float x, float y, float z);
+  void setAbsDir (float angle, float x, float y, float z);
   void setAbsDirSoft(const Quaternion& absDirSoft, float bias = 1.0);
-  void setAbsDirSoft(float x, float y, float z, float bias = 1.0);
+  void setAbsDirSoft(float angle, float x, float y, float z, float bias = 1.0);
   void shiftDir (const Quaternion& shift);
   /** @returns the absolute Direction */

trunk/src/lib/particles/Makefile.am

@@ -8 +8 @@
                         dot_emitter.cc \
                         box_emitter.cc \
+                        plane_emitter.cc \
                         \
                         particle_system.cc \
@@ -22 +23 @@
                         dot_emitter.h \
                         box_emitter.h \
+                        plane_emitter.h \
                         \
                         particle_system.h \

trunk/src/lib/particles/plane_emitter.cc

@@ -16 +16 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_GRAPHICS
 
-#include "box_emitter.h"
+#include "plane_emitter.h"
 
 #include "particle_system.h"
@@ -28 +28 @@
 
 
-CREATE_FACTORY(BoxEmitter, CL_BOX_EMITTER);
+CREATE_FACTORY(PlaneEmitter, CL_PLANE_EMITTER);
 
 /**
  *  standard constructor
 */
-BoxEmitter::BoxEmitter(const Vector& size, float emissionRate, float velocity, float angle)
+PlaneEmitter::PlaneEmitter(const Vector2D& size, float emissionRate, float velocity, float angle)
     :  ParticleEmitter(emissionRate, velocity, angle)
 {
@@ -41 +41 @@
 
 /**
- *  constructs and loads a BoxEmitter from a XML-element
+ *  constructs and loads a PlaneEmitter from a XML-element
  * @param root the XML-element to load from
 */
-BoxEmitter::BoxEmitter(const TiXmlElement* root)
+PlaneEmitter::PlaneEmitter(const TiXmlElement* root)
     : ParticleEmitter()
 {
@@ -58 +58 @@
    removes the EmitterSystem from the ParticleEngine
 */
-BoxEmitter::~BoxEmitter ()
+PlaneEmitter::~PlaneEmitter ()
 {
   this->setSystem(NULL);
@@ -66 +66 @@
   @brief initializes default values of a ParitcleEmitter
 */
-void BoxEmitter::init()
+void PlaneEmitter::init()
 {
-  this->setClassID(CL_BOX_EMITTER, "BoxEmitter");
-  this->setSize(1.0f,1.0f,1.0f);
+  this->setClassID(CL_PLANE_EMITTER, "PlaneEmitter");
+  this->setSize(1.0f, 1.0f);
 }
 
-void BoxEmitter::loadParams(const TiXmlElement* root)
+void PlaneEmitter::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);
+  LoadParam(root, "size", this, PlaneEmitter, setSize)
+  .describe("The Size of the PlaneEmitter: x, y")
+  .defaultValues(2, 1.0f,1.0f);
 }
 
-void BoxEmitter::setSize(float x, float y, float z)
+void PlaneEmitter::setSize(float x, float y)
 {
-  this->size = Vector (x,y,z);
+  this->size = Vector2D(x, y);
 }
 
 
-void BoxEmitter::emitParticles(unsigned int count) const
+void PlaneEmitter::emitParticles(unsigned int count) const
 {
   Vector inheritVelocity = this->getVelocity() * this->inheritSpeed;
 
   Vector xDir = this->getAbsDirX() * this->size.x;
-  Vector yDir = this->getAbsDirY() * this->size.y;
-  Vector zDir = this->getAbsDirZ() * this->size.z;
+  Vector yDir = this->getAbsDirZ() * this->size.y;
+  Vector zDir = this->getAbsDirY();
 
   for (unsigned int i = 0; i < count; i++)
@@ -99 +99 @@
     Vector randDir = Vector(rand()-RAND_MAX/2, rand()-RAND_MAX/2, rand()-RAND_MAX/2);
     randDir.normalize();
-    randDir = (Quaternion(angle + randomAngle *((float)rand()/RAND_MAX -.5), randDir)).apply(this->getAbsDirX());
+    randDir = (Quaternion(angle + randomAngle *((float)rand()/RAND_MAX -.5), randDir)).apply(zDir);
     Vector velocityV = randDir.getNormalized()*this->velocity + inheritVelocity;
 
-    Vector box = this->getAbsCoor() +
+    Vector plane = this->getAbsCoor() +
         xDir * ((float)rand()/RAND_MAX -.5) +
-        yDir * ((float)rand()/RAND_MAX -.5) +
-        zDir * ((float)rand()/RAND_MAX -.5);
+        yDir * ((float)rand()/RAND_MAX -.5);
 
     // ROTATIONAL CALCULATION (this must not be done for all types of particles.)
@@ -113 +112 @@
     Quaternion moment = Quaternion(this->momentum + this->momentumRandom, randDir);
 
-    this->getSystem()->addParticle(box, velocityV, orient, moment);
+    this->getSystem()->addParticle(plane, velocityV, orient, moment);
 
   }

trunk/src/lib/particles/plane_emitter.h

@@ -1 +1 @@
 /*!
- * @file box_emitter.h
- *  Definition of a BoxEmitter
+ * @file plane_emitter.h
+ * Definition of a PlaneEmitter
  */
 
-#ifndef _BOX_EMITTER_H
-#define _BOX_EMITTER_H
+#ifndef _PLANE_EMITTER_H
+#define _PLANE_EMITTER_H
 
 #include "particle_emitter.h"
 
-#define BOX_EMITTER_DEFAULT_SIZE Vector(1.0f, 1.0f, 1.0f)
+#include "vector2D.h"
 
-//! A class to handle a Box Emitter.
+#define PLANE_EMITTER_DEFAULT_SIZE Vector2D(1.0f, 1.0f)
+
+//! A class to handle a Plane Emitter.
 /**
- * A Box Emitter is a special kind of emitter, that has the (underlying) PNode
- * at its center, and from there on is a Box in the Direction of the PNode
- * out around size in the corresponding directions
+ * A Plane Emitter is a special kind of emitter, that has the (underlying) PNode
+ * at its center, and from there on is a Plane in the Direction of the PNode
+ * out around size in the corresponding directions in x and z
  */
-class BoxEmitter : public ParticleEmitter
+class PlaneEmitter : public ParticleEmitter
 {
   friend class ParticleSystem;
 public:
-  BoxEmitter(const Vector& size = BOX_EMITTER_DEFAULT_SIZE,
+  PlaneEmitter(const Vector2D& size = PLANE_EMITTER_DEFAULT_SIZE,
              float emissionRate = PARTICLE_EMITTER_DEFAULT_EMISSION_RATE,
              float velocity = PARTICLE_EMITTER_DEFAULT_VELOCITY,
              float angle = PARTICLE_EMITTER_DEFAULT_SPREAD);
-  BoxEmitter(const TiXmlElement* root);
-  virtual ~BoxEmitter();
+  PlaneEmitter(const TiXmlElement* root);
+  virtual ~PlaneEmitter();
 
   virtual void loadParams(const TiXmlElement* root);
 
-  void setSize(float x, float y, float z);
-  void setSize(const Vector& size) { this->setSize(size.x, size.y, size.z); };
+  void setSize(float x, float y);
+  void setSize(const Vector2D& size) { this->setSize(size.x, size.y); };
 
 protected:
@@ -40 +42 @@
 
 private:
-  Vector      size;
+  Vector2D      size;
 };
 
-#endif /* _BOX_EMITTER_H */
+#endif /* _PLANE_EMITTER_H */