Changeset 8162 in orxonox.OLD for branches/osx/src/lib/graphics/importer/texture.cc

Timestamp:

Jun 5, 2006, 5:27:38 PM (18 years ago)

Author:

ponder

Message:

The md2Model loader now works as expected

File:

• branches/osx/src/lib/graphics/importer/texture.cc (modified) (2 diffs)

branches/osx/src/lib/graphics/importer/texture.cc

@@ -22 +22 @@
 #include <math.h>
 
-// INCLUDING SDL_Image
-#ifdef HAVE_SDL_IMAGE_H
+#ifdef HAVE_SDL_SDL_H
+#include <SDL/SDL_image.h>
+#include <SDL/SDL_endian.h>
+#include <SDL/SDL_byteorder.h>
+#else
+#include <SDL_endian.h>
 #include <SDL_image.h>
+#include <SDL_byteorder.h>
+#endif
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+/*
+ * On the BIG_ENDIAN architecture, the 24 and 32bit bitmaps have
+ * different masks. If you don't do this distinction properly, 
+ * you will get weird-looking textures.
+ */
+Uint32 alphaMask[] = {
+        0xFF000000,
+        0x00FF0000,
+        0x0000FF00,
+        0x000000FF,
+};
+
+Uint32 opaqueMask[] = {
+        0x00FF0000,
+        0x0000FF00,
+        0x000000FF,
+        0xFF000000
+};
 #else
-#include <SDL/SDL_image.h>
+/*
+ * On the LIL_ENDIAN architecture everything is fine and easy. The 24
+ * and 32bit bitmaps have the same masks.
+ */
+Uint32 alphaMask[] = {
+        0x000000FF,
+        0x0000FF00,
+        0x00FF0000,
+        0xFF000000,
+};
+
+Uint32 opaqueMask[] = alphaMask
+
 #endif
-
 /**
  * @brief Constructor for a Texture
@@ -190 +226 @@
   Uint32 saved_flags;
   Uint8  saved_alpha;
-
   hasAlpha = false;
   int pixelDepth = 24;
 
+        Uint32* mask = opaqueMask;
+        
   /* Save the alpha blending attributes */
   saved_flags = surface->flags&(SDL_SRCALPHA | SDL_RLEACCELOK);
   saved_alpha = surface->format->alpha;
-  if ( (saved_flags & SDL_SRCALPHA) == SDL_SRCALPHA )
+  if ( saved_flags & SDL_SRCALPHA )
   {
     SDL_SetAlpha(surface, 0, 0);
     hasAlpha = true;
     pixelDepth = 32;
-  }
-
+                mask = alphaMask;
+  }
+                
   retSurface = SDL_CreateRGBSurface(SDL_HWSURFACE,
                                     surface->w, surface->h,
                                     pixelDepth,
-//#if SDL_BYTEORDER == SDL_LIL_ENDIAN /* OpenGL RGBA masks */
-                                    0x000000FF,
-                                    0x0000FF00,
-                                    0x00FF0000,
-                                    0xFF000000
-/*#else*/
-                                    /*0xFF000000,
-                                    0x00FF0000,
-                                    0x0000FF00,
-                                    0x000000FF*/
-/*#endif*/
-                                   );
+                                                                                                                                                mask[0], mask[1], mask[2], mask[3] );
   if ( retSurface == NULL )
     return NULL;