Changeset 6826 in orxonox.OLD for trunk

Timestamp:

Jan 29, 2006, 1:35:43 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: ok, the Cube Emitter works

Location:

trunk/src

Files:

• lib/particles/box_emitter.cc (modified) (3 diffs)
• lib/particles/box_emitter.h (modified) (1 diff)
• world_entities/projectiles/hyperblast.cc (modified) (3 diffs)

trunk/src/lib/particles/box_emitter.cc

@@ -81 +81 @@
 }
 
+void BoxEmitter::setSize(float x, float y, float z)
+{
+  this->size = Vector (x,y,z);
+}
+
+
 void BoxEmitter::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;
 
   for (unsigned int i = 0; i < count; i++)
@@ -92 +102 @@
     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);
-
+    Vector box = this->getAbsCoor() +
+        xDir * ((float)rand()/RAND_MAX -.5) +
+        yDir * ((float)rand()/RAND_MAX -.5) +
+        zDir * ((float)rand()/RAND_MAX -.5);
 
     // ROTATIONAL CALCULATION (this must not be done for all types of particles.)
@@ -103 +113 @@
     Quaternion moment = Quaternion(this->momentum + this->momentumRandom, randDir);
 
-    this->getSystem()->addParticle(this->getAbsCoor() + extension, velocityV, orient, moment);
+    this->getSystem()->addParticle(box, velocityV, orient, moment);
 
   }

trunk/src/lib/particles/box_emitter.h

@@ -11 +11 @@
 #define BOX_EMITTER_DEFAULT_SIZE Vector(1.0f, 1.0f, 1.0f)
 
-//! A class to handle an Emitter.
+//! A class to handle a Box 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
+ */
 class BoxEmitter : public ParticleEmitter
 {

trunk/src/world_entities/projectiles/hyperblast.cc

@@ -23 +23 @@
 #include "class_list.h"
 
-#include "dot_emitter.h"
-#include "sprite_particles.h"
+#include "box_emitter.h"
 #include "spark_particles.h"
 
@@ -47 +46 @@
   this->size = 4.0;
 
-  this->emitter = new DotEmitter(100, 5, M_2_PI);
+  this->emitter = new BoxEmitter(Vector(400, 2, 2), 100, 5, M_2_PI);
+  this->emitter->setRelCoor(200,0,0);
   this->emitter->setParent(this);
   this->emitter->setSpread(M_PI, M_PI);
@@ -141 +141 @@
   glPushMatrix();
 
-  float matrix[4][4];
-  glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
-  this->getAbsDir().matrix (matrix);
-  glMultMatrixf((float*)matrix);
-  glScalef(2.0, this->size, this->size);
-  this->getModel()->draw();
+  glTranslatef (this->getAbsCoor ().x,
+                this->getAbsCoor ().y,
+                this->getAbsCoor ().z);
+  Vector tmpRot = this->getAbsDir().getSpacialAxis();
+  glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
+
+//  glScalef(2.0, this->size, this->size);
+//  this->getModel()->draw();
 
   glPopMatrix();