Changeset 3953 in orxonox.OLD for orxonox/branches/physics/src/lib/graphics/importer/material.h

Timestamp:

Apr 25, 2005, 9:29:41 AM (19 years ago)

Author:

patrick

Message:

orxonox/branches/physics: merged with trunk - with command svn merge -r 3866:HEAD

File:

• orxonox/branches/physics/src/lib/graphics/importer/material.h (modified) (3 diffs)

orxonox/branches/physics/src/lib/graphics/importer/material.h

@@ -14 +14 @@
 #endif /* HAVE_CONFIG_H */
 
+#ifndef NULL
+#define NULL 0
+#endif
+
 // FORWARD DEFINITIONS //
 class Texture;
@@ -22 +26 @@
 {
  public:
-  Material (char* mtlName = "");
-  Material* addMaterial(char* mtlName);
+  Material (const char* mtlName = NULL);
   ~Material ();
 
-  Material* search(char* mtlName);
   bool select (void);
 
-  void setName (char* mtlName);
+  void setName (const char* mtlName);
   char* getName (void);
   void setIllum (int illum);
@@ -70 +72 @@
   bool specularTextureSet;//!< Chekcs if the specular texture is Set.
 
-  Material* nextMat; //!< pointer to the Next Material of the List. NULL if no next exists.
-
-
 };
 #endif