Non convex polygons

gloss/Graphics/Gloss/Data/Picture.hs

@@ -29,7 +29,7 @@ module Graphics.Gloss.Data.Picture
 where
 import Graphics.Gloss.Rendering
 import Graphics.Gloss.Geometry.Angle
-
+import Graphics.Gloss.Geometry.Triangulation
 
 -- Constructors ----------------------------------------------------------------
 -- NOTE: The docs here should be identical to the ones on the constructors.
@@ -39,8 +39,9 @@ blank :: Picture
 blank   = Blank
 
 -- | A convex polygon filled with a solid color.
+--   Triangulate so non-convex polygons can be drawn properly.
 polygon :: Path -> Picture
-polygon = Polygon
+polygon = pictures . triangulate
 
 -- | A line along an arbitrary path.
 line :: Path -> Picture

gloss/Graphics/Gloss/Data/Point.hs

@@ -4,7 +4,8 @@ module Graphics.Gloss.Data.Point
         ( Point, Path
         , pointInBox)
 where
-import Graphics.Gloss.Data.Picture
+--import Graphics.Gloss.Data.Picture
+import Graphics.Gloss.Rendering
 
 
 -- | Test whether a point lies within a rectangular box that is oriented

gloss/Graphics/Gloss/Data/Vector.hs

@@ -14,7 +14,8 @@ module Graphics.Gloss.Data.Vector
         , normalizeV
         , unitVectorAtAngle )
 where
-import Graphics.Gloss.Data.Picture
+--import Graphics.Gloss.Data.Picture
+import Graphics.Gloss.Rendering
 import Graphics.Gloss.Geometry.Angle
 
 

gloss/Graphics/Gloss/Geometry.hs

@@ -1,8 +1,9 @@
 
 module Graphics.Gloss.Geometry
 	( module Graphics.Gloss.Geometry.Angle
-	, module Graphics.Gloss.Geometry.Line )
+	, module Graphics.Gloss.Geometry.Line
+	, module Graphics.Gloss.Geometry.Triangulation )
 where
 import Graphics.Gloss.Geometry.Angle
 import Graphics.Gloss.Geometry.Line
-	
+import Graphics.Gloss.Geometry.Triangulation