Changeset 9869 in orxonox.OLD for trunk/src/lib/graphics/importer/material.h

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/lib/graphics/importer/material.h (modified) (3 diffs)

trunk/src/lib/graphics/importer/material.h

@@ -24 +24 @@
 class Material : public BaseObject
 {
+  ObjectListDeclaration(Material);
 public:
   Material (const std::string& mtlName = "");
   virtual ~Material ();
 
+  Material& operator=(const Material& material);
+
   void loadParams(const TiXmlElement* root);
-
-  Material& operator=(const Material& material);
 
   bool select () const;
@@ -53 +54 @@
   // MAPPING //
   void setDiffuseMap(const Texture& texture, unsigned int textureNumber = 0);
-  void setDiffuseMap(const TextureDataPointer& texturePointer, unsigned int textureNumber = 0);
+  void setDiffuseMap(const TextureData::Pointer& texturePointer, unsigned int textureNumber = 0);
   void setDiffuseMap(const std::string& dMap, GLenum target = GL_TEXTURE_2D, unsigned int textureNumber = 0);
   void setSDLDiffuseMap(SDL_Surface *surface, GLenum target = GL_TEXTURE_2D, unsigned int textureNumber = 0);
@@ -65 +66 @@
 
   const Texture& diffuseTexture(unsigned int i = 0) const { return this->textures[i]; };
-
-  static void addTexturePath(const std::string& pathName);
 
   static const std::string& blendFuncToString(GLenum blendFunc);