Changeset 4190 in orxonox.OLD

Timestamp:

May 15, 2005, 11:20:53 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/physics: particles get rendered with facing toward Camera (in PARTICLE_SPRITE-mode)

Location:

orxonox/branches/physics/src

Files:

• lib/graphics/particles/particle_system.cc (modified) (2 diffs)
• story_entities/world.cc (modified) (1 diff)
• story_entities/world.h (modified) (2 diffs)

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

@@ -24 +24 @@
 
 #include "field.h"
+
+// needed to find the Position of the Camera
+#include "world.h"
+#include "camera.h"
 
 using namespace std;
@@ -273 +277 @@
     {
     case PARTICLE_SPRITE:
+      GLdouble projMat[16];
+      GLfloat drawPartPos[4];
+      glGetDoublev(GL_PROJECTION_MATRIX, projMat);
+      
       glMatrixMode(GL_MODELVIEW);
-      //  glDisable(GL_LIGHTING);
-      material->select(); 
       glDisable(GL_DEPTH_TEST);
+      glDisable(GL_LIGHTING);
+           material->select(); 
+      
+
       while (likely(drawPart != NULL))
         {
-          glPushMatrix();
-          glTranslatef(drawPart->position.x, drawPart->position.y, drawPart->position.z);
-          glScalef(drawPart->radius, drawPart->radius, drawPart->radius);
-          glCallList(*this->glID);
-          
-          //glVertex3f(drawPart->position.x, drawPart->position.y, drawPart->position.z);
+          //! \todo implement a faster code for the look-at Camera algorithm.
+
+          Camera* camera = WorldInterface::getInstance()->getCurrentWorld()->getLocalCamera();
+          Vector cameraPos = camera->getAbsCoor();
+          Vector cameraTargetPos = camera->getTarget()->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;
-          glPopMatrix();
-        }
-      //      glEnd();
-      
-      //  glEnable(GL_LIGHTING);
-      
+        }
+      glEnable(GL_LIGHTING);
       glEnable(GL_DEPTH_TEST);
+
+      
       break;
     default:

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

@@ -492 +492 @@
 
 
-  ParticleSystem* system = new ParticleSystem(10000, PARTICLE_SPARK);
-  system->setLifeSpan(5);
+  ParticleSystem* system = new ParticleSystem(100000, PARTICLE_SPRITE);
+  system->setLifeSpan(3);
   system->setConserve(.9);
   system->setRadius(2, 0, 2, 0);
 
-  ParticleEmitter* emitter = new ParticleEmitter(Vector(-1, 0, 0), M_PI_4, 1000, 0);
+  ParticleEmitter* emitter = new ParticleEmitter(Vector(-1, 0, 0), M_PI_4, 400, .5);
   emitter->setParent(this->localPlayer);
   
   Field* twirl = new Twirl();
-  twirl->setMagnitude(-.1);
+  twirl->setMagnitude(.1);
   Field* gravity = new PointGravity();
-  gravity->setMagnitude(0);
-  new PhysicsConnection(system, twirl);
-  //  new PhysicsConnection(system, gravity);
-  twirl->setParent(this->localCamera->getTarget());
-  gravity->setParent(this->localCamera->getTarget());
-  particleEngine->addConnection(emitter, system);
+  gravity->setMagnitude(.5);
+    new PhysicsConnection(system, twirl);
+    //    new PhysicsConnection(system, gravity);
+    twirl->setParent(this->localCamera->getTarget());
+    gravity->setParent(this->localCamera->getTarget());
+    particleEngine->addConnection(emitter, system);
 }
 

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

@@ -36 +36 @@
   static WorldInterface* getInstance();
   void init(World* world);
+  inline World* getCurrentWorld(void) {return this->worldReference;}
   tList<WorldEntity>* getEntityList();
 
@@ -90 +91 @@
   void setPath( const char* name);
 
+  inline Camera* getLocalCamera(void) {return this->localCamera;}
+
  private:
   void constuctorInit(char* name, int worldID);