Bleh

4 files changed, 10 insertions, 12 deletions

diff --git a/includes/Handle.h b/includes/Handle.h
index a82aa52..b7eed41 100644
--- a/includes/Handle.h
+++ b/includes/Handle.h
@@ -35,7 +35,7 @@ class Handle : public Base {
     virtual bool CanWatch() const;
     virtual void Dup(const Handle &);
 #ifdef HAVE_ZLIB
-    virtual void SetZ(int) throw (GeneralException);
+    virtual void SetZ(int = 9) throw (GeneralException);
 #endif
   protected:
       Handle(int h);
diff --git a/includes/Image.h b/includes/Image.h
index 9bef556..87a8ddd 100644
--- a/includes/Image.h
+++ b/includes/Image.h
@@ -4,17 +4,12 @@
 
 #include <Buffer.h>
 #include <generic.h>
+#include <Color.h>
 
 enum {
     FORMAT_TGA_BASIC
 };
 
-struct Color {
-      Color(unsigned char aR, unsigned char aG, unsigned char aB, unsigned char aA = 255) :
-        R(aR), G(aG), B(aB), A(aA) { }
-    unsigned char R, G, B, A;
-};
-
 class Image : public Buffer {
   public:
       Image(unsigned int, unsigned int);
diff --git a/includes/glbase.h b/includes/glbase.h
index 78272eb..f8f0ae6 100644
--- a/includes/glbase.h
+++ b/includes/glbase.h
@@ -13,6 +13,8 @@ namespace mogltk {
         static int GetInited(void);
 	static void Enter2DMode(void);
 	static void Leave2DMode(void);
+	static void Flip(void);
+	static bool is2D(void);
       private:
         static int width, height, inited, twoD;
         static SDL_Surface * surface;
diff --git a/includes/gltexture.h b/includes/gltexture.h
index 5ac80ad..84edaa8 100644
--- a/includes/gltexture.h
+++ b/includes/gltexture.h
@@ -1,21 +1,22 @@
 #ifndef __GLTEXTURE_H__
 #define __GLTEXTURE_H__
 
+#include <GL/gl.h>
 #include <SDL.h>
 #include "Exceptions.h"
 
 namespace mogltk {
-    class gltexture : public Base {
+    class texture : public Base {
       public:
-          gltexture(int = 256, int = 256, bool = true) throw (GeneralException);
-	  virtual ~gltexture();
+          texture(int = 256, int = 256, bool = false) throw (GeneralException);
+	  virtual ~texture();
 	SDL_Surface * GetSurface() throw (GeneralException);
 	void Generate() throw (GeneralException);
-	void Bind() throw (GeneralException);
+	void Bind(bool = true) throw (GeneralException);
 	GLuint GetWidth();
 	GLuint GetHeight();
       private:
-        GLuint width, height, texture;
+        GLuint width, height, tex;
 	SDL_Surface * surface;
 	bool planar;
     };