Changeset 3344 in orxonox.OLD for orxonox/branches/parenting/src/importer/texture.h

Timestamp:

Jan 5, 2005, 5:50:07 PM (21 years ago)

Author:

bensch

Message:

orxonox/branches/parenting: importer: modularity improvement. Now Textures handle the texture-ID themselves and can be retrieved with the getTexture()-function

File:

• orxonox/branches/parenting/src/importer/texture.h (modified) (1 diff)

orxonox/branches/parenting/src/importer/texture.h

@@ -64 +64 @@
     GLubyte *data;  //!< The Image Data comes here! DANGER: uncompressed data.
   };
+  Image* pImage;
+  GLuint texture;
   char* searchTextureInPaths(char* texName) const;
   inline void swap(unsigned char &a, unsigned char &b);
  public:
+  Texture(void);
+  ~Texture(void);
 
-  bool loadTexToGL (Image* pImage, GLuint* texture);
+  GLuint getTexture(void);
+  bool loadTexToGL (Image* pImage);
 
-  bool loadImage(char* imageName, GLuint* texture);
+  bool loadImage(char* imageName);
 #ifndef HAVE_SDL_SDL_IMAGE_H
 
-  bool loadBMP (char* bmpName, GLuint* texture);
+  bool loadBMP (char* bmpName);
 
-  bool loadJPG (char* jpgName, GLuint* texture);
+  bool loadJPG (char* jpgName);
 
   /// TGA ///
 
-  bool loadTGA(const char * tgaName, GLuint* texture);
-  bool loadUncompressedTGA(const char * filename, FILE * fTGA, GLuint* texture);
-  bool loadCompressedTGA(const char * filename, FILE * fTGA, GLuint* texture);
+  bool loadTGA(const char * tgaName);
+  bool loadUncompressedTGA(const char * filename, FILE * fTGA);
+  bool loadCompressedTGA(const char * filename, FILE * fTGA);
 
   bool loadPNG(const char* pngName, GLuint* texture);