Changeset 3094 in orxonox.OLD for orxonox/branches/images/importer/material.h

Timestamp:

Dec 5, 2004, 1:55:40 AM (21 years ago)

Author:

bensch

Message:

orxonox/branches/images: importing uncompressed TGA-files

File:

• orxonox/branches/images/importer/material.h (modified) (3 diffs)

orxonox/branches/images/importer/material.h

@@ -61 +61 @@
   {
     int rowSpan;
-    unsigned long sizeX;
-    unsigned long sizeY;
+    GLuint width;
+    GLuint height;
+    GLuint bpp;
+    GLuint type;
     GLubyte *data;
   };
@@ -86 +88 @@
 
   // TEXTURING
+  bool loadTexToGL (Image* pImage, GLuint* texture);
+
   bool loadImage(char* imageName, GLuint* texture);
 
@@ -93 +97 @@
   void decodeJPG(jpeg_decompress_struct* cinfo, Image *pImageData);
 
-  bool loadTexToGL (Image* pImage, GLuint* texture);
+  /// 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);
+
 };
 #endif