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

Timestamp:

May 31, 2006, 4:52:34 PM (18 years ago)

Author:

bensch

Message:

trunk: merged the water back
merged with command
svn merge -r7798:HEAD ​https://svn.orxonox.net/orxonox/branches/water .

conflicts are all resolved

File:

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

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

@@ -30 +30 @@
 
     bool select () const;
+    bool activateTextureUnit(unsigned int textureNumber);
+    static void unselect();
 
     void setIllum (int illum);
@@ -55 +57 @@
     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);
+    void renderToTexture(unsigned int textureNumber, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
 
     void setAmbientMap(const std::string& aMap, GLenum target = GL_TEXTURE_2D);