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

Timestamp:

Jul 2, 2004, 11:36:56 AM (21 years ago)

Author:

chris

Message:

orxonox/branches/chris: Trunk remerged into my branch started on SDL reconfiguration

File:

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

orxonox/branches/chris/src/orxonox.cc

@@ -24 +24 @@
 */
 
-/* class definition header */
+#include <iostream>
+#include <cstdio>
+#include <GL/glut.h>
+#include <SDL/SDL.h>
+
+#include "environment.h"
+#include "world.h"
+#include "input_output.h"
+#include "data_tank.h"
+#include "stdincl.h"
+#include "player.h"
+#include "npc.h"
+#include "shoot_laser.h"
+
 #include "orxonox.h"
 
-
 using namespace std;
 
 
-
 Orxonox::Orxonox () 
 {
@@ -40 +51 @@
 
 Orxonox::~Orxonox () 
-{
-  glutSetKeyRepeat(GLUT_KEY_REPEAT_ON);
-}
+{}
 
 
@@ -63 +72 @@
 //int Orxonox::offsetY = 0;
 
+
 Orxonox* Orxonox::getInstance (void)
 {
@@ -73 +83 @@
 int Orxonox::globalInit (int argc, char** argv) 
 {
-  glutInit(&argc, argv);
-  glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH);
+  if( SDL_Init (SDL_INIT_EVERYTHING) == -1)
+  {
+    printf ("Could not SDL_Init(): %s\n", SDL_GetError());
+    return -1;
+  }
+  
+  // Set video mode
+  // TO DO: parse arguments for settings
+  SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
+  SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
+  SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
+  SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
+  
+  int bpp = 16;
+  int width = 640;
+  int height = 480;
+  Uint32 flags = SDL_OPENGL | SDL_GL_DOUBLEBUFFER;
+  
+  if( (screen = SDL_SetVideoMode (width, height, bpp, flags)) == NULL)
+  {
+    printf ("Could not SDL_SetVideoMode(%d, %d, %d, %d): %s\n", width, height, bpp, flags, SDL_GetError());
+    SDL_Quit();
+    return -1;
+  }
+  
+  // Set window labeling
+  // TO DO: Add version information to caption
+  SDL_WM_SetCaption( "Orxonox", "Orxonox");
+  
+  // TO DO: Create a cool icon and use it here
+  // SDL_WM_SetIcon(SDL_Surface *icon, Uint8 *mask);  
+
+  // OpenGL stuff
+  // (Is this all we initialize globally???)
   glEnable(GL_DEPTH_TEST);
-  glutInitWindowSize(500, 500);
-  //glutFullScreen();
-  glutInitWindowPosition(100, 100);
-  glutCreateWindow("orxOnox");
   glShadeModel(GL_FLAT);
-  /* window event dispatchers */
-  glutDisplayFunc(display);
-  glutReshapeFunc(reshape);
-  glutKeyboardFunc(keyboard);
-  glutKeyboardUpFunc(upKeyboard);
-
-  glutTimerFunc(1000, timeSlice, 0);
-  cout << "measuring performance...";
+  
+//  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...";
+
 }
 
@@ -138 +184 @@
   io->setPlayerStep(19.2/fps); /* set player to propper speed */
   localPlayer->shootLaser->setShootStep(20.0/fps); /* set shoot speed */
-  localPlayer->shootRocket->setShootStep(20.0/fps); /* set shoot speed */
   world->setWorldStep(7.0/fps); /* set the speed of the terrain moving away */
   fps = 0;
@@ -261 +306 @@
   (*world).drawWorld();
 
-  glutSwapBuffers();
-} 
+  SDL_Flip( screen);
+}
 
 
@@ -320 +365 @@
 }
 
+void Orxonox::mainLoop()
+{
+  // This is where everything is run
+  while( !bQuitOrxonox)
+  {
+    // Process input
+    // Process time
+    // Process collision
+    // Draw
+    display();
+  }
+}
 
 int main (int argc, char** argv) 
 {  
   Orxonox *orx = Orxonox::getInstance();
-  (*orx).globalInit(argc, argv);
+  if( (*orx).globalInit(argc, argv) == -1)
+  {
+    printf("! Global initialization failed\n");
+    return -1;
+  }
+  
   //(*orx).menuInit(); pb: directly jump to the game, no menu
-  (*orx).gameInit();
-
-  glutMainLoop();  
+  
+  if( (*orx).gameInit() == -1)
+  {
+    printf("! Game initialization failed\n");
+    return -1;
+  }
+
+  (*orx).mainLoop();
+  
   return 0;
 }
+