Changeset 6465 in orxonox.OLD

Timestamp:

Jan 10, 2006, 11:53:19 PM (18 years ago)

Author:

bensch

Message:

trunk: texture prepared for others than GL_TETURE_2D

Location:

trunk/src/lib/graphics/importer

Files:

• texture.cc (modified) (9 diffs)
• texture.h (modified) (2 diffs)

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

@@ -32 +32 @@
  *  Constructor for a Texture
 */
-Texture::Texture(const char* imageName)
+Texture::Texture(const char* imageName, GLenum target)
 {
   this->setClassID(CL_TEXTURE, "Texture");
@@ -44 +44 @@
   {
     this->setName(imageName);
-    this->loadImage(imageName);
+    this->loadImage(imageName, target);
   }
 }
@@ -67 +67 @@
  * @param imageName The image to load
 */
-bool Texture::loadImage(const char* imageName)
+bool Texture::loadImage(const char* imageName, GLenum target)
 {
   if (Texture::texturesEnabled)
@@ -97 +97 @@
               this->setSurface(newSurf);
               this->setAlpha(hasAlpha);
-              this->setTexture(Texture::loadTexToGL(newSurf));
+              this->setTexture(Texture::loadTexToGL(newSurf, target));
             }
 
@@ -240 +240 @@
  * @returns The ID of the texture.
  */
-GLuint Texture::loadTexToGL (const SDL_Surface* surface) const
+GLuint Texture::loadTexToGL (const SDL_Surface* surface, GLenum target) const
 {
 //   if (this->texture != 0 && glIsTexture(this->texture))
@@ -258 +258 @@
   /* Create an OpenGL texture for the image */
   glGenTextures(1, &texture);
-  glBindTexture(GL_TEXTURE_2D, texture);
-
-  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
-  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-
-
-  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+  glBindTexture(target, texture);
+
+  glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+  glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+
+
+  glTexParameteri(target, GL_TEXTURE_WRAP_S, GL_REPEAT);
+  glTexParameteri(target, GL_TEXTURE_WRAP_T, GL_REPEAT);
 
   /* control the mipmap levels */
@@ -273 +273 @@
 
   /* build the Texture  OpenGL V >= 1.1 */
-  glTexImage2D(GL_TEXTURE_2D,
+  glTexImage2D(target,
                0,
                GL_RGBA,
@@ -283 +283 @@
 
   // build the MipMaps automaticaly
-  errorCode = gluBuild2DMipmaps(GL_TEXTURE_2D,
+  errorCode = gluBuild2DMipmaps(target,
                                 GL_RGBA,
                                 surface->w,
@@ -294 +294 @@
     PRINTF(1)("Error while loading texture (mipmap generation), gluBuild2DMipmaps returned %i\n", errorCode);
 
-  glBindTexture(GL_TEXTURE_2D, 0);
+  glBindTexture(target, 0);
   return texture;
 }

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

@@ -18 +18 @@
   {
     public:
-      Texture(const char* imageName = NULL);
+      Texture(const char* imageName = NULL, GLenum target = GL_TEXTURE_2D);
   //  Texture(TEXTURE_TYPE type, int resolution);
       ~Texture();
 
-      bool loadImage(const char* imageName);
+      bool loadImage(const char* imageName, GLenum target = GL_TEXTURE_2D);
       virtual bool rebuild();
 
@@ -40 +40 @@
       // Utility functionality:
       SDL_Surface* prepareSurface(SDL_Surface* input, bool& hasAlpha) const;
-      GLuint loadTexToGL (const SDL_Surface* surface) const;
+      GLuint loadTexToGL (const SDL_Surface* surface, GLenum target = GL_TEXTURE_2D) const;
 
     protected: