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

Timestamp:

Jul 11, 2004, 3:14:52 PM (21 years ago)

Author:

chris

Message:

orxonox/branches/chris: Port to SDL complete. Everything compiles and the generated executable runs without crashing. Keyboard and mouse handling works. Drawing is messed up, possibly because of my incompetent Rotation class. Hence all you see at them moment is a pitch black screen. I added the makefile I used to compile it since bensch hasn't yet included SDL into the configure script.

File:

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

orxonox/branches/chris/src/orxonox.cc

@@ -72 +72 @@
         strcat (configfilename, "/.orxonox.conf");*/
         
-        strcpy (configfilename, "./orxonox.conf");
+        strcpy (configfilename, "orxonox.conf");
 }
 
@@ -119 +119 @@
   int width = 640;
   int height = 480;
-  Uint32 flags = SDL_OPENGL | SDL_GL_DOUBLEBUFFER;
+  Uint32 flags = SDL_HWSURFACE | SDL_OPENGL | SDL_GL_DOUBLEBUFFER;
   
   if( (screen = SDL_SetVideoMode (width, height, bpp, flags)) == NULL)
@@ -187 +187 @@
 {
         bQuitOrxonox = true;
-  //cout << "finished garbage colletion, quitting..." << endl;
 }
 void Orxonox::mainLoop()
 {
         lastframe = SDL_GetTicks();
-
+        bQuitOrxonox = false;
   // This is where everything is run
+printf("Orxonox|Entering main loop\n");
   while( !bQuitOrxonox)
   {
@@ -207 +207 @@
     display();
   }
+printf("Orxonox|Exiting the main loop\n");
 }
 
@@ -244 +245 @@
 }
 
+bool Orxonox::system_command (Command* cmd)
+{
+        if( !strcmp( cmd->cmd, "quit") && !cmd->bUp)
+        {
+                bQuitOrxonox = true;
+                return true;
+        }
+}
+
 void Orxonox::display ()
 {
@@ -254 +264 @@
                 // draw HUD
                 // flip buffers
-        SDL_Flip( screen);
+        SDL_GL_SwapBuffers();
 }
 
@@ -274 +284 @@
 int main (int argc, char** argv) 
 {  
+        printf(">>> Starting Orxonox <<<\n");
   Orxonox *orx = Orxonox::getInstance();