diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-07-26 22:33:53 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-07-26 22:33:53 +0000 |
| commit | 9e4f25acd69489d949104eebec690ce5586849e6 (patch) | |
| tree | dc4fe4483ece1a374bc44280c72e43cfd5725feb /src/resources/image.h | |
| parent | 34e18a818a7696629515c39b920ba35b64832748 (diff) | |
| download | mana-9e4f25acd69489d949104eebec690ce5586849e6.tar.gz mana-9e4f25acd69489d949104eebec690ce5586849e6.tar.bz2 mana-9e4f25acd69489d949104eebec690ce5586849e6.tar.xz mana-9e4f25acd69489d949104eebec690ce5586849e6.zip | |
OpenGL/SDL combined in the same exe. Not in the cutest way, but we'll find a
nicer approach after the release.
Diffstat (limited to 'src/resources/image.h')
| -rw-r--r-- | src/resources/image.h | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/src/resources/image.h b/src/resources/image.h index 9151a869..cfa42330 100644 --- a/src/resources/image.h +++ b/src/resources/image.h @@ -26,9 +26,7 @@ #include "resource.h" #include <SDL.h> -#ifdef USE_OPENGL #include <SDL_opengl.h> -#endif /** @@ -120,23 +118,21 @@ class Image : public Resource /** * Constructor. */ -#ifdef USE_OPENGL - Image(GLuint image, - int width, int height, - int texWidth, int texHeight); -#else +//#ifdef USE_OPENGL + Image(GLuint glimage, int width, int height, int texWidth, int texHeight); +//#else Image(SDL_Surface *image); -#endif +//#endif bool loaded; -#ifdef USE_OPENGL - GLuint image; +//#ifdef USE_OPENGL + GLuint glimage; int width, height; int texWidth, texHeight; -#else +//#else SDL_Surface *image; -#endif +//#endif float alpha; }; @@ -149,13 +145,13 @@ class SubImage : public Image /** * Constructor. */ -#ifndef USE_OPENGL +//#ifndef USE_OPENGL SubImage(Image *parent, SDL_Surface *image, int x, int y, int width, int height); -#else +//#else SubImage(Image *parent, GLuint image, int x, int y, int width, int height, int texWidth, int textHeight); -#endif +//#endif /** * Destructor. |