Changeset 6629 in orxonox.OLD for trunk

Timestamp:

Jan 20, 2006, 8:11:04 PM (19 years ago)

Author:

bensch

Message:

trunk: particles: precache and ModelParticles

Location:

trunk/src/lib/particles

Files:

• Makefile.am (modified) (2 diffs)
• model_particles.cc (copied) (copied from trunk/src/lib/particles/sprite_particles.cc) (9 diffs)
• model_particles.h (copied) (copied from trunk/src/lib/particles/sprite_particles.h) (3 diffs)
• particle_system.cc (modified) (7 diffs)
• particle_system.h (modified) (1 diff)
• spark_particles.cc (modified) (1 diff)

trunk/src/lib/particles/Makefile.am

@@ -10 +10 @@
                         sprite_particles.cc \
                         spark_particles.cc \
+                        model_particles.cc \
                         \
                         quick_animation.cc
@@ -20 +21 @@
                         sprite_particles.h \
                         spark_particles.h \
+                        model_particles.h \
                         \
                         quick_animation.h

trunk/src/lib/particles/model_particles.cc

@@ -16 +16 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_GRAPHICS
 
-#include "sprite_particles.h"
+#include "model_particles.h"
 
 #include "load_param.h"
@@ -28 +28 @@
 
 
-CREATE_FACTORY(SpriteParticles, CL_SPRITE_PARTICLES);
+CREATE_FACTORY(ModelParticles, CL_MODEL_PARTICLES);
 
-SHELL_COMMAND(texture, SpriteParticles, setMaterialTexture)
-    ->defaultValues(1, "maps/evil-flower.png");
+SHELL_COMMAND(texture, ModelParticles, setMaterialTexture)
+->defaultValues(1, "maps/evil-flower.png");
 
 using namespace std;
@@ -38 +38 @@
  *  standard constructor
  * @param maxCount the Count of particles in the System
- * @param type The Type of the SpriteParticles
+ * @param type The Type of the ModelParticles
 */
-SpriteParticles::SpriteParticles (unsigned int maxCount)
-  : ParticleSystem(maxCount)
+ModelParticles::ModelParticles (unsigned int maxCount)
+    : ParticleSystem(maxCount)
 {
   this->init();
@@ -50 +50 @@
  * @param root: the XML-element to load from
  */
-SpriteParticles::SpriteParticles(const TiXmlElement* root)
+ModelParticles::ModelParticles(const TiXmlElement* root)
 {
   this->init();
@@ -60 +60 @@
  *  standard deconstructor
 */
-SpriteParticles::~SpriteParticles()
+ModelParticles::~ModelParticles()
 {
   // deleting all the living Particles
@@ -80 +80 @@
 
 /**
- * @brief initializes the SpriteParticles with default values
+ * @brief initializes the ModelParticles with default values
 */
-void SpriteParticles::init()
+void ModelParticles::init()
 {
-  this->setClassID(CL_SPRITE_PARTICLES, "SpriteParticles");
+  this->setClassID(CL_MODEL_PARTICLES, "ModelParticles");
 
   this->material.setDiffuseMap("maps/radial-trans-noise.png");
@@ -94 +94 @@
  * @param root the XML-element to load from.
  */
-void SpriteParticles::loadParams(const TiXmlElement* root)
+void ModelParticles::loadParams(const TiXmlElement* root)
 {
   ParticleSystem::loadParams(root);
 
-  LoadParam(root, "texture", this, SpriteParticles, setMaterialTexture);
+  LoadParam(root, "texture", this, ModelParticles, setMaterialTexture);
 }
 
 /**
  * @brief sets the Texutre that is placed onto the particles
- * @param textureFile the Texture to load onto these SpriteParticles
+ * @param textureFile the Texture to load onto these ModelParticles
  */
-void SpriteParticles::setMaterialTexture(const char* textureFile)
+void ModelParticles::setMaterialTexture(const char* textureFile)
 {
   this->material.setDiffuseMap(textureFile);
@@ -117 +117 @@
  * This is just the fastest Way to do this, but will most likely be changed in the future.
  */
-void SpriteParticles::draw() const
+void ModelParticles::draw() const
 {
   glPushAttrib(GL_ENABLE_BIT);
-
   Particle* drawPart = particles;
 
@@ -128 +127 @@
     glDisable(GL_LIGHTING);
   glMatrixMode(GL_MODELVIEW);
-  glDepthMask(GL_FALSE);
 
-  material.select();
+  this->material.select();
   glBlendFunc(GL_SRC_ALPHA, GL_DST_ALPHA);
 
-  //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_ENV_MODE, GL_MODULATE);
 
+  if (likely(this->getModel() != NULL))
+    while (likely(drawPart != NULL))
+    {
+      glPushMatrix();
+      glMatrixMode(GL_MODELVIEW);
+      /* move */
+      glTranslatef(drawPart->position.x, drawPart->position.y, drawPart->position.z);
+      /* scale */
+      glScalef(drawPart->radius, drawPart->radius, drawPart->radius);
+      /* rotate */
+      Vector tmpRot = drawPart->orientation.getSpacialAxis();
+      glRotatef (drawPart->orientation.getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
 
-  while (likely(drawPart != NULL))
-  {
-    glColor4fv(drawPart->color);
-    //! @todo implement a faster code for the look-at Camera algorithm.
+      this->getModel()->draw();
 
-    const PNode* camera = State::getCamera();  //!< @todo MUST be different
-    Vector cameraPos = camera->getAbsCoor();
-    Vector cameraTargetPos = State::getCameraTarget()->getAbsCoor();
-    Vector view = cameraTargetPos - cameraPos;
-    Vector up = Vector(0, 1, 0);
-    up = camera->getAbsDir().apply(up);
-    Vector h = up.cross(view);
-    Vector v = h.cross(view);
-    h.normalize();
-    v.normalize();
-    v *= .5 * drawPart->radius;
-    h *= .5 * drawPart->radius;
-
-    glBegin(GL_TRIANGLE_STRIP);
-    glTexCoord2i(1, 1);
-    glVertex3f(drawPart->position.x - h.x - v.x,
-               drawPart->position.y - h.y - v.y,
-               drawPart->position.z - h.z - v.z);
-    glTexCoord2i(0, 1);
-    glVertex3f(drawPart->position.x - h.x + v.x,
-               drawPart->position.y - h.y + v.y,
-               drawPart->position.z - h.z + v.z);
-    glTexCoord2i(1, 0);
-    glVertex3f(drawPart->position.x + h.x - v.x,
-               drawPart->position.y + h.y - v.y,
-               drawPart->position.z + h.z - v.z);
-    glTexCoord2i(0, 0);
-    glVertex3f(drawPart->position.x + h.x + v.x,
-               drawPart->position.y + h.y + v.y,
-               drawPart->position.z + h.z + v.z);
-
-    glEnd();
-
-    drawPart = drawPart->next;
-  }
-  glDepthMask(GL_TRUE);
+      glPopMatrix();
+      drawPart = drawPart->next;
+    }
+  else
+    PRINTF(2)("no model loaded onto ParticleSystem-%s\n", this->getName());
   glPopAttrib();
 }

trunk/src/lib/particles/model_particles.h

@@ -1 +1 @@
 /*!
- * @file sprite_particles.h
+ * @file model_particles.h
 
 */
 
-#ifndef _SPRITE_PARTICLE_SYSTEM_H
-#define _SPRITE_PARTICLE_SYSTEM_H
+#ifndef _MODEL_PARTICLE_SYSTEM_H
+#define _MODEL_PARTICLE_SYSTEM_H
 
 #include "particle_system.h"
@@ -11 +11 @@
 
 //! A class to handle ParticleSystems
-class SpriteParticles : public ParticleSystem
+class ModelParticles : public ParticleSystem
 {
-
 public:
-  SpriteParticles(unsigned int maxCount = PARTICLE_DEFAULT_MAX_COUNT);
-  SpriteParticles(const TiXmlElement* root);
-  virtual ~SpriteParticles();
+  ModelParticles(unsigned int maxCount = PARTICLE_DEFAULT_MAX_COUNT);
+  ModelParticles(const TiXmlElement* root);
+  virtual ~ModelParticles();
 
   virtual void loadParams(const TiXmlElement* root);
@@ -35 +34 @@
 };
 
-#endif /* _SPRITE_PARTICLE_SYSTEM_H */
+#endif /* _MODEL_PARTICLE_SYSTEM_H */

trunk/src/lib/particles/particle_system.cc

@@ -74 +74 @@
 
 /**
-  \brief initializes the ParticleSystem with default values
-*/
+ * @brief initializes the ParticleSystem with default values
+ */
 void ParticleSystem::init()
 {
@@ -125 +125 @@
   }
   LOAD_PARAM_END_CYCLE(element);
+
+  LoadParam(root, "precache", this, ParticleSystem, precache)
+      .describe("Precaches the ParticleSystem for %1 seconds, %2 times per Second")
+      .defaultValues(2, 1, 25);
 }
 
@@ -222 +226 @@
 }
 
-
+/**
+ * @brief adds an Emitter to this System.
+ * @param emitter the Emitter to add.
+ */
 void ParticleSystem::addEmitter(ParticleEmitter* emitter)
 {
@@ -232 +239 @@
 }
 
-
+/**
+ * @brief removes a ParticleEmitter from this System
+ * @param emitter the Emitter to remove
+ */
 void ParticleSystem::removeEmitter(ParticleEmitter* emitter)
 {
@@ -244 +254 @@
 
 /**
+ * @brief does a Precaching, meaning, that the ParticleSystem(and its emitters) will be ticked force
+ * @param seconds: seconds
+ * @param ticksPerSeconds times per Second.
+ */
+void ParticleSystem::precache(unsigned int seconds, unsigned int ticksPerSecond)
+{
+  PRINTF(4)("Precaching %s::%s %d seconds %d timesPerSecond\n", this->getClassName(), this->getName(), seconds, ticksPerSecond);
+  this->debug();
+  for (unsigned int i = 0; i < seconds*ticksPerSecond; i++)
+    this->tick(1.0/(float)ticksPerSecond);
+}
+
+
+/**
  *  ticks the system.
  * @param dt the time to tick all the Particles of the System
@@ -355 +379 @@
 //   switch (this->particleType)
 //   {
-//     case PARTICLE_SPARK:
-//       glDisable(GL_LIGHTING);
-//       glDepthMask(GL_FALSE);
-//       //glEnable(GL_LINE_SMOOTH);
-//       glEnable(GL_BLEND);
-//
-//       glBegin(GL_LINES);
-//       while (likely(drawPart != NULL))
-//       {
-//         glColor4fv(drawPart->color);
-//         glVertex3f(drawPart->position.x, drawPart->position.y, drawPart->position.z);
-//         glVertex3f(drawPart->position.x - drawPart->velocity.x * drawPart->radius,
-//                    drawPart->position.y - drawPart->velocity.y * drawPart->radius,
-//                    drawPart->position.z - drawPart->velocity.z * drawPart->radius);
-//         drawPart = drawPart->next;
-//       }
-//       glEnd();
-//       break;
 //
 //     case PARTICLE_MODEL:
 //       {
-//         GLfloat matrix[4][4];
-//
-//         if (likely(this->getModel() != NULL))
-//           while (likely(drawPart != NULL))
-//         {
-//           glPushMatrix();
-//           glMatrixMode(GL_MODELVIEW);
-//           /* move */
-//           glTranslatef(drawPart->position.x, drawPart->position.y, drawPart->position.z);
-//           /* scale */
-//           glScalef(drawPart->radius, drawPart->radius, drawPart->radius);
-//           /* rotate */
-//           drawPart->orientation.matrix (matrix);
-//           glMultMatrixf((float*)matrix);
-//
-//           this->getModel()->draw();
-//
-//           glPopMatrix();
-//           drawPart = drawPart->next;
-//         }
-//         else
-//           PRINTF(2)("no model loaded onto ParticleSystem-%s\n", this->getName());
 //       }
 //       break;
@@ -488 +472 @@
 void ParticleSystem::debug() const
 {
-  PRINT(0)("  ParticleCount: %d, maximumCount: %d :: filled %d%%\n", this->count, this->maxCount, 100*this->count/this->maxCount);
+  PRINT(0)("  ParticleCount: %d emitters: %d, maximumCount: %d :: filled %d%%\n", this->count, this->emitters.size(), this->maxCount, 100*this->count/this->maxCount);
   if (deadList)
   {

trunk/src/lib/particles/particle_system.h

@@ -95 +95 @@
   void addParticle(const Vector& position, const Vector& velocity, const Quaternion& orientation, const Quaternion& momentum, unsigned int data = 0);
 
+  void precache(unsigned int seconds, unsigned int ticksPerSecond = 25);
+
   virtual void tick(float dt);
   virtual void draw() const = 0;

trunk/src/lib/particles/spark_particles.cc

@@ -107 +107 @@
 void SparkParticles::draw() const
 {
-  exit(-1);
   glPushAttrib(GL_ENABLE_BIT);