Changeset 8697 in orxonox.OLD for branches/terrain/src/lib/graphics/importer/material.h

Timestamp:

Jun 21, 2006, 11:45:20 PM (19 years ago)

Author:

patrick

Message:

merged the terrain with the new trunk (MARK TERRAIN)

Location:

branches/terrain

Files:

• . (copied) (copied from trunk)
• src/lib/graphics/importer/material.h (modified) (1 diff)

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

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