Changeset 6652 in orxonox.OLD for trunk

Timestamp:

Jan 22, 2006, 4:33:43 PM (19 years ago)

Author:

bensch

Message:

trunk: dot-particles

Location:

trunk/src/lib/particles

Files:

• Makefile.am (modified) (2 diffs)
• dot_particles.cc (copied) (copied from trunk/src/lib/particles/sprite_particles.cc) (9 diffs)
• dot_particles.h (copied) (copied from trunk/src/lib/particles/sprite_particles.h) (3 diffs)

trunk/src/lib/particles/Makefile.am

@@ -11 +11 @@
                         spark_particles.cc \
                         model_particles.cc \
+                        dot_particles.cc \
                         \
                         quick_animation.cc
@@ -22 +23 @@
                         spark_particles.h \
                         model_particles.h \
+                        dot_particles.h \
                         \
                         quick_animation.h

trunk/src/lib/particles/dot_particles.cc

@@ -16 +16 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_GRAPHICS
 
-#include "sprite_particles.h"
+#include "dot_particles.h"
 
 #include "load_param.h"
@@ -28 +28 @@
 
 
-CREATE_FACTORY(SpriteParticles, CL_SPRITE_PARTICLES);
+CREATE_FACTORY(DotParticles, CL_SPRITE_PARTICLES);
 
-SHELL_COMMAND(texture, SpriteParticles, setMaterialTexture)
+SHELL_COMMAND(texture, DotParticles, setMaterialTexture)
     ->defaultValues(1, "maps/evil-flower.png");
 
@@ -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 DotParticles
 */
-SpriteParticles::SpriteParticles (unsigned int maxCount)
+DotParticles::DotParticles (unsigned int maxCount)
   : ParticleSystem(maxCount)
 {
@@ -50 +50 @@
  * @param root: the XML-element to load from
  */
-SpriteParticles::SpriteParticles(const TiXmlElement* root)
+DotParticles::DotParticles(const TiXmlElement* root)
 {
   this->init();
@@ -60 +60 @@
  *  standard deconstructor
 */
-SpriteParticles::~SpriteParticles()
+DotParticles::~DotParticles()
 {
   // deleting all the living Particles
@@ -80 +80 @@
 
 /**
- * @brief initializes the SpriteParticles with default values
+ * @brief initializes the DotParticles with default values
 */
-void SpriteParticles::init()
+void DotParticles::init()
 {
-  this->setClassID(CL_SPRITE_PARTICLES, "SpriteParticles");
+  this->setClassID(CL_SPRITE_PARTICLES, "DotParticles");
 
   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 DotParticles::loadParams(const TiXmlElement* root)
 {
   ParticleSystem::loadParams(root);
 
-  LoadParam(root, "texture", this, SpriteParticles, setMaterialTexture);
+  LoadParam(root, "texture", this, DotParticles, 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 DotParticles
  */
-void SpriteParticles::setMaterialTexture(const char* textureFile)
+void DotParticles::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 DotParticles::draw() const
 {
   glPushAttrib(GL_ENABLE_BIT);
 
-  Particle* drawPart = particles;
 
   GLboolean checkLight = false;
@@ -133 +132 @@
   glBlendFunc(GL_SRC_ALPHA, GL_DST_ALPHA);
 
+  Particle* drawPart = particles;
   //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_ENV_MODE, GL_MODULATE);
 
-
+  glBegin(GL_POINTS);
   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();
+    glVertex3f(drawPart->position.x, drawPart->position.y, drawPart->position.z);
 
     drawPart = drawPart->next;
   }
+  glEnd();
   glDepthMask(GL_TRUE);
   glPopAttrib();

trunk/src/lib/particles/dot_particles.h

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