Changeset 3617 in orxonox.OLD

Timestamp:

Mar 21, 2005, 2:59:30 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: little fix to graphicsEngine, now the different resolution-types are outputted. also there is a fix from debug.h all warnings are shown now

Location:

orxonox/trunk/src

Files:

• defs/debug.h (modified) (1 diff)
• lib/coord/p_node.cc (modified) (1 diff)
• lib/graphics/graphics_engine.cc (modified) (4 diffs)
• lib/graphics/graphics_engine.h (modified) (2 diffs)

orxonox/trunk/src/defs/debug.h

@@ -57 +57 @@
 #else /* DEBUG_SPECIAL_MODULE */
 // DEFINE MODULES \\
-#define DEBUG_MODULE_ORXONOX            0
-#define DEBUG_MODULE_WORLD              0
+#define DEBUG_MODULE_ORXONOX            2
+#define DEBUG_MODULE_WORLD              2
 #define DEBUG_MODULE_PNODE              2
-#define DEBUG_MODULE_WORLD_ENTITY       0
-#define DEBUG_MODULE_COMMAND_NODE       0
-#define DEBUG_MODULE_GRAPHICS           0
-
-#define DEBUG_MODULE_IMPORTER           0
-#define DEBUG_MODULE_TRACK_MANAGER      0
-#define DEBUG_MODULE_LIGHT              3
-#define DEBUG_MODULE_PLAYER             0
-#define DEBUG_MODULE_MATH               0
-
-#define DEBUG_MODULE_NULL_PARENT        0
+#define DEBUG_MODULE_WORLD_ENTITY       2
+#define DEBUG_MODULE_COMMAND_NODE       2
+#define DEBUG_MODULE_GRAPHICS           2
+
+#define DEBUG_MODULE_IMPORTER           2
+#define DEBUG_MODULE_TRACK_MANAGER      2
+#define DEBUG_MODULE_LIGHT              2
+#define DEBUG_MODULE_PLAYER             2
+#define DEBUG_MODULE_MATH               2
+
+#define DEBUG_MODULE_NULL_PARENT        2
 
 

orxonox/trunk/src/lib/coord/p_node.cc

@@ -424 +424 @@
 void PNode::update ()
 {
-  PRINTF(2)("PNode::update - %s - (%f, %f, %f)\n", this->objectName, this->absCoordinate->x, this->absCoordinate->y, this->absCoordinate->z);
+  PRINTF(4)("PNode::update - %s - (%f, %f, %f)\n", this->objectName, this->absCoordinate->x, this->absCoordinate->y, this->absCoordinate->z);
   // printf("%s", this->objectName);
   if(this->mode & PNODE_MOVEMENT )

orxonox/trunk/src/lib/graphics/graphics_engine.cc

@@ -30 +30 @@
 {
   this->setClassName ("GraphicsEngine");
-  
   this->initVideo();
+
+  this->listModes();
+
 
 }
@@ -60 +62 @@
 int GraphicsEngine::initVideo()
 {
-
+  // initialize SDL_VIDEO
   if (SDL_Init(SDL_INIT_VIDEO) == -1)
     {
-      printf ("could not initialize SDL Video\n");
+      PRINTF(1)("could not initialize SDL Video\n");
       //      return -1;
     }
+  // initialize SDL_GL-settings
+  this->setGLattribs();
+
+  // setting the Video Flags.
+  this->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(1)("Failed getting Video Info :%s\n", SDL_GetError()); 
+      SDL_Quit ();
+    }
+  if( videoInfo->hw_available)
+    this->videoFlags |= SDL_HWSURFACE;
+  else 
+    this->videoFlags |= SDL_SWSURFACE;
+  /*
+  if(VideoInfo -> blit_hw)                            
+    VideoFlags |= SDL_HWACCEL;
+  */
+
+  // setting up the Resolution
+  this->setResoulution(800, 600, 16);
+  
+  // Set window labeling
+  SDL_WM_SetCaption ("Orxonox " PACKAGE_VERSION, "Orxonox " PACKAGE_VERSION);
+  
+  // TO DO: Create a cool icon and use it here
+  // SDL_WM_SetIcon(SDL_Surface *icon, Uint8 *mask);  
+
+}
+
+
+int GraphicsEngine::setGLattribs(void)
+{
   // Set video mode
   // TO DO: parse arguments for settings
@@ -81 +119 @@
   SDL_GL_SetAttribute( SDL_GL_ACCUM_BLUE_SIZE, 0);
   SDL_GL_SetAttribute( SDL_GL_ACCUM_ALPHA_SIZE, 0);
-
-
-  //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;
-
-  this->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(1)("Orxonox::initVideo() - Failed getting Video Info :%s\n", SDL_GetError()); 
-      SDL_Quit ();
-    }
-  if( videoInfo->hw_available)
-    this->videoFlags |= SDL_HWSURFACE;
-  else 
-    this->videoFlags |= SDL_SWSURFACE;
-  /*
-  if(VideoInfo -> blit_hw)                            
-    VideoFlags |= SDL_HWACCEL;
-  */
-
-  this->setResoulution(800, 600, 16);
-  
-  // Set window labeling
-  SDL_WM_SetCaption ("Orxonox " PACKAGE_VERSION, "Orxonox " PACKAGE_VERSION);
-  
-  // TO DO: Create a cool icon and use it here
-  // SDL_WM_SetIcon(SDL_Surface *icon, Uint8 *mask);  
-
 }
 
@@ -129 +135 @@
 
 }
+
+
+
+
+
+
+
+/**
+   \brief outputs all the Fullscreen modes.
+*/
+void GraphicsEngine::listModes(void)
+{
+  /* Get available fullscreen/hardware modes */
+  this->videoModes=SDL_ListModes(NULL, SDL_FULLSCREEN|SDL_HWSURFACE);
+  
+  /* Check is there are any modes available */
+  if(this->videoModes == (SDL_Rect **)0){
+    PRINTF(1)("No modes available!\n");
+    exit(-1);
+  }
+  
+  /* Check if our resolution is restricted */
+  if(this->videoModes == (SDL_Rect **)-1){
+    PRINTF(1)("All resolutions available.\n");
+  }
+  else{
+    /* Print valid modes */
+    PRINT(0)("Available Resoulution Modes are\n");
+    for(int i = 0; this->videoModes[i]; ++i)
+      PRINT(0)(" |  %d x %d\n", this->videoModes[i]->w, this->videoModes[i]->h);
+  }
+  
+}

orxonox/trunk/src/lib/graphics/graphics_engine.h

@@ -24 +24 @@
 
   int initVideo();
+  int setGLattribs(void);
   int setResoulution(int width, int height, int bpp);
+  void listModes(void);
 
   static bool texturesEnabled;
@@ -39 +41 @@
   bool fullscreen;
   Uint32 videoFlags;
+
+  SDL_Rect **videoModes;
 };