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

Timestamp:

Dec 4, 2004, 6:05:54 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/images: ability to readIn jpg-files

File:

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

orxonox/branches/images/importer/material.h

@@ -16 +16 @@
 
 // IMAGE LIBS //
+extern "C"{         // This has to be done, because not a c++ lib
 #include <jpeglib.h>
-
+}
 //! Class to handle Materials.
 class Material
@@ -63 +64 @@
   void setBump(char* bump);
 
-  // TEXTURING
-  bool loadBMP (char* bmpName, GLuint* texture);
 
  private:
+  struct tImageJPG
+  {
+    int rowSpan;
+    int sizeX;
+    int sizeY;
+    unsigned char *data;
+  };
+
+
   char* name;
   int illumModel;
@@ -76 +84 @@
   Material* nextMat; //!< pointer to the Next Material of the List. NULL if no next exists.
 
+  // TEXTURING
+  bool loadBMP (char* bmpName, GLuint* texture);
+  bool loadJPG (char* jpgName, GLuint* texture);
+  void decodeJPG(jpeg_decompress_struct* cinfo, tImageJPG *pImageData);
 };
 #endif