Changeset 4274 in orxonox.OLD

Timestamp:

May 22, 2005, 10:21:00 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/physics: particles emitting from plane and Cube.

Location:

orxonox/branches/physics/src

Files:

• lib/coord/p_node.h (modified) (1 diff)
• lib/graphics/particles/particle_emitter.cc (modified) (4 diffs)
• lib/graphics/particles/particle_emitter.h (modified) (3 diffs)
• story_entities/world.cc (modified) (1 diff)

orxonox/branches/physics/src/lib/coord/p_node.h

@@ -73 +73 @@
   /** \returns the Velocity of the Node */
   inline const Vector& getVelocity() const {return this->velocity;}
+  /** \returns the last calculated coordinate */
+  inline Vector getLastAbsCoor(void) {return this->lastAbsCoordinate;}
 
   void addChild (PNode* pNode, int parentingMode = DEFAULT_MODE);

orxonox/branches/physics/src/lib/graphics/particles/particle_emitter.cc

@@ -31 +31 @@
 {
    this->setClassName ("ParticleEmitter");
+
+   this->type = EMITTER_DOT;
+   this->emitterSize = 1.0;
    this->direction = direction;
    this->setSpread(angle);
@@ -50 +53 @@
 {
   ParticleEngine::getInstance()->removeEmitter(this);
-  
 }
 
@@ -69 +71 @@
 
 /* these are Animation interfaces: so you can change spec values as you want */
+
+/**
+   \param type the new Type of this emitter
+*/
+void ParticleEmitter::setType(EMITTER_TYPE type)
+{
+  this->type = type;
+}
+
+void ParticleEmitter::setSize(float emitterSize)
+{
+  this->emitterSize = emitterSize;
+}
 
 /**
@@ -140 +155 @@
             // this should spread the Particles evenly. if the Emitter is moved around quickly
             Vector equalSpread = this->getVelocity() * random()/RAND_MAX * dt;
+            Vector extension; // the Vector for different fields.
 
-            system->addParticle(this->getAbsCoor() - equalSpread, velocityV);
+            if (this->type & 2)
+              {
+                extension = Vector(this->emitterSize * ((float)rand()/RAND_MAX -.5), 0, this->emitterSize * ((float)rand()/RAND_MAX - .5));
+                extension = this->getAbsDir().apply(extension);
+              }
+            else if (this->type & 8)
+              {
+                extension = Vector((float)rand()/RAND_MAX -.5, (float)rand()/RAND_MAX -.5, (float)rand()/RAND_MAX -.5) * this->emitterSize;
+              }
+
+            system->addParticle(this->getAbsCoor() + extension - equalSpread, velocityV);
+            
           }
       }

orxonox/branches/physics/src/lib/graphics/particles/particle_emitter.h

@@ -13 +13 @@
 class ParticleSystem;
 
-typedef enum EMITTER_TYPE {EMITTER_DOT,
-                           EMITTER_PLANE,
-                           EMITTER_SPHERE,
-                           EMITTER_CUBE};
+//! The form of the Emitter to emit from
+typedef enum EMITTER_TYPE {EMITTER_DOT   = 1,
+                           EMITTER_PLANE = 2,
+                           EMITTER_SPHERE= 4,
+                           EMITTER_CUBE  = 8};
 
 //! A default singleton class.
@@ -32 +33 @@
 
   /* controlling the behavour: these can be used as Animation interfaces */
+  void setType(EMITTER_TYPE type);
+  void setSize(float emitterSize);
   void setEmissionRate(float emissionRate);
   void setSpread(float angle, float randomAngle = 0.0);
@@ -39 +42 @@
 
  private:
+  EMITTER_TYPE type;    //!< The type of emitter this is
+  float emitterSize;    //!< The size of the emitter (not for EMITTER_DOT)
   Vector direction;     //!< emition direction
   float angle;          //!< max angle from the direction of the emitter

orxonox/branches/physics/src/story_entities/world.cc

@@ -499 +499 @@
   // Creating a Test Particle Emitter
   ParticleEmitter* emitter = new ParticleEmitter(Vector(-1, 0, 0), M_PI_4, 400, .5);
+  emitter->setType(EMITTER_CUBE);
+  emitter->setSize(20);
   emitter->setParent(this->localPlayer);
   emitter->setRelCoor(Vector(0,-3,0));