Changeset 8575 in orxonox.OLD for branches/gui/src/lib/graphics

Timestamp:

Jun 18, 2006, 11:01:40 PM (19 years ago)

Author:

bensch

Message:

gui: better names

File:

• branches/gui/src/lib/graphics/importer/material.h (modified) (1 diff)

branches/gui/src/lib/graphics/importer/material.h

@@ -59 +59 @@
   void setSpecularMap(const std::string& sMap, GLenum target = GL_TEXTURE_2D);
   void setBump(const std::string& bump);
-  GLuint getDiffuseTexture(unsigned int i = 0) const { return (this->textures.size() > i)? this->textures[i].getTexture() : 0; };
+
+  GLuint diffuseTextureID(unsigned int i = 0) const { return (this->textures.size() > i)? this->textures[i].getTexture() : 0; };
+
+  const Texture& diffuseTexture(unsigned int i = 0) const { return this->textures[i]; };
 
   static void addTexturePath(const std::string& pathName);