Changeset 3336 in orxonox.OLD for orxonox/branches/parenting/src/orxonox.cc

Timestamp:

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

Author:

patrick

Message:

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

File:

• orxonox/branches/parenting/src/orxonox.cc (modified) (3 diffs)

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;
+}