Changeset 6621 in orxonox.OLD for trunk/src/lib/particles/particle_system.cc

Timestamp:

Jan 19, 2006, 11:46:28 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: particle derivate… still working on this

File:

• trunk/src/lib/particles/particle_system.cc (modified) (8 diffs)

trunk/src/lib/particles/particle_system.cc

@@ -32 +32 @@
 #include <algorithm>
 
-
-CREATE_FACTORY(ParticleSystem, CL_PARTICLE_SYSTEM);
-SHELL_COMMAND(texture, ParticleSystem, setMaterialTexture)
-    ->defaultValues(1, "maps/evil-flower.png");
-
 using namespace std;
 
@@ -44 +39 @@
  * @param type The Type of the ParticleSystem
 */
-ParticleSystem::ParticleSystem (unsigned int maxCount, PARTICLE_TYPE type)
+ParticleSystem::ParticleSystem (unsigned int maxCount)
 {
   this->init();
 
   this->setMaxCount(maxCount);
-  this->setType(type, 1);
 }
 
@@ -103 +97 @@
   this->setLifeSpan(1);
   this->glID = NULL;
-  this->setType(PARTICLE_DEFAULT_TYPE, 1);
 
   this->toList(OM_ENVIRON);
@@ -126 +119 @@
   LoadParam(root, "conserve", this, ParticleSystem, setConserve)
       .describe("sets the Conserve factor of the Particles (1.0: they keep all their energy, 0.0:they keep no energy)");
-
-  LoadParam(root, "type", this, ParticleSystem, setType)
-      .describe("sets the type of the Particles, (dot, spark, sprite or model)");
 
   LoadParam(root, "texture", this, ParticleSystem, setMaterialTexture);
@@ -155 +145 @@
 {
   this->maxCount = maxCount;
-}
-
-
-/**
- * @param particleType the type of particles in this System
- * @param count how many particles (in PARTICLE_MULTI-mode)
-   @todo this will be different
-*/
-void ParticleSystem::setType(const char* particleType)
-{
-  if (!strcmp(particleType, "dot"))
-    this->setType(PARTICLE_DOT);
-  else if(!strcmp(particleType, "spark"))
-    this->setType(PARTICLE_SPARK);
-  else if(!strcmp(particleType, "model"))
-    this->setType(PARTICLE_MODEL);
-  else // if (strcmp(particleType, "SPRITE"))
-    this->setType(PARTICLE_SPRITE);
-}
-
-/**
- * @param particleType the type of particles in this System
- * @param count how many particles (in PARTICLE_MULTI-mode)
-   @todo this MUST be different
-*/
-void ParticleSystem::setType(PARTICLE_TYPE particleType, int count)
-{
-  this->particleType = particleType;
-  this->dialectCount = count;
-  //  if (glID != NULL)
-  //    delete glID;
-
-  //  glID = new GLuint[count];
-  //  for (int i = 0; i< count; i++)
-  //    glID[i] = 0;
-
-  //  glID[0] = glGenLists(count);
-  if (this->material)
-    delete this->material;
-  this->material = NULL;
-
-  switch (this->particleType)
-    {
-      case PARTICLE_SPRITE:
-        this->material = new Material("transperencyMap");
-        this->material->setDiffuseMap("maps/radialTransparency.png");
-      //  material->setTransparency(.5);
-        break;
-  }
 }
 
@@ -405 +346 @@
 unsigned int ParticleSystem::getFaceCount() const
 {
-  switch (this->particleType)
-  {
-    case PARTICLE_SPRITE:
-      return this->count;
-      break;
-    case PARTICLE_MODEL:
-      if (this->getModel(0))
-        return this->count * this->getModel()->getTriangleCount();
-      break;
-  }
+  return this->count;
 }
 
@@ -425 +357 @@
    This is just the fastest Way to do this, but will most likely be changed in the future.
  */
-void ParticleSystem::draw() const
-{
-  glPushAttrib(GL_ENABLE_BIT);
-
-  Particle* drawPart = particles;
-
-  switch (this->particleType)
-  {
-    default:
-    case PARTICLE_SPRITE:
-      glDisable(GL_LIGHTING);
-      glMatrixMode(GL_MODELVIEW);
-      glDepthMask(GL_FALSE);
-
-      material->select();
-      glBlendFunc(GL_SRC_ALPHA, GL_DST_ALPHA);
-
-      //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-
-
-      while (likely(drawPart != NULL))
-      {
-        glColor4fv(drawPart->color);
-          //! @todo implement a faster code for the look-at Camera algorithm.
-
-        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);
-      break;
-
-    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;
-
-    case PARTICLE_DOT:
-      glDisable(GL_LIGHTING);
-      glBegin(GL_POINTS);
-      while (likely(drawPart != NULL))
-      {
-        glColor4fv(drawPart->color);
-
-        glLineWidth(drawPart->radius);
-
-        glVertex3f(drawPart->position.x, drawPart->position.y, drawPart->position.z);
-        drawPart = drawPart->next;
-      }
-      glEnd();
-      break;
-  }
-  glPopAttrib();
-}
+// void ParticleSystem::draw() const
+// {
+//   glPushAttrib(GL_ENABLE_BIT);
+//
+//   Particle* drawPart = particles;
+//
+//   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;
+//
+//     case PARTICLE_DOT:
+//       glDisable(GL_LIGHTING);
+//       glBegin(GL_POINTS);
+//       while (likely(drawPart != NULL))
+//       {
+//         glColor4fv(drawPart->color);
+//
+//         glLineWidth(drawPart->radius);
+//
+//         glVertex3f(drawPart->position.x, drawPart->position.y, drawPart->position.z);
+//         drawPart = drawPart->next;
+//       }
+//       glEnd();
+//       break;
+//   }
+//   glPopAttrib();
+// }
 
 /**
@@ -621 +498 @@
 void ParticleSystem::debug() const
 {
-  PRINT(0)("  ParticleSystem %s, type: ", this->getName());
-  {
-      if (this->particleType == PARTICLE_MODEL)
-        PRINT(0)("model");
-      else if (this->particleType == PARTICLE_SPRITE)
-        PRINT(0)("sprite");
-      else if (this->particleType == PARTICLE_DOT)
-        PRINT(0)("dot");
-      else if (this->particleType == PARTICLE_SPARK)
-        PRINT(0)("spark");
-
-      PRINT(0)("\n");
-  }
-
   PRINT(0)("  ParticleCount: %d, maximumCount: %d :: filled %d%%\n", this->count, this->maxCount, 100*this->count/this->maxCount);
   if (deadList)