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

Timestamp:

Dec 4, 2004, 5:26:18 PM (21 years ago)

Author:

bensch

Message:

orxonox/branches/images: bring order to Chaos

File:

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

orxonox/branches/images/importer/material.h

@@ -15 +15 @@
 #include <fstream>
 
+// IMAGE LIBS //
+#include <jpeglib.h>
+
 //! Class to handle Materials.
 class Material
@@ -22 +25 @@
   Material (char* mtlName);
   Material* addMaterial(char* mtlName);
+  ~Material ();
+  void init(void);
 
-  void init(void);
-  ~Material ();
+  Material* search (char* mtlName);
+  bool select (void);
 
   GLuint diffuseTexture;
@@ -49 +54 @@
   void setTransparency (char* trans);
 
+
+
+
   // MAPPING //
   void setDiffuseMap(char* dMap);
@@ -55 +63 @@
   void setBump(char* bump);
 
+  // TEXTURING
   bool loadBMP (char* bmpName, GLuint* texture);
-
-
-  Material* search (char* mtlName);
-
-  bool select (void);
-
-  Material* nextMat; //!< pointer to the Next Material of the List. NULL if no next exists.
 
  private:
@@ -72 +74 @@
   float shininess;
   float transparency;
+  Material* nextMat; //!< pointer to the Next Material of the List. NULL if no next exists.
 
 };