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

Timestamp:

Jul 10, 2004, 2:00:04 PM (21 years ago)

Author:

chris

Message:

orxonox/branches/chris: Finished the "GETITTOCOMPILE" project… compiling should work now, but linking is a different story

File:

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

orxonox/branches/chris/src/orxonox.cc

@@ -24 +24 @@
 */
 
-#ifdef __WIN32__
-#include <windows.h>
-#endif
-
-#include <iostream>
-#include <cstdio>
-#include <GL/glut.h>
-#include <SDL/SDL.h>
-
-#include "environment.h"
+#include "orxonox.h"
 #include "world.h"
-#include "input_output.h"
+#include "camera.h"
 #include "data_tank.h"
-#include "stdincl.h"
-#include "player.h"
-#include "npc.h"
-#include "shoot_laser.h"
-
-#include "orxonox.h"
+#include "command_node.h"
 
 using namespace std;
-
 
 Orxonox::Orxonox () 
@@ -59 +44 @@
         if( world != NULL) delete world;
         if( localinput != NULL) delete world;
-        if( localcamera != NULL) delete camera;
+        if( localcamera != NULL) delete localcamera;
         if( resources != NULL) delete resources;
 }
@@ -79 +64 @@
 void Orxonox::get_config_file (int argc, char** argv)
 {
-        char* path;
+/*      char* path;
         #ifdef __WIN32__
         path = getenv("");
@@ -88 +73 @@
         if( path != NULL) strcpy (configfilename, path);
         else strcpy (configfilename, "./");
-        strcat (configfilename, "/.orxonox.conf");
+        strcat (configfilename, "/.orxonox.conf");*/
+        
+        strcpy (configfilename, "./orxonox.conf");
 }
 
@@ -207 +194 @@
 void Orxonox::mainLoop()
 {
+        lastframe = SDL_GetTicks();
+
   // This is where everything is run
   while( !bQuitOrxonox)
@@ -237 +226 @@
 {
         // localinput
-                localinput.process();
+                localinput->process();
         // remoteinput
 }
@@ -261 +250 @@
 {
                 // clear buffer
-        glClear( GL_COLOR_BUFFER_BIT, GL_DEPTH_BUFFER_BIT);
+        glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
                 // set camera
         localcamera->apply ();
@@ -276 +265 @@
 }
 
-Camera* Orxonox::get_localinput ()
+CommandNode* Orxonox::get_localinput ()
 {
         return localinput;
 }
 
-Camera* Orxonox::get_world ()
+World* Orxonox::get_world ()
 {
         return world;
@@ -295 +284 @@
     return -1;
   }
-
-        lastframe = SDL_GetTicks();
         
   (*orx).mainLoop();