From a5c614d908e920bf685b2a49a538414844dd083a Mon Sep 17 00:00:00 2001 From: Frank Staals Date: Sun, 22 Dec 2024 12:53:02 +0100 Subject: [PATCH] fix the examples --- hgeometry-examples/draw/Main.hs | 2 +- hgeometry-examples/skia/GeometryStore.hs | 2 +- hgeometry-examples/skia/Model.hs | 2 +- hgeometry-examples/triangulateWorld/Main.hs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hgeometry-examples/draw/Main.hs b/hgeometry-examples/draw/Main.hs index e2748cb5a..71390b473 100644 --- a/hgeometry-examples/draw/Main.hs +++ b/hgeometry-examples/draw/Main.hs @@ -16,7 +16,7 @@ import Test.QuickCheck type R = RealNumber 5 -renderGraph :: PlaneGraph QuickCheckWorld (Point 2 R) () () -> IpePage R +renderGraph :: CPlaneGraph QuickCheckWorld (Point 2 R) () () -> IpePage R renderGraph gr = fromContent $ concat [ [ iO $ defIO p | p <- gr^..vertices ] , [ iO $ defIO seg | seg <- gr^..edgeSegments ] diff --git a/hgeometry-examples/skia/GeometryStore.hs b/hgeometry-examples/skia/GeometryStore.hs index c1442ab27..e21494bcc 100644 --- a/hgeometry-examples/skia/GeometryStore.hs +++ b/hgeometry-examples/skia/GeometryStore.hs @@ -39,7 +39,7 @@ data Geom = G_Point (Point 2 R :+ Attributes (Point 2 R)) data MyWorld -type PlaneGraph' r = PlaneGraph MyWorld (Point 2 r) PolygonEdgeType PolygonFaceData +type PlaneGraph' r = CPlaneGraph MyWorld (Point 2 r) PolygonEdgeType PolygonFaceData -------------------------------------------------------------------------------- diff --git a/hgeometry-examples/skia/Model.hs b/hgeometry-examples/skia/Model.hs index 76418bbcd..96a956564 100644 --- a/hgeometry-examples/skia/Model.hs +++ b/hgeometry-examples/skia/Model.hs @@ -78,7 +78,7 @@ currentStatus m1 m2 -- in planeGraphs data MyWorld -type PlaneGraph' r = PlaneGraph MyWorld (Point 2 r) PolygonEdgeType PolygonFaceData +type PlaneGraph' r = CPlaneGraph MyWorld (Point 2 r) PolygonEdgeType PolygonFaceData -------------------------------------------------------------------------------- -- * Data Type representing all our modal data diff --git a/hgeometry-examples/triangulateWorld/Main.hs b/hgeometry-examples/triangulateWorld/Main.hs index a220ad52a..b21f08e81 100644 --- a/hgeometry-examples/triangulateWorld/Main.hs +++ b/hgeometry-examples/triangulateWorld/Main.hs @@ -79,7 +79,7 @@ mainWith (Options inFile outFile) = do intersections' :: Set.Set (Point 2 R) intersections' = foldMap computeIntersections polies - subdivs :: [PlaneGraph PX (Point 2 R) _ _] + subdivs :: [CPlaneGraph PX (Point 2 R) _ _] subdivs = map (\(pg :+ _) -> triangulate pg) polies' triangles' :: [SimplePolygon (Point 2 R :+ _)]