Changeset 3103 in orxonox.OLD

Timestamp:

Dec 5, 2004, 5:01:10 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/images: testing SDL_image. It rocks.

Location:

orxonox/branches/images

Files:

• config.h.in (modified) (1 diff)
• configure.ac (modified) (1 diff)
• importer/material.cc (modified) (2 diffs)
• importer/material.h (modified) (3 diffs)

orxonox/branches/images/config.h.in

@@ -31 +31 @@
 /* Define to 1 if you have the <OpenGL/gl.h> header file. */
 #undef HAVE_OPENGL_GL_H
+
+/* Define to 1 if you have the <png.h> header file. */
+#undef HAVE_PNG_H
 
 /* Define to 1 if you have the <SDL/SDL.h> header file. */

orxonox/branches/images/configure.ac

@@ -151 +151 @@
         echo "SDL library not found."
         echo "please install the SDL library, which can be found at http://www.libsdl.org"
+        echo "------------------"
+        exit -1
+     fi   
+
+#checking for SDL_image-headers
+  AC_CHECK_HEADERS(SDL/SDL_image.h ,,
+      [AC_MSG_ERROR([cannot find SDL_image headers]) ])
+  AC_CHECK_LIB([SDL_image], [main], FOUND_SDL_image=yes)
+     if test "$FOUND_SDL_image" = "yes" ; then
+       LIBS="$LIBS -lSDL_image"
+     else
+        echo "------------------"
+        echo "SDL_image library not found."
+        echo "please install the SDL_image library, which can be found at http://www.libsdl.org/projects/SDL_image/"
         echo "------------------"
         exit -1

orxonox/branches/images/importer/material.cc

@@ -376 +376 @@
 
 
-
+#ifdef HAVE_SDL_SDL_IMAGE_H
+bool Material::loadImage(char* imageName, GLuint* texture)
+{
+  SDL_Surface* map;
+  Image* pImage = new Image;
+  map=IMG_Load(imageName);
+  if(!map)
+    {
+      printf("IMG_Load: %s\n", IMG_GetError());
+    }
+  pImage->height = map->h;
+  pImage->width  = map->w;
+  pImage->data   = (GLubyte*)map->pixels;
+
+  loadTexToGL (pImage, texture);
+  
+}
+#else
 /**
    \brief Makes the Programm ready to Read-in a texture-File
@@ -1075 +1092 @@
   return true;
 }
+
+#endif /* HAVE_SDL_SDL_IMAGE_H */

orxonox/branches/images/importer/material.h

@@ -14 +14 @@
 #include <stdlib.h>
 #include <fstream>
+
+#if HAVE_CONFIG_H 
+#include <config.h> 
+#endif
+
+#ifdef HAVE_SDL_SDL_IMAGE_H
+#include <SDL/SDL_image.h>
+#endif
 
 // IMAGE LIBS //
@@ -92 +100 @@
 
   bool loadImage(char* imageName, GLuint* texture);
+#ifndef HAVE_SDL_SDL_IMAGE_H
 
   bool loadBMP (char* bmpName, GLuint* texture);
@@ -104 +113 @@
 
   bool loadPNG(const char* pngName, GLuint* texture);
+#endif
 };
 #endif