Changeset 3621 in orxonox.OLD

Timestamp:

Mar 21, 2005, 6:10:40 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: doxygen-tags and some minor stuff

Location:

orxonox/trunk/src

Files:

• lib/graphics/graphics_engine.cc (modified) (5 diffs)
• story_entities/world.cc (modified) (1 diff)

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

@@ -33 +33 @@
 
   this->listModes();
-
-
 }
 
+/**
+   \brief The Pointer to this GraphicsEngine
+*/
 GraphicsEngine* GraphicsEngine::singletonRef = NULL;
 
+/**
+   \returns A pointer to this GraphicsEngine
+*/
 GraphicsEngine* GraphicsEngine::getInstance()
 {
@@ -97 +101 @@
   
   // TO DO: Create a cool icon and use it here
-  // SDL_WM_SetIcon(SDL_Surface *icon, Uint8 *mask);  
+  SDL_WM_SetIcon(SDL_LoadBMP("../data/pictures/orxonox-icon32x32.bmp"), NULL);  
 
+  // Enable default GL stuff
+  glEnable(GL_DEPTH_TEST);
 }
 
-
+/**
+   \brief Sets the GL-attributes
+*/
 int GraphicsEngine::setGLattribs(void)
 {
@@ -121 +129 @@
 }
 
+/**
+   \brief sets the Resolution of the Screen to display the Graphics to.
+   \param width The width of the window
+   \param height The height of the window
+   \param bpp bits per pixel
+*/
 int GraphicsEngine::setResolution(int width, int height, int bpp)
 {
@@ -128 +142 @@
   
   printf ("ok\n");
-  if((this->screen = SDL_SetVideoMode (this->resolutionX, this->resolutionY, this->bitsPerPixel, this->videoFlags)) == NULL)
+  if((this->screen = SDL_SetVideoMode(this->resolutionX, this->resolutionY, this->bitsPerPixel, this->videoFlags)) == NULL)
     {
       PRINTF(1)("Could not SDL_SetVideoMode(%d, %d, %d, %d): %s\n", this->resolutionX, this->resolutionY, this->bitsPerPixel, this->videoFlags, SDL_GetError());
@@ -137 +151 @@
 }
 
+/**
+   \brief Signalhandler, for when the resolution has changed
+   \param resizeInfo SDL information about the size of the new screen size
+*/
 int GraphicsEngine::resolutionChanged(SDL_ResizeEvent* resizeInfo)
 {

orxonox/trunk/src/story_entities/world.cc

@@ -167 +167 @@
   WorldInterface* wi = WorldInterface::getInstance();
   wi->init(this);
-
-  // Enable default GL stuff
-  glEnable(GL_DEPTH_TEST);
-
 }