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

Timestamp:

Dec 5, 2004, 12:47:33 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/images: moved things to where they belong

File:

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

orxonox/branches/images/importer/material.h

@@ -31 +31 @@
   Material* search (char* mtlName);
   bool select (void);
-
-  GLuint diffuseTexture;
-  GLuint ambientTexture;
-  GLuint specularTexture;
-  
-  bool diffuseTextureSet;
-  bool ambientTextureSet;
-  bool specularTextureSet;
 
   void setName (char* mtlName);
@@ -82 +74 @@
   float shininess;
   float transparency;
+
+  GLuint diffuseTexture;
+  GLuint ambientTexture;
+  GLuint specularTexture;
+  
+  bool diffuseTextureSet;
+  bool ambientTextureSet;
+  bool specularTextureSet;
+
   Material* nextMat; //!< pointer to the Next Material of the List. NULL if no next exists.