Changeset 3392 in orxonox.OLD for orxonox/branches

Timestamp:

Feb 2, 2005, 3:21:47 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/nico: heightmap now able to readin with SDL-image (if found)

Location:

orxonox/branches/nico/src/importer

Files:

• heightMapTerrain.cc (modified) (2 diffs)
• heightMapTerrain.h (modified) (1 diff)

orxonox/branches/nico/src/importer/heightMapTerrain.cc

@@ -9 +9 @@
 
 #include "heightMapTerrain.h"
+#include "vector.h"
+#ifdef HAVE_SDL_SDL_IMAGE_H
+#include <SDL/SDL_image.h>
+#endif /* HAVE_SDL_SDL_IMAGE_H */
 
 HeightMapTerrain::HeightMapTerrain()
@@ -20 +24 @@
 bool HeightMapTerrain::loadBitmap(char* fileName)
 {
-        return bitmap = SDL_LoadBMP(fileName);  
+#ifdef HAVE_SDL_SDL_IMAGE_H
+  cout << "Using SDL-image for reading in the File " << fileName <<endl;
+  return this->bitmap = IMG_Load(fileName);
+#else
+  return this->bitmap = SDL_LoadBMP(fileName);  
+#endif /* HAVE_SDL_SDL_IMAGE_H */
 }
 

orxonox/branches/nico/src/importer/heightMapTerrain.h

@@ -11 +11 @@
 using namespace std;
 
-#include "vector.h"
 #include "../stdincl.h"