Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3392 in orxonox.OLD for orxonox/branches/nico/src/importer


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • orxonox/branches/nico/src/importer/heightMapTerrain.cc

    r3390 r3392  
    99
    1010#include "heightMapTerrain.h"
     11#include "vector.h"
     12#ifdef HAVE_SDL_SDL_IMAGE_H
     13#include <SDL/SDL_image.h>
     14#endif /* HAVE_SDL_SDL_IMAGE_H */
    1115
    1216HeightMapTerrain::HeightMapTerrain()
     
    2024bool HeightMapTerrain::loadBitmap(char* fileName)
    2125{
    22         return bitmap = SDL_LoadBMP(fileName); 
     26#ifdef HAVE_SDL_SDL_IMAGE_H
     27  cout << "Using SDL-image for reading in the File " << fileName <<endl;
     28  return this->bitmap = IMG_Load(fileName);
     29#else
     30  return this->bitmap = SDL_LoadBMP(fileName); 
     31#endif /* HAVE_SDL_SDL_IMAGE_H */
    2332}
    2433
  • orxonox/branches/nico/src/importer/heightMapTerrain.h

    r3390 r3392  
    1111using namespace std;
    1212
    13 #include "vector.h"
    1413#include "../stdincl.h"
    1514
Note: See TracChangeset for help on using the changeset viewer.