Changeset 4111 in orxonox.OLD for orxonox/branches/heightMap/src/lib/graphics/importer/texture.cc

Timestamp:

May 7, 2005, 5:22:44 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the Trunk/importer back here.
merged with command:
svn merge -r 3918:HEAD ../../trunk/src/lib/graphics/importer/ src/lib/graphics/importer/

this fixed the issue with the segfault. It really was an error in the Model-class
@nico:

1. sorry
2. thanks for pointing this out to me

File:

• orxonox/branches/heightMap/src/lib/graphics/importer/texture.cc (modified) (5 diffs)

orxonox/branches/heightMap/src/lib/graphics/importer/texture.cc

@@ -25 +25 @@
 Texture::Texture(const char* imageName)
 {
+  bAlpha = false;
   this->texture = 0;
   if (imageName)
@@ -112 +113 @@
       if ( (saved_flags & SDL_SRCALPHA) == SDL_SRCALPHA ) {
         SDL_SetAlpha(surface, saved_flags | SDL_OPENGL, saved_alpha);
+        this->bAlpha = true;
       }
       
@@ -119 +121 @@
       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-      /*      glTexImage2D(GL_TEXTURE_2D,
+      // build the Texture
+      glTexImage2D(GL_TEXTURE_2D,
                    0,
                    GL_RGBA,
@@ -127 +130 @@
                    GL_UNSIGNED_BYTE,
                    image->pixels);
-      */
+      // build the MipMaps
       gluBuild2DMipmaps(GL_TEXTURE_2D,
-                        3,
+                        GL_RGBA,
                         w,
                         h,
@@ -135 +138 @@
                         GL_UNSIGNED_BYTE,
                         image->pixels);
-
+      
       SDL_FreeSurface(image); /* No longer needed */