Changeset 6873 in orxonox.OLD for trunk/src/lib/particles/plane_emitter.cc

Timestamp:

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

Author:

bensch

Message:

orxonox/trunk: Emitter is emitting correctly

File:

• trunk/src/lib/particles/plane_emitter.cc (copied) (copied from trunk/src/lib/particles/box_emitter.cc) (7 diffs)

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