Changeset 4297 in orxonox.OLD for orxonox/branches/physics/src/subprojects/particles/framework.cc

Timestamp:

May 26, 2005, 1:49:41 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/physics: framework is a class now

File:

• orxonox/branches/physics/src/subprojects/particles/framework.cc (modified) (7 diffs)

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

@@ -25 +25 @@
 #include "graphics_engine.h"
 #include "resource_manager.h"
-
-
+#include "camera.h"
 
 int verbose;
 
-bool mainLoop()
+bool Framework::mainLoop()
 {
   while(true)
     {
+      // keyhandler returns false if sdl gets quit by some event
       if (!keyHandler())
         return false;
 
+      // tick the scene
       float dt = tick();
+
       // Draw the scene
-      draw(dt);
-      
+      draw(dt);      
     }
-
-}
-
-
-bool draw(float dt)
+}
+
+
+bool Framework::draw(float dt)
 {
   
@@ -53 +53 @@
   glLoadIdentity(); // Reset the view
   
-  glMatrixMode(GL_PROJECTION);
-  glLoadIdentity();     
-  gluPerspective(45.0f,500/375,0.1f,dist * 5.0f);
-  gluLookAt (0, dist , dist, 0,0,0, up.x,up.y,up.z);
-  
   ParticleEngine::getInstance()->draw(dt);
+
+  camera->apply();
   
   SDL_GL_SwapBuffers(); // Swap the buffers
 
 }
-float tick()
+float Framework::tick()
 {
   currFrame = SDL_GetTicks();
@@ -82 +79 @@
 
 
-bool keyHandler()
+bool Framework::keyHandler()
 {
   // This is the main loop for the entire program and it will run until done==TRUE
@@ -213 +210 @@
 
 
-int main(int argc, char *argv[])
-{
-  verbose = 3;
-
+ Framework::Framework()
+{
 
   // Create a new OpenGL window with the title "Cone3D Basecode" at
@@ -268 +263 @@
   ParticleSystem* system = new ParticleSystem(100000, PARTICLE_SPRITE);
   system->setLifeSpan(5);
-  system->setConserve(.8);
+  system->setConserve(1);
   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(0 , 0, -1), 0, 100, 1);
+  ParticleEmitter* emitter = new ParticleEmitter(Vector(0 , 1, 0), 0, 100, .01);
   emitter->setType(EMITTER_DOT  );
   emitter->setSize(0);
@@ -281 +276 @@
   ParticleEngine::getInstance()->addConnection(emitter, system);
 
-  PNode* camera = new PNode();
+  camera = new Camera();
 
   State::getInstance()->setCamera(camera, emitter);
@@ -287 +282 @@
   camera->setAbsCoor(Vector(10, 10, 0));
 
-  mainLoop();
-    
+}
+
+Framework::~Framework()
+{
+  delete GraphicsEngine::getInstance();
+
+}
+
+int main(int argc, char *argv[])
+{
+  verbose = 3;
+  Framework* framework =new Framework();
+  framework->mainLoop();
+
+  delete framework;
   // Kill the GL & SDL screens
-  delete GraphicsEngine::getInstance();
   // And quit
   return 0;