Changeset 3454 in orxonox.OLD for orxonox/trunk/src/importer/texture.h

Timestamp:

Mar 3, 2005, 6:35:04 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk/importer: doxygen-tags

File:

• orxonox/trunk/src/importer/texture.h (modified) (4 diffs)

orxonox/trunk/src/importer/texture.h

@@ -11 +11 @@
 
 #include "../stdincl.h"
-extern int verbose;
 #ifdef HAVE_SDL_SDL_IMAGE_H
 #include <SDL/SDL_image.h>
@@ -65 +64 @@
     GLubyte *data;  //!< The Image Data comes here! DANGER: uncompressed data.
   };
-  Image* pImage;
-  GLuint texture;
-  SDL_Surface* map;
+  Image* pImage;    //!< The data of an Image
+  GLuint texture;   //!< The Texture-ID of opengl from this Texture.
+  SDL_Surface* map; //!< The map SDL initializes for this element.
   char* searchTextureInPaths(char* texName) const;
   inline void swap(unsigned char &a, unsigned char &b);
@@ -73 +72 @@
   Texture(void);
   ~Texture(void);
-
-  inline GLuint getTexture(void) {return this->texture;} //!< \returns The textureID of this texture.
+  /** \returns The textureID of this texture.  */
+  inline GLuint getTexture(void) {return this->texture;} 
   bool loadTexToGL (Image* pImage);
 
@@ -90 +89 @@
   bool loadCompressedTGA(const char * filename, FILE * fTGA);
 
-  bool loadPNG(const char* pngName, GLuint* texture);
+  bool loadPNG(const char* pngName);
 #endif