Changeset 3701 in orxonox.OLD for orxonox/branches/textEngine/src/lib/graphics/importer

Timestamp:

Mar 31, 2005, 10:27:46 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/textEngine: SDL include fix in configure and texture

Location:

orxonox/branches/textEngine/src/lib/graphics/importer

Files:

• texture.cc (modified) (4 diffs)
• texture.h (modified) (4 diffs)

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

orxonox/branches/textEngine/src/lib/graphics/importer/texture.h

@@ -14 +14 @@
 #include "debug.h"
 
-#ifdef HAVE_SDL_SDL_IMAGE_H
-#include <SDL/SDL_image.h>
+#ifdef HAVE_SDL_IMAGE_H
+#include <SDL_image.h>
 #else
 // IMAGE LIBS //
@@ -26 +26 @@
 #include <png.h>
 #endif /* HAVE_PNG_H */
-#endif /* HAVE_SDL_SDL_IMAGE_H */
+#endif /* HAVE_SDL_IMAGE_H */
 
 //! A Class, that reads in Textures from different fileformats.
@@ -57 +57 @@
 
   bool loadImage(const char* imageName);
-#ifndef HAVE_SDL_SDL_IMAGE_H
+#ifndef HAVE_SDL_IMAGE_H
 
   bool loadBMP (char* bmpName);
@@ -74 +74 @@
 
 };
-
-
-
 #endif /* _TEXTURE_H */