From 1ca09259a5195eda52223172e35c58f24383329d Mon Sep 17 00:00:00 2001 From: pixel Date: Wed, 12 Feb 2003 00:29:15 +0000 Subject: sprites finished... have to test 'em now... --- include/Makefile.am | 2 +- include/gltexture.h | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'include') 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 #include #include +#include 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); -- cgit v1.2.3