Changeset 3790 in orxonox.OLD for orxonox/trunk/src/lib/graphics/importer/texture.cc

Timestamp:

Apr 13, 2005, 12:33:07 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the textEngine back into the trunk.
merged with command:
svn merge -r 3681:HEAD branches/textEngine/ trunk/

conflicts in:
world.cc/h orxonox.cc NEWS
changed in favor of the trunk

File:

• orxonox/trunk/src/lib/graphics/importer/texture.cc (modified) (4 diffs)

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

@@ -98 +98 @@
 }
 
-#ifdef HAVE_SDL_SDL_IMAGE_H
+#ifdef HAVE_SDL_IMAGE_H
 bool Texture::loadImage(const char* imageName)
 {
@@ -118 +118 @@
             pImage->format = GL_RGB;
           else if (pImage->bpp == 4)
-            pImage->format = GL_RGBA;
-          
+            {
+              pImage->format = GL_RGBA;
+              SDL_SetAlpha(this->map, 0, 0);
+            }
+
           if( !IMG_isPNG(SDL_RWFromFile(imageName, "rb")) && !IMG_isJPG(SDL_RWFromFile(imageName, "rb")))
             for (int i=0;i<map->h * map->w *3;i+=3)
@@ -146 +149 @@
 
 
-#else /* HAVE_SDL_SDL_IMAGE_H */
+#else /* HAVE_SDL_IMAGE_H */
 /**
    \brief Makes the Programm ready to Read-in a texture-File
@@ -832 +835 @@
 
 }
-#endif /* HAVE_SDL_SDL_IMAGE_H */
+#endif /* HAVE_SDL_IMAGE_H */