super-tux-commit

[Matze B. <mat...@us...>]

Update of /cvsroot/super-tux/supertux/lib/math
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3933/lib/math

Modified Files:
	aatriangle.h 
Log Message:
added some more non-45 degree triangle modes

Index: aatriangle.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/math/aatriangle.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- aatriangle.h	20 Nov 2004 22:18:32 -0000	1.1
+++ aatriangle.h	25 Nov 2004 16:38:29 -0000	1.2
@@ -20,21 +20,32 @@
    *    | \             \  |         / |       |  /
    *    |  \             \ |        /  |       | /
    *    *---*              *       *---*       *
+   *
+   * Deform flags: (see docs/aatriangletypes.png for details)
    */
   enum Direction {
-    SOUTHWEST, NORTHEAST, SOUTHEAST, NORTHWEST
+    SOUTHWEST = 0,
+    NORTHEAST,
+    SOUTHEAST,
+    NORTHWEST,
+    DIRECTION_MASK = 0x0003,
+    DEFORM1 = 0x0010,
+    DEFORM2 = 0x0020,
+    DEFORM3 = 0x0030,
+    DEFORM4 = 0x0040,
+    DEFORM_MASK = 0x0070
   };
 
   AATriangle()
     : dir(SOUTHWEST)
   {
   }
-  AATriangle(const Vector& v1, const Vector& v2, Direction newdir)
+  AATriangle(const Vector& v1, const Vector& v2, int newdir)
     : Rectangle(v1, v2), dir(newdir)
   {
   }
 
-  Direction dir;
+  int dir;
 };
 
 }