Changeset 2068 in orxonox.OLD for orxonox/branches/chris/src/orxonox.cc

Timestamp:

Jul 5, 2004, 10:43:49 AM (21 years ago)

Author:

chris

Message:

orxonox/branches/chris: First snippet of the totally revamped base system… perhaps a bit confusing at the moment, but when finished theoretically you only have to subclass the worldentity and track classes to create the game content (even the menu will be a WorldEntity I suppose)

File:

• orxonox/branches/chris/src/orxonox.cc (modified) (7 diffs)

orxonox/branches/chris/src/orxonox.cc

@@ -21 +21 @@
    ### File Specific:
    main-programmer: Patrick Boenzli
-   co-programmer:
+   co-programmer: Christian Meyer
 */
+
+#ifdef __WIN32__
+#include <windows.h>
+#endif
 
 #include <iostream>
@@ -51 +55 @@
 
 Orxonox::~Orxonox () 
-{}
-
-
-/* this is a singleton class to prevent dublicates */
+{
+        Orxonox::singleton_ref = NULL;
+        if( world != NULL) delete world;
+        if( localinput != NULL) delete world;
+        if( localcamera != NULL) delete camera;
+        if( resources != NULL) delete resources;
+}
+
+
+/* this is a singleton class to prevent duplicates */
 Orxonox* Orxonox::singleton_ref = 0;
 World* Orxonox::world = 0;
-InputOutput* Orxonox::io = 0;
-Player* Orxonox::localPlayer = 0;
 bool Orxonox::pause = false;
-bool Orxonox::inputEnabled = false;
-bool Orxonox::upWeGo = false;
-bool Orxonox::downWeGo = false;
-bool Orxonox::rightWeGo = false;
-bool Orxonox::leftWeGo = false;
-bool Orxonox::shoot1 = false;
-int Orxonox::fps = 0;
-int Orxonox::alpha = 0;
-int Orxonox::beta = 0;
-//int Orxonox::offsetX = 0;
-//int Orxonox::offsetY = 0;
 
 
@@ -80 +77 @@
 }
 
-
-int Orxonox::globalInit (int argc, char** argv) 
-{
+void Orxonox::get_config_file (int argc, char** argv)
+{
+        char* path;
+        #ifdef __WIN32__
+        path = getenv("");
+        #else
+        path = getenv("HOME");
+        #endif
+        
+        if( path != NULL) strcpy (configfilename, path);
+        strcat (configfilename, "/.orxonox.conf");
+}
+
+int Orxonox::init (int argc, char** argv)
+{
+                // parse command line
+                // config file
+                
+        get_config_file (argc, argv);
+        
+                // initialize SDL
+  printf("> Initializing SDL\n");
   if( SDL_Init (SDL_INIT_EVERYTHING) == -1)
   {
@@ -89 +105 @@
   }
   
+        // initialize everything
+  printf("> Initializing video\n");
+        if( init_video () == -1) return -1;
+  printf("> Initializing sound\n");
+        if( init_sound () == -1) return -1;
+  printf("> Initializing input\n");
+        if( init_input () == -1) return -1;
+  printf("> Initializing networking\n");
+        if( init_networking () == -1) return -1;
+  printf("> Initializing resources\n");
+        if( init_resources () == -1) return -1;
+  printf("> Initializing world\n");
+        if( init_world () == -1) return -1;
+        
+        return 0;
+}
+
+int Orxonox::init_video () 
+{
   // Set video mode
   // TO DO: parse arguments for settings
@@ -117 +152 @@
   // OpenGL stuff
   // (Is this all we initialize globally???)
+  glClearColor(0.0, 0.0, 0.0, 0.0);
   glEnable(GL_DEPTH_TEST);
   glShadeModel(GL_FLAT);
   
-//  glutInit(&argc, argv);
-//  glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH);
-//  glutInitWindowSize(500, 500);
-//  //glutFullScreen();
-//  glutInitWindowPosition(100, 100);
-//  glutCreateWindow("OrxonoX");
-//  /* window event dispatchers */
-//  glutDisplayFunc(display);
-//  glutReshapeFunc(reshape);
-//  glutKeyboardFunc(keyboard);
-//  glutKeyboardUpFunc(upKeyboard);
-//
-//  glutTimerFunc(1000, timeSlice, 0);
-//  cout << "measuring performance...";
-
-}
-
-
-int Orxonox::menuInit (void)
-{
-  glClearColor(0.0, 0.0, 0.0, 0.0);
-}
-
-
-int Orxonox::gameInit (void) 
-{
-  glClearColor(0.0, 0.0, 0.0, 0.0);
-  
-  /* world init, shouldnt be done here later */
-  world = new World;
-  (*world).initEnvironement();
-  localPlayer = new Player;
-  localPlayer->setPosition(0.0, -10.0, 3.0);
-  localPlayer->setCollisionRadius(2.0);
-  io = new InputOutput(world, localPlayer);
-  (*world).addPlayer(localPlayer);
-  Environment *env = new Environment;
-  (*world).addEnv(env);
-  NPC* npc = new NPC;
-  npc->setPosition(3.0, 0.0, 3.0);
-  npc->setCollisionRadius(1.0);
-  world->addNPC(npc);
-
-  NPC* npc2 = new NPC;
-  npc2->setPosition(-2.0, 10.0, 3.0);
-  npc2->setCollisionRadius(1.0);
-  world->addNPC(npc2);
-
-  glutSpecialFunc(specFunc); 
-  glutSpecialUpFunc(releaseKey);
-
-  glutIdleFunc(continousRedraw);
-  //cout << "Orxonox::gameInit" << endl;
-}
-
-
-/* this is the time triggered function. heart beat*/
-
-void Orxonox::timeSlice(int value)
-{
-  cout << "got " << fps << " fps" << endl;
-  /* this is very very unsafe: io could be uninit */
-  io->setPlayerStep(19.2/fps); /* set player to propper speed */
-  localPlayer->shootLaser->setShootStep(20.0/fps); /* set shoot speed */
-  world->setWorldStep(7.0/fps); /* set the speed of the terrain moving away */
-  fps = 0;
-  inputEnabled = true;
-  glutTimerFunc(1000, timeSlice, 0);
-}
-
-
-
-void Orxonox::keyboard(unsigned char key, int x, int y)
-{
-  switch(key) {
-
-    /* perspectiv control */
-  case 'w':
-    beta -= 1;
-    break;
-  case 's':
-    beta += 1;
-    break;
-  case 'a':
-    alpha -= 1;
-    break;
-  case 'd':
-    alpha += 1;
-    break;
-
-    /* game controls */
-  case 'p':
-    if (pause) 
-      {
-        cout << "unset pause" << endl;
-        glutIdleFunc(continousRedraw);
-        pause = false;
-      }
-    else 
-      {
-        cout << "set pause" << endl;
-        glutIdleFunc(NULL);
-        pause = true;
-      }
-    break;
-  case 32:
-    shoot1 = true;
-    break;
-  case 27:
-  case 'q':
-    quitGame();
-    break;
-  }
-}
-
-
-void Orxonox::upKeyboard(unsigned char key, int x, int y) 
-{
-  switch(key) {
-  case 32:
-    shoot1 = false;
-    break;
-  }
-}
-
+  // create camera
+  localcamera = new Camera();
+  
+  return 0;
+}
+
+int Orxonox::init_sound () 
+{
+        printf("Not yet implemented\n");
+        return 0;
+}
+
+int Orxonox::init_input () 
+{
+        // create localinput
+        localinput = new CommandNode( configfilename);
+        
+        return 0;
+}
+
+
+int Orxonox::init_networking () 
+{
+        printf("Not yet implemented\n");
+        return 0;
+}
+
+int Orxonox::init_resources () 
+{
+        printf("Not yet implemented\n");
+        return 0;
+}
+
+int Orxonox::init_world () 
+{
+        printf("Not yet implemented\n");
+        return 0;
+}
 
 void Orxonox::quitGame() 
 {
+        bQuitOrxonox = true;
   //cout << "finished garbage colletion, quitting..." << endl;
-  exit(0);
-}
-
-
-void Orxonox::releaseKey(int key, int x, int y) 
-{  
-  switch(key) {
-  case GLUT_KEY_UP:
-    upWeGo = false;
-    break;
-  case GLUT_KEY_DOWN:
-    downWeGo = false;
-    break;
-  case GLUT_KEY_RIGHT:
-    rightWeGo = false;
-    break;
-  case GLUT_KEY_LEFT:
-    leftWeGo = false;
-    break;
-  }
-}
-
-
-/** 
-   \brief special keys function. called by glut
-   
-   Here are all special key function defined.
-*/
-void Orxonox::specFunc(int key, int x, int y)
-{
-  switch(key) {
-    /* spacecraft controls */
-  case GLUT_KEY_UP:
-    upWeGo = true;
-    break;
-  case GLUT_KEY_DOWN:
-    downWeGo = true;
-    break;
-  case GLUT_KEY_RIGHT:
-    rightWeGo = true;
-    break;
-  case GLUT_KEY_LEFT:
-    leftWeGo = true;
-    break;
-  }
-}
-
-
-void Orxonox::display() 
-{
-  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-  glColor3f(0.0, 0.5, 0.6);
-  glLoadIdentity();
-  gluLookAt(0.0, -14.0, 15.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0);
-  (*world).drawWorld();
-
-  SDL_Flip( screen);
-}
-
-
-void Orxonox::continousRedraw()
-{
-  /* increment the frames-per-second counter*/
-  fps++;
-  /* check for collisions */
-  world->detectCollision();
-
-  /* check for input to pass it over */
-  if ( !pause && inputEnabled && 
-       (rightWeGo || leftWeGo || upWeGo || downWeGo || shoot1)) 
-    {
-      if (upWeGo)
-        (*io).goUp();
-      if (downWeGo)
-      (*io).goDown();
-      if (rightWeGo)
-        (*io).goRight();
-      if (leftWeGo)
-      (*io).goLeft();
-      if (shoot1) 
-        (*io).shoot();
-    }
-  /* request repaint */
-  glutPostRedisplay();
-  //cout << "Orxonox::continousRedraw" << endl;
-}
-
-
-void Orxonox::reshape (int w, int h)
-{
-  glViewport(0, 0, (GLsizei) w, (GLsizei) h);
-  glMatrixMode(GL_PROJECTION);
-  glLoadIdentity();
-  glFrustum(-1.0, 1.0, -1.0, 1.0, 1.5, 200.0);
-  glMatrixMode(GL_MODELVIEW);
-  glLoadIdentity(); //pb why a second time?
-}
-
-
-void Orxonox::testTheShit() 
-{
-  //Player* pl = new Player;
-  //(*pl).setPosition(1, 1, 1);
-  //(*world).addPlayer(pl);
-  
-  //NPC* nl = new NPC;
-  //(*world).addNPC(nl);
-  //(*world).addNPC(nl);
-  //(*world).addNPC(nl);
-  //(*world).addNPC(nl);
-  //(*world).addNPC(nl);
-  //(*world).addNPC(nl);
-  //(*world).testThaTest();
-}
-
+}
 void Orxonox::mainLoop()
 {
@@ -370 +205 @@
   while( !bQuitOrxonox)
   {
+        // Network
+        synchronize();
     // Process input
+    handle_input();
     // Process time
+    time_slice();
     // Process collision
+    collision();
     // Draw
     display();
   }
+}
+
+void Orxonox::event_handler (SDL_Event* event)
+{
+        // Handle special events such as reshape, quit, focus changes
+}
+
+void Orxonox::synchronize ()
+{
+        // Get remote input
+        // Update synchronizables
+}
+
+void Orxonox::handle_input ()
+{
+        // localinput
+                localinput.process();
+        // remoteinput
+}
+
+void Orxonox::time_slice ()
+{
+        Uint32 curframe = SDL_GetTicks();
+        if( !pause)
+        {
+                world->time_slice (curframe - lastframe);
+                world->update ();
+                localcamera->time_slice (curframe - lastframe);
+        }
+        lastframe = curframe;
+}
+
+void Orxonox::collision ()
+{
+        world->collide ();
+}
+
+void Orxonox::display ()
+{
+                // clear buffer
+        glClear( GL_COLOR_BUFFER_BIT, GL_DEPTH_BUFFER_BIT);
+                // set camera
+        localcamera->apply ();
+                // draw world
+        world->draw ();
+                // draw HUD
+                // flip buffers
+        SDL_Flip( screen);
+}
+
+Camera* Orxonox::get_camera ()
+{
+        return localcamera;
+}
+
+Camera* Orxonox::get_world ()
+{
+        return world;
 }
 
@@ -381 +279 @@
 {  
   Orxonox *orx = Orxonox::getInstance();
-  if( (*orx).globalInit(argc, argv) == -1)
-  {
-    printf("! Global initialization failed\n");
+  
+  if( (*orx).init(argc, argv) == -1)
+  {
+    printf("! Orxonox initialization failed\n");
     return -1;
   }
-  
-  //(*orx).menuInit(); pb: directly jump to the game, no menu
-  
-  if( (*orx).gameInit() == -1)
-  {
-    printf("! Game initialization failed\n");
-    return -1;
-  }
-
+
+        lastframe = SDL_GetTicks();
+        
   (*orx).mainLoop();
   
   return 0;
 }
-