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

Timestamp:

May 18, 2006, 5:05:45 PM (19 years ago)

Author:

stefalie

Message:

branches/water: first attempt to realise reflection

Location:

branches/water/src/lib/graphics/importer

Files:

• material.cc (modified) (1 diff)
• material.h (modified) (1 diff)
• texture.cc (modified) (10 diffs)
• texture.h (modified) (2 diffs)

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

@@ -333 +333 @@
 // MAPPING //
 
-/**
- *  Sets the Materials Diffuse Map
+void Material::setDiffuseMap(Texture* texture, unsigned int textureNumber)
+{
+  assert(textureNumber < Material::getMaxTextureUnits());
+
+  if (this->textures.size() > textureNumber && this->textures[textureNumber] != NULL)
+    ResourceManager::getInstance()->unload(this->textures[textureNumber]);
+
+  if (this->textures.size() <= textureNumber)
+    this->textures.resize(textureNumber+1, NULL);
+
+  //! @todo check if RESOURCE MANAGER is availiable
+  this->textures[textureNumber] = texture;
+}
+
+
+/**
+ * @brief Sets the Materials Diffuse Map
  * @param dMap the Name of the Image to Use
 */

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

@@ -53 +53 @@
 
     // MAPPING //
+    void setDiffuseMap(Texture* texture, unsigned int textureNumber = 0);
     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);

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

@@ -29 +29 @@
 #endif
 
+
+
+
+Texture::Texture(GLenum target)
+{
+  this->init();
+  this->generateTexture(texture, target);
+}
+
 /**
  *  Constructor for a Texture
@@ -42 +51 @@
   }
 }
+
+
 
 Texture::Texture(SDL_Surface* surface, GLenum target)
@@ -150 +161 @@
 
 /**
- * rebuilds the texture.
+ * @brief rebuilds the texture.
  * reloads the Texture from Memory to OpenGL.
  */
@@ -171 +182 @@
 
 /**
- * set the surface this Texture handles
+ * @brief set the surface this Texture handles
  * @param newSurface the new Surface to set as the image for this Texture.
  *
@@ -191 +202 @@
 
 /**
- * enables, disables textures
+ * @brief enables, disables textures
  * @param texturesEnabled true if the textures should be enabled
  */
@@ -204 +215 @@
 //////////////////////////////////////
 /**
- * converts surface to a new SDL_Surface, that is loadable by openGL
+ * @brief converts surface to a new SDL_Surface, that is loadable by openGL
  * @param surface the Surface to convert
  * @param hasAlpha if the newly created Surface has an alpha channel, true is returned otherwise false.
@@ -266 +277 @@
 
 /**
- *  Loads a Texture to the openGL-environment.
+ * @brief Loads a Texture to the openGL-environment.
  * @param surface the Image to load to openGL
  * @returns The ID of the texture.
@@ -277 +288 @@
 
   int      errorCode = 0;           //!< the error code for the texture loading functions
-  GLuint   texture;                 //!< the OpenGL texture handle
+  GLuint   texture = 0;             //!< the OpenGL texture handle
   int      mipmapLevel = 0;         //!< the maximum mipmap level for this texture
   int      mipmapWidth = 0;         //!< the width of the mipmap
@@ -287 +298 @@
 
   /* Create an OpenGL texture for the image */
-  glGenTextures(1, &texture);
-  glBindTexture(target, texture);
-
-  glTexParameteri(target, GL_TEXTURE_WRAP_S, GL_REPEAT);
-  glTexParameteri(target, GL_TEXTURE_WRAP_R, GL_REPEAT);
-
-  glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
-  glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-
+  this->generateTexture(texture, target);
   glTexParameterf(GL_TEXTURE_ENV, GL_TEXTURE_PRIORITY, this->priority);
-
-
-  /* control the mipmap levels */
-  glTexParameterf(GL_TEXTURE_ENV, GL_TEXTURE_MIN_LOD, 5);
-  glTexParameterf(GL_TEXTURE_ENV, GL_TEXTURE_MAX_LOD, 0);
 
   /* build the Texture  OpenGL V >= 1.1 */
@@ -330 +328 @@
 }
 
+void Texture::generateTexture(GLuint& texture, GLenum target)
+{
+  if (!glIsTexture(texture))
+  {
+    glGenTextures(1, &texture);
+  }
+  glBindTexture(target, texture);
+
+  glTexParameteri(target, GL_TEXTURE_WRAP_S, GL_REPEAT);
+  glTexParameteri(target, GL_TEXTURE_WRAP_R, GL_REPEAT);
+
+  glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+  glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+
+  /* control the mipmap levels */
+  glTexParameterf(GL_TEXTURE_ENV, GL_TEXTURE_MIN_LOD, 5);
+  glTexParameterf(GL_TEXTURE_ENV, GL_TEXTURE_MAX_LOD, 0);
+}
+

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

@@ -18 +18 @@
   {
     public:
-      Texture(const std::string& imageName = "", GLenum target = GL_TEXTURE_2D);
+      Texture(GLenum target = GL_TEXTURE_2D);
+      Texture(const std::string& imageName, GLenum target = GL_TEXTURE_2D);
       Texture(SDL_Surface* surface, GLenum target = GL_TEXTURE_2D);
       virtual ~Texture();
@@ -50 +51 @@
     private:
       void init();
+      static void generateTexture(GLuint& texture, GLenum target);
 
     private: