bleh

1 files changed, 9 insertions, 20 deletions

diff --git a/include/gltexture.h b/include/gltexture.h
index 4f5e162..a5137db 100644
--- a/include/gltexture.h
+++ b/include/gltexture.h
@@ -6,33 +6,22 @@
 #include <Handle.h>
 #include <Exceptions.h>
 #include <generic.h>
+#include <texture.h>
 
 namespace mogltk {
-    class texture : public Base {
+    class gltexture : public texture {
       public:
-          texture(int = 256, int = 256, bool = false) throw (GeneralException);
-	  texture(Handle *, bool = false) throw (GeneralException);
-	  virtual ~texture();
-	SDL_Surface * GetSurface();
-	Uint32 * GetPixels();
-	static SDL_Surface * LoadNTEX(Handle * h) throw (GeneralException) ;
+          gltexture(int = 256, int = 256, bool = false) throw (GeneralException);
+	  gltexture(Handle *, bool = false) throw (GeneralException);
+	  virtual ~gltexture();
 	void Generate();
+	void Taint();
 	void Bind(bool = true);
-	GLuint GetWidth();
-	GLuint GetHeight();
 	static void Unbind(void);
-	void Taint(void);
       private:
-        GLuint width, height, tex;
-	bool texture_allocated;
-	SDL_Surface * surface;
-	bool planar, tainted;
-#ifdef TRACE_TEXTURES
-	static texture * header;
-	static texture * footer;
-	texture * next, * prev;
-#endif
-	static texture * active;
+        GLuint tex;
+	bool texture_allocated, planar, tainted;
+	static gltexture * active;
     };
 };