glcolor, first episode

1 files changed, 13 insertions, 13 deletions

diff --git a/include/glshape.h b/include/glshape.h
index cd9fef0..a0c7bf2 100644
--- a/include/glshape.h
+++ b/include/glshape.h
@@ -2,24 +2,24 @@
 #define __GLSHAPE_H__
 
 #include <Exceptions.h>
-#include <Color.h>
+#include <glcolor.h>
 #include <gltexture.h>
 
 namespace mogltk {
     class shape : public Base {
       public:
-        static void box(int x1, int y1, int x2, int y2, Color = WHITE);
-	static void box(int x1, int y1, int x2, int y2, Color, Color, Color, Color);
-        static void obox(int x1, int y1, int x2, int y2, Color = WHITE);
-	static void obox(int x1, int y1, int x2, int y2, Color, Color, Color, Color);	
-	static void tbox(texture *, int x1, int y1, int x2, int y2, int tx = 0, int ty = 0, double = 1.0, Color = WHITE);
-	static void tbox(texture *, int x1, int y1, int x2, int y2, int tx1, int ty1, int tx2, int ty2, Color = WHITE);
-	static void tbox(texture *, int x1, int y1, int x2, int y2, Color, Color, Color, Color, int tx = 0, int ty = 0, double = 1.0);
-	static void tbox(texture *, int x1, int y1, int x2, int y2, Color, Color, Color, Color, int tx1, int ty1, int tx2, int ty2);
-	static void hline(int x1, int x2, int y, Color = WHITE);
-	static void hline(int x1, int x2, int y, Color, Color);
-	static void vline(int x, int y1, int y2, Color = WHITE);
-	static void vline(int x, int y1, int y2, Color, Color);
+        static void box(int x1, int y1, int x2, int y2, ColorP = WHITE);
+	static void box(int x1, int y1, int x2, int y2, ColorP, ColorP, ColorP, ColorP);
+        static void obox(int x1, int y1, int x2, int y2, ColorP = WHITE);
+	static void obox(int x1, int y1, int x2, int y2, ColorP, ColorP, ColorP, ColorP);	
+	static void tbox(texture *, int x1, int y1, int x2, int y2, int tx = 0, int ty = 0, double = 1.0, ColorP = WHITE);
+	static void tbox(texture *, int x1, int y1, int x2, int y2, int tx1, int ty1, int tx2, int ty2, ColorP = WHITE);
+	static void tbox(texture *, int x1, int y1, int x2, int y2, ColorP, ColorP, ColorP, ColorP, int tx = 0, int ty = 0, double = 1.0);
+	static void tbox(texture *, int x1, int y1, int x2, int y2, ColorP, ColorP, ColorP, ColorP, int tx1, int ty1, int tx2, int ty2);
+	static void hline(int x1, int x2, int y, ColorP = WHITE);
+	static void hline(int x1, int x2, int y, ColorP, ColorP);
+	static void vline(int x, int y1, int y2, ColorP = WHITE);
+	static void vline(int x, int y1, int y2, ColorP, ColorP);
       private:
         static bool in2D(bool);
 	static void out2D(bool);