First part of the backend separation

1 files changed, 9 insertions, 7 deletions

diff --git a/include/glshape.h b/include/glshape.h
index 465f60b..bca4410 100644
--- a/include/glshape.h
+++ b/include/glshape.h
@@ -3,18 +3,20 @@
 
 #include <Exceptions.h>
 #include <BString.h>
-#include <glcolor.h>
-#include <gltexture.h>
+#include <mcolor.h>
+#include <texture.h>
 #include <shape.h>
 
 namespace mogltk {
     class glshape : public shape {
       public:
-        virtual void box(int x1, int y1, int x2, int y2, glColorP = WHITE);
-        virtual void box3d(int x1, int y1, int x2, int y2, glColorP = DOS_WHITE, glColorP = DOS_HIGH_WHITE, glColorP = DOS_GRAY, int = 2, bool = false);
-	virtual void box(int x1, int y1, int x2, int y2, glColorP, glColorP, glColorP, glColorP);
-	virtual void tbox(gltexture *, int x1, int y1, int x2, int y2, int tx1, int ty1, int tx2, int ty2, glColorP = WHITE);
-	virtual void tbox(gltexture *, int x1, int y1, int x2, int y2, glColorP, glColorP, glColorP, glColorP, int tx1, int ty1, int tx2, int ty2);
+        virtual void box(int x1, int y1, int x2, int y2, ColorP = WHITE);
+        virtual void box3d(int x1, int y1, int x2, int y2, ColorP = DOS_WHITE, ColorP = DOS_HIGH_WHITE, ColorP = DOS_GRAY, int = 2, bool = false);
+	virtual void box(int x1, int y1, int x2, int y2, ColorP, ColorP, ColorP, ColorP);
+	virtual void tbox(texture *, int x1, int y1, int x2, int y2, int tx = 0, int ty = 0, double = 1.0, ColorP = WHITE);
+	virtual void tbox(texture *, int x1, int y1, int x2, int y2, int tx1, int ty1, int tx2, int ty2, ColorP = WHITE);
+	virtual void tbox(texture *, int x1, int y1, int x2, int y2, ColorP, ColorP, ColorP, ColorP, int tx = 0, int ty = 0, double = 1.0);
+	virtual void tbox(texture *, int x1, int y1, int x2, int y2, ColorP, ColorP, ColorP, ColorP, int tx1, int ty1, int tx2, int ty2);
       private:
         bool Enter(bool);
         virtual bool Enter();