Changeset 8034 in orxonox.OLD for branches/water/src/lib/graphics

Timestamp:

May 31, 2006, 4:19:33 PM (19 years ago)

Author:

stefalie

Message:

water: refraction doesnt work with reflection

Location:

branches/water/src/lib/graphics/importer

Files:

• material.cc (modified) (1 diff)
• material.h (modified) (1 diff)

branches/water/src/lib/graphics/importer/material.cc

@@ -390 +390 @@
  * @param textureNumber select the texture unit that will be overwritten
 */
-void Material::renderToTexture(unsigned int textureNumber, GLenum target, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height)
+void Material::renderToTexture(unsigned int textureNumber, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
   glActiveTexture(Material::glTextureArbs[textureNumber]);
   glEnable(GL_TEXTURE_2D);
   glBindTexture(GL_TEXTURE_2D, this->textures[textureNumber].getTexture());
-  glCopyTexSubImage2D(target, 0, xoffset, yoffset, 0, 0, width, height);
+  glCopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
 }
 

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

@@ -58 +58 @@
     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 xoffset, GLint yoffset, GLsizei width, GLsizei height);
+    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);