Changeset 3863 in orxonox.OLD for orxonox/trunk/src/lib/graphics/importer/texture.h

Timestamp:

Apr 18, 2005, 10:10:26 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: efence compile support, minor changes at animation, and texture has now only support for sdl-image

File:

• orxonox/trunk/src/lib/graphics/importer/texture.h (modified) (3 diffs)

orxonox/trunk/src/lib/graphics/importer/texture.h

@@ -14 +14 @@
 #include "debug.h"
 
-#ifdef HAVE_SDL_IMAGE_H
 #include <SDL_image.h>
-#else
-// IMAGE LIBS //
-#ifdef HAVE_JPEGLIB_H
-extern "C"{         // This has to be done, because not a c++ lib
-#include <jpeglib.h>
-}
-#endif /* HAVE_JPEGLIB_H */
-#ifdef HAVE_PNG_H
-#include <png.h>
-#endif /* HAVE_PNG_H */
-#endif /* HAVE_SDL_IMAGE_H */
 
 //! A Class, that reads in Textures from different fileformats.
@@ -47 +35 @@
   SDL_Surface* map; //!< The map SDL initializes for this element.
   char* searchTextureInPaths(const char* texName) const;
-  inline void swap(unsigned char &a, unsigned char &b);
+  void swap(unsigned char &a, unsigned char &b);
  public:
   Texture(void);
@@ -57 +45 @@
 
   bool loadImage(const char* imageName);
-#ifndef HAVE_SDL_IMAGE_H
+};
 
-  bool loadBMP (char* bmpName);
-
-  bool loadJPG (char* jpgName);
-
-  /// TGA ///
-
-  bool loadTGA(const char * tgaName);
-  bool loadUncompressedTGA(const char * filename, FILE * fTGA);
-  bool loadCompressedTGA(const char * filename, FILE * fTGA);
-
-  bool loadPNG(const char* pngName);
-#endif
-
-
-};
 #endif /* _TEXTURE_H */