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

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

Location:

trunk/src/lib/graphics/importer

Files:

• material.cc (modified) (4 diffs)
• material.h (modified) (2 diffs)

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

@@ -108 +108 @@
       return true;
 
+/// !!  HACK !!! FIX THIS IN MODEL ///
+  else if (likely(Material::selectedMaterial != NULL))
+  {
+  Material::unselect();
+//     for(unsigned int i = 0; i < Material::selectedMaterial->textures.size(); ++i)
+//     {
+//         glActiveTexture(Material::glTextureArbs[i]);
+//         glBindTexture(GL_TEXTURE_2D, 0);
+//         glDisable(GL_TEXTURE_2D);
+//     }
+  }
+
   if (likely(Material::selectedMaterial != NULL))
   {
@@ -146 +158 @@
     glShadeModel(GL_SMOOTH);
 
-
   for(unsigned int i = 0; i < this->textures.size(); ++i)
   {
@@ -160 +171 @@
 }
 
+void Material::unselect()
+{
+  Material::selectedMaterial = NULL;
+    for(unsigned int i = 0; i < 8; ++i)
+    {
+        glActiveTexture(Material::glTextureArbs[i]);
+        glBindTexture(GL_TEXTURE_2D, 0);
+        glDisable(GL_TEXTURE_2D);
+    }
+}
+
 /**
  *  Sets the Material Illumination Model.
@@ -366 +388 @@
 }
 
+/**
+ * @brief renders viewport buffer (?? or another buffer ;-)) to a texture
+ * @param textureNumber select the texture unit that will be overwritten
+*/
+void Material::renderToTexture(unsigned int textureNumber, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
+{
+  assert(textureNumber < Material::getMaxTextureUnits());
+  assert(textureNumber < this->textures.size());
+
+  glActiveTexture(0);
+   glEnable(GL_TEXTURE_2D);
+   glBindTexture(GL_TEXTURE_2D, this->textures[textureNumber].getTexture());
+  glCopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
+
+}
 
 /**
  * @brief Sets the Materials Ambient Map
- * @param aMap the Name of the Image to Use
-   @todo implement this
+ * @todo implement this
 */
 void Material::setAmbientMap(const std::string& aMap, GLenum target)

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);