adjust vector version and fix exercises

lambdacube3d · Feb 5, 2016 · 9479838 · 9479838
1 parent a902504
commit 9479838
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 6 deletions.
diff --git a/compiler-service/compiler-service.cabal b/compiler-service/compiler-service.cabal
@@ -31,7 +31,7 @@ executable compiler-service
     lambdacube-compiler == 0.4.*,
     pretty-show == 1.6.*,
     containers,
-    vector,
+    vector >= 0.11 && <0.12,
     parsec,
     aeson-pretty,
     process,

diff --git a/exercises/Cube.lc b/exercises/Cube.lc
@@ -1,5 +1,5 @@
 makeFrame (projmat :: Mat 4 4 Float)
-          (vertexstream :: Stream (Primitive Triangle (Vec 4 Float)))
+          (vertexstream :: PrimitiveStream Triangle (Vec 4 Float))
 
           = imageFrame (emptyDepthImage 1, emptyColorImage navy)
   `overlay` fragments

diff --git a/exercises/LambdaCube.lc b/exercises/LambdaCube.lc
@@ -28,7 +28,7 @@ len2 v = v%x*v%x + v%y*v%y + v%z*v%z
 
 makeFrame (time :: Float)
           (projmat :: Mat 4 4 Float)
-          (vertexstream :: Stream (Primitive Triangle (Vec 4 Float)))
+          (vertexstream :: PrimitiveStream Triangle (Vec 4 Float))
 
     = imageFrame (emptyDepthImage 1, emptyColorImage navy)
   `overlay`

diff --git a/exercises/LambdaCube2.lc b/exercises/LambdaCube2.lc
@@ -3,7 +3,7 @@ len2 v = v%x*v%x + v%y*v%y + v%z*v%z
 
 makeFrame (time :: Float)
           (projmat :: Mat 4 4 Float)
-          (vertexstream :: Stream (Primitive Triangle (Vec 4 Float)))
+          (vertexstream :: PrimitiveStream Triangle (Vec 4 Float))
 
     = imageFrame (emptyDepthImage 1, emptyColorImage navy)
   `overlay`

diff --git a/exercises/MagicCube.lc b/exercises/MagicCube.lc
@@ -7,7 +7,7 @@ f x = (x + sin x + sin (1.1 * x)) `mod` 4 * 2
 
 makeFrame (time :: Float)
           (projmat :: Mat 4 4 Float)
-          (vertexstream :: Stream (Primitive Triangle (Vec 4 Float)))
+          (vertexstream :: PrimitiveStream Triangle (Vec 4 Float))
 
     = imageFrame (emptyDepthImage 1, emptyColorImage navy)
   `overlay`

diff --git a/exercises/Stripes.lc b/exercises/Stripes.lc
@@ -1,6 +1,6 @@
 
 makeFrame (time :: Float)
-          (vertexstream :: Stream (Primitive Triangle (Vec 4 Float)))
+          (vertexstream :: PrimitiveStream Triangle (Vec 4 Float))
 
     = foldl' overlay (imageFrame (emptyDepthImage 1, emptyColorImage navy))
     $ map (f . (/10)) [ 1 .. 10 ]

diff --git a/exercises/Tetrahedron.lc b/exercises/Tetrahedron.lc
@@ -0,0 +1,31 @@
+tetrahedron =
+    [ V3 0 0 0, V3 1 0 0, V3 0 1 0
+    , V3 1 0 0, V3 0 1 0, V3 0 0 1
+    , V3 0 1 0, V3 0 0 1, V3 0 0 0
+    , V3 0 0 1, V3 0 0 0, V3 0 0 1
+    ]
+
+f x = (x + sin x + sin (1.1 * x)) `mod` 4 * 2
+
+makeFrame (time :: Float)
+          (projmat :: Mat 4 4 Float)
+          (vertexstream :: PrimitiveStream Triangle (Vec 4 Float))
+
+    =         imageFrame (emptyDepthImage 1, emptyColorImage navy)
+    `overlay` accumulablefragments
+  where
+    accumulablefragments
+        = vertexstream
+        & mapPrimitives (\x -> (scale 0.5 (projmat *. x), x))
+        & rasterizePrimitives (TriangleCtx CullNone PolygonFill NoOffset LastVertex) Smooth
+        & filterFragments (\x -> True)
+        & mapFragments (\x -> (rotMatrixZ time *. rotMatrixY time *. x) *! f time)
+        & accumulateWith (DepthOp Less True, ColorOp NoBlending (V4 True True True True))
+
+main = renderFrame $
+   makeFrame (Uniform "Time")
+             (Uniform "MVP")
+             tetrahedronStream
+
+tetrahedronStream = fetchArrays Triangle $ map (\v -> V4 v%x v%y v%z 1) tetrahedron
+