Changeset 4294 in orxonox.OLD

Timestamp:

May 26, 2005, 10:51:11 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/physics: one is seeing particles

Location:

orxonox/branches/physics/src/subprojects/particles

Files:

• framework.cc (modified) (6 diffs)
• framework.h (modified) (1 diff)

orxonox/branches/physics/src/subprojects/particles/framework.cc

@@ -19 +19 @@
 #include "particle_engine.h"
 
+#include "p_node.h"
+#include "null_parent.h"
+#include "state.h"
 #include "debug.h"
 #include "graphics_engine.h"
@@ -33 +36 @@
         return false;
 
+      float dt = tick();
       // Draw the scene
-      draw();
+      draw(dt);
       
     }
@@ -41 +45 @@
 
 
-bool draw()
+bool draw(float dt)
 {
   
@@ -51 +55 @@
   glLoadIdentity();     
   gluPerspective(45.0f,500/375,0.1f,dist * 5.0f);
-    gluLookAt (0, dist , dist, 0,0,0, up.x,up.y,up.z);
-
-
-
+  gluLookAt (0, dist , dist, 0,0,0, up.x,up.y,up.z);
+  
+  ParticleEngine::getInstance()->draw(dt);
+  
   SDL_GL_SwapBuffers(); // Swap the buffers
 
 }
-bool tick()
+float tick()
 {
   currFrame = SDL_GetTicks();
@@ -71 +75 @@
 
   lastFrame = currFrame;
- 
+
+  NullParent::getInstance()->update(dt);
+  return dt;
 }
 
@@ -253 +259 @@
   mouse1Down = false;
 
+ 
+    // Creating a Test Particle System
+  ParticleSystem* system = new ParticleSystem(100000, PARTICLE_SPRITE);
+  system->setLifeSpan(1);
+  system->setConserve(.8);
+  system->setRadius(4, 3, 1, 2);
+  system->setColor(.5,0,0,.5, 1,1,0,1, 0,0,0,0);
+
+  // 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->setRelCoor(Vector(0,0,0));
+  
+  // Add the Flow from the Emitter into the System
+  ParticleEngine::getInstance()->addConnection(emitter, system);
+
+  PNode* camera = new PNode();
+
+  State::getInstance()->setCamera(camera, emitter);
+
+  camera->setAbsCoor(Vector(10, 10, 0));
+
   mainLoop();
     
   // Kill the GL & SDL screens
-
   delete GraphicsEngine::getInstance();
   // And quit

orxonox/branches/physics/src/subprojects/particles/framework.h

@@ -31 +31 @@
 
 bool mainLoop();
-bool draw();
-bool tick();
+bool draw(float dt);
+float tick();
 bool keyHandler();