Changeset 3336 in orxonox.OLD for orxonox

Timestamp:

Jan 5, 2005, 2:05:31 AM (20 years ago)

Author:

patrick

Message:

orxonox/branches/parenting: enhanced graphics initialisation. minor change

Location:

orxonox/branches/parenting/src

Files:

• campaign.cc (modified) (1 diff)
• environment.cc (modified) (3 diffs)
• orxonox.cc (modified) (3 diffs)
• orxonox.h (modified) (1 diff)
• world.h (modified) (2 diffs)

orxonox/branches/parenting/src/campaign.cc

@@ -89 +89 @@
   while( se != NULL && this->running)
     {
-      se->displayLoadScreen();
+      //se->displayLoadScreen();
       se->load();
       se->init();
-      se->releaseLoadScreen();
+      //se->releaseLoadScreen();
       se->start();
       se->destroy();

orxonox/branches/parenting/src/environment.cc

@@ -29 +29 @@
 Environment::Environment () : WorldEntity()
 {
-  //this->model = new Object("reaplow.obj");
+  this->model = new Object("reaplow.obj");
 }
 
@@ -36 +36 @@
 Environment::~Environment () 
 {
-  //delete this->model;
+  delete this->model;
 }
 
@@ -59 +59 @@
   
   glMatrixMode(GL_MODELVIEW);
-  // this->model->draw();
+  this->model->draw();
 }
 

orxonox/branches/parenting/src/orxonox.cc

@@ -123 +123 @@
   int width = 640;
   int height = 480;
-  Uint32 flags = SDL_HWSURFACE | SDL_OPENGL | SDL_GL_DOUBLEBUFFER;
-  
-  if((screen = SDL_SetVideoMode (width, height, bpp, flags)) == NULL)
+  //Uint32 flags = SDL_HWSURFACE | SDL_OPENGL | SDL_GL_DOUBLEBUFFER; /* \todo: SDL_OPENGL doen't permit to load images*/
+  //Uint32 flags = SDL_HWSURFACE | SDL_GL_DOUBLEBUFFER;
+
+  Uint32 videoFlags = SDL_OPENGL | SDL_HWPALETTE | SDL_RESIZABLE;
+
+  /* query SDL for information about our video hardware */
+  const SDL_VideoInfo* videoInfo = SDL_GetVideoInfo ();
+  
+  if( videoInfo == NULL)
+    {
+      printf ("Orxonox::initVideo() - Failed getting Video Info :%s\n", SDL_GetError()); 
+      SDL_Quit ();
+    }
+  if( videoInfo->hw_available)
+    videoFlags |= SDL_HWSURFACE;
+  else
+    videoFlags |= SDL_SWSURFACE;
+  /*
+  if(VideoInfo -> blit_hw)                            
+    VideoFlags |= SDL_HWACCEL;
+  */
+  
+  if((this->screen = SDL_SetVideoMode (width, height, bpp, videoFlags)) == NULL)
   {
-    printf("Could not SDL_SetVideoMode(%d, %d, %d, %d): %s\n", width, height, bpp, flags, SDL_GetError());
+    printf("Could not SDL_SetVideoMode(%d, %d, %d, %d): %s\n", width, height, bpp, videoFlags, SDL_GetError());
     SDL_Quit();
     return -1;
@@ -139 +159 @@
 
   // OpenGL stuff
-  // (Is this all we initialize globally???)
   glClearColor(0.0, 0.0, 0.0, 0.0);
   glEnable(GL_DEPTH_TEST);
@@ -311 +330 @@
 
 
+SDL_Surface* Orxonox::getScreen ()
+{
+  return this->screen;
+}
 
 

orxonox/branches/parenting/src/orxonox.h

@@ -68 +68 @@
   Camera* getCamera();
   World* getWorld();
+  SDL_Surface* getScreen ();
   
   //void mainLoop();

orxonox/branches/parenting/src/world.h

@@ -49 +49 @@
   void unload ();
   bool command (Command* cmd);
+  virtual void displayLoadScreen();
+  virtual void releaseLoadScreen();
   
   void setTrackLen (Uint32 tracklen);
@@ -78 +80 @@
   int debugWorldNr;
   GLuint objectList;
+  SDL_Surface *loadImage;
 
   WorldEntity* localPlayer;