Changeset 3214 in orxonox.OLD for orxonox/trunk/src/orxonox.cc

Timestamp:

Dec 18, 2004, 3:28:01 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: cleaned up orxonox.cc, deleted unused code

File:

• orxonox/trunk/src/orxonox.cc (modified) (13 diffs)

orxonox/trunk/src/orxonox.cc

@@ -74 +74 @@
 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);
-    else strcpy (configfilename, "./");
-    strcat (configfilename, "/.orxonox.conf");*/
-  
   strcpy (configfilename, "orxonox.conf");
 }
@@ -176 +165 @@
 }
 
+
 /**
    \brief initializes the sound engine
@@ -187 +177 @@
 }
 
+
 /**
    \brief initializes input functions
@@ -198 +189 @@
 }
 
+
 /**
    \brief initializes network system
@@ -207 +199 @@
 }
 
+
 /**
    \brief initializes and loads resource files
@@ -215 +208 @@
   return 0;
 }
+
 
 /**
@@ -247 +241 @@
 }
 
+
 /**
    \brief exits Orxonox
@@ -255 +250 @@
 }
 
-/**
-   \brief this runs all of Orxonox
-*/
-void Orxonox::mainLoop()
-{
-  lastframe = SDL_GetTicks();
-  bQuitOrxonox = false;
-  // This is where everything is run
-  printf("Orxonox|Entering main loop\n");
-  while( !bQuitOrxonox)
-    {
-      // Network
-      synchronize();
-      // Process input
-      handle_input();
-      // Process time
-      time_slice();
-      // Process collision
-      collision();
-      // Draw
-      display();
-    }
-  printf("Orxonox|Exiting the main loop\n");
-}
+
 
 /**
@@ -288 +260 @@
   // Handle special events such as reshape, quit, focus changes
 }
-
-/**
-   \brief synchronize local data with remote data
-*/
-void Orxonox::synchronize ()
-{
-  // Get remote input
-  // Update synchronizables
-}
-
-/**
-   \brief run all input processing
-*/
-void Orxonox::handle_input ()
-{
-  // localinput
-  //localinput->process();
-  // remoteinput
-}
-
-/**
-   \brief advance the timeline
-*/
-void Orxonox::time_slice ()
-{
-  Uint32 curframe = SDL_GetTicks();
-  if( !pause)
-    {
-      Uint32 dt = curframe - lastframe;
-      
-      if(dt > 0)
-        {
-          float fps = 1000/dt;
-          printf("fps = %f\n", fps);
-        }
-      
-      world->time_slice (dt);
-      world->update ();
-      localcamera->time_slice (dt);
-    }
-  lastframe = curframe;
-}
-
-/**
-   \brief compute collision detection
-*/
-void Orxonox::collision ()
-{
-  world->collide ();
-}
+ 
 
 /**
@@ -354 +277 @@
 }
 
-/**
-   \brief render the current frame
-*/
-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_GL_SwapBuffers();
-}
 
 /**
@@ -379 +287 @@
 }
 
+
 /**
    \brief retrieve a pointer to the local CommandNode
@@ -388 +297 @@
 }
 
+
 /**
    \brief retrieve a pointer to the local World
@@ -396 +306 @@
   return world;
 }
+
+
+
 
 int main (int argc, char** argv)