better Fragment data type

2 files changed, 22 insertions, 18 deletions

diff --git a/lc/Builtins.lc b/lc/Builtins.lc
index e123b4bd..c1991a2b 100644
--- a/lc/Builtins.lc
+++ b/lc/Builtins.lc
@@ -346,10 +346,19 @@ type family RemSemantics a where
 
 -------------------
 
+data Maybe a
+    = Nothing
+    | Just a
+--    deriving (Eq, Ord, Show)
+
 data Vector (n :: Nat) t
 
-data Fragment (l :: Nat) t
-    = Fragment (Vec 3 Float) (Vector l t)
+type Fragment n t = Vector n (Maybe (SimpleFragment t))
+
+data SimpleFragment t = SimpleFragment
+    { sFragmentCoords   :: Vec 3 Float
+    , sFragmentValue    :: t
+    }
 
 type FragmentStream n t = Stream (Fragment n t)
 
@@ -358,6 +367,17 @@ customizeDepth :: (a -> Float) -> Fragment n a -> Fragment n a
 customizeDepths :: (a -> Float) -> FragmentStream n a -> FragmentStream n a
 customizeDepths f = mapStream (customizeDepth f)
 
+filterFragment :: (a -> Bool) -> Fragment n a -> Fragment n a
+
+filterFragments :: (a -> Bool) -> FragmentStream n a -> FragmentStream n a
+filterFragments p = mapStream (filterFragment p)
+
+mapFragment :: (a -> b) -> Fragment n a -> Fragment n b
+
+mapFragments :: (a -> b) -> FragmentStream n a -> FragmentStream n b
+mapFragments f = mapStream (mapFragment f)
+
+
 data Interpolated t where
   Smooth, NoPerspective
                       :: (Floating t) => Interpolated t
@@ -380,16 +400,6 @@ rasterize
 rasterizePrimitives ctx is = concatMapStream (rasterize is ctx)
 --rasterizePrimitivesWithPointSize ctx ps is = concatMapStream (rasterize ps is ctx)
 
-checkFragment :: (a -> Bool) -> Fragment n a -> Bool
-
-filterFragments :: (a -> Bool) -> FragmentStream n a -> FragmentStream n a
-filterFragments p = filterStream (checkFragment p)
-
-mapFragment :: (a -> b) -> Fragment n a -> Fragment n b
-
-mapFragments :: (a -> b) -> FragmentStream n a -> FragmentStream n b
-mapFragments f = mapStream (mapFragment f)
-
 data Image :: Nat -> Type -> Type where
   ColorImage          :: forall a d t color . (Num t, color ~ VecScalar d t)
                       => color  -> Image a (Color color)
diff --git a/lc/Prelude.lc b/lc/Prelude.lc
index bc89e137..f5d1fee6 100644
--- a/lc/Prelude.lc
+++ b/lc/Prelude.lc
@@ -86,12 +86,6 @@ infixr 5 ++
 iterate :: (a -> a) -> a -> [a]
 iterate f x =  x : iterate f (f x)
 
-data Maybe a
-    = Nothing
-    | Just a
---    deriving (Eq, Ord, Show)
-
-
 fst (a, b) = a
 snd (a, b) = b