Changeset 4178 in orxonox.OLD for orxonox/branches/physics/src/lib/graphics/importer/texture.cc

Timestamp:

May 13, 2005, 11:16:33 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/physics: merged the Trunk into the physics Branche again:
merged with command:
svn merge ../trunk physics -r 3953:HEAD
no important conflicts

Location:

orxonox/branches/physics

Files:

• . (modified) (1 prop)
• src/lib/graphics/importer/texture.cc (modified) (5 diffs)

orxonox/branches/physics

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+

orxonox/branches/physics/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 */
       

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+