diff options
| author | pixel <pixel> | 2003-02-12 00:29:15 +0000 |
|---|---|---|
| committer | pixel <pixel> | 2003-02-12 00:29:15 +0000 |
| commit | 1ca09259a5195eda52223172e35c58f24383329d (patch) | |
| tree | 1cc85f843792a2e05eeec687f810ae36fd9a9a17 /include | |
| parent | 28f5202ab892c2031f2ffb7fd6ad22171b01d139 (diff) | |
sprites finished... have to test 'em now...
Diffstat (limited to 'include')
| -rw-r--r-- | include/Makefile.am | 2 | ||||
| -rw-r--r-- | include/gltexture.h | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index be0dd07..fa972cf 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,4 +1,4 @@ pkginclude_HEADERS = \ -engine.h glbase.h glfont.h gltexture.h +engine.h glbase.h glfont.h gltexture.h sprite.h noinst_HEADERS = gettext.h diff --git a/include/gltexture.h b/include/gltexture.h index 06f2e8a..4f5e162 100644 --- a/include/gltexture.h +++ b/include/gltexture.h @@ -5,17 +5,16 @@ #include <SDL_opengl.h> #include <Handle.h> #include <Exceptions.h> +#include <generic.h> namespace mogltk { - enum texture_type { - RAW_RGBA, - }; class texture : public Base { public: texture(int = 256, int = 256, bool = false) throw (GeneralException); - texture(Handle *, bool = false, texture_type = RAW_RGBA) throw (GeneralException); + texture(Handle *, bool = false) throw (GeneralException); virtual ~texture(); SDL_Surface * GetSurface(); + Uint32 * GetPixels(); static SDL_Surface * LoadNTEX(Handle * h) throw (GeneralException) ; void Generate(); void Bind(bool = true); |