Changeset 3107 in orxonox.OLD

Timestamp:

Dec 5, 2004, 6:52:02 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/images: now the Image will have the right Colors (at loeast bmp, tga, png and jpg)

File:

• orxonox/branches/images/importer/material.cc (modified) (2 diffs)

orxonox/branches/images/importer/material.cc

@@ -14 +14 @@
 
    TGA-code: borrowed from nehe-Tutorials
+
+   ToDo: free SDL-surface when deleting Material.
 */
 
@@ -390 +392 @@
   pImage->data   = (GLubyte*)map->pixels;
 
+  SDL_RWops *imgType;
+  imgType=SDL_RWFromFile(imageName, "rb");
+  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)
+      { 
+        GLuint temp = pImage->data[i];
+        pImage->data[i] = pImage->data[i+2];
+        pImage->data[i+2] = temp;
+      }
   loadTexToGL (pImage, texture);
-  
+
 }
 #else