summaryrefslogtreecommitdiff
path: root/MeshSketch.hs
diff options
context:
space:
mode:
authorJoe Crayne <joe@jerkface.net>2019-05-02 17:08:04 -0400
committerJoe Crayne <joe@jerkface.net>2019-05-02 17:08:04 -0400
commit44ec6fa45b71d95650d05ea4e16550698ca7fb93 (patch)
treec40247b1cccea5a3c63473d47de50d5f56908d6c /MeshSketch.hs
parent5abe70c7457ebedc5e4e348e3dc5a7b830fab897 (diff)
Use compiler-support for TextureCube.
Diffstat (limited to 'MeshSketch.hs')
-rw-r--r--MeshSketch.hs7
1 files changed, 3 insertions, 4 deletions
diff --git a/MeshSketch.hs b/MeshSketch.hs
index 5bf6fea..02ba53a 100644
--- a/MeshSketch.hs
+++ b/MeshSketch.hs
@@ -32,7 +32,7 @@ import LambdaCube.IR as LC
32import LambdaCube.Gtk 32import LambdaCube.Gtk
33import LambdaCube.GL.Data (uploadCubeMapToGPU) 33import LambdaCube.GL.Data (uploadCubeMapToGPU)
34import LambdaCube.GL.Type (TextureData(..)) 34import LambdaCube.GL.Type (TextureData(..))
35import Text.Show.Pretty (ppShow) 35-- import Text.Show.Pretty (ppShow)
36 36
37import CubeMap 37import CubeMap
38import GLWidget (nullableContext, withCurrentGL) 38import GLWidget (nullableContext, withCurrentGL)
@@ -43,7 +43,6 @@ import LoadMesh
43import InfinitePlane 43import InfinitePlane
44import MtlParser (ObjMaterial(..)) 44import MtlParser (ObjMaterial(..))
45import Matrix 45import Matrix
46import SavedPipeline
47 46
48-- State created by uploadState. 47-- State created by uploadState.
49data State = State 48data State = State
@@ -200,8 +199,8 @@ new = do
200 m <- do 199 m <- do
201 objName <- head . (++ ["cube.obj"]) <$> getArgs 200 objName <- head . (++ ["cube.obj"]) <$> getArgs
202 mobj <- loadOBJ objName 201 mobj <- loadOBJ objName
203 -- mpipeline <- loadPipeline "hello_obj2.json" $ do 202 -- mpipeline <- (\s -> return (Right (DynamicPipeline savedPipeline (makeSchema s)))) $ do
204 mpipeline <- (\s -> return (Right (DynamicPipeline savedPipeline (makeSchema s)))) $ do 203 mpipeline <- loadPipeline "hello_obj2.json" $ do
205 defObjectArray "SkyCube" Triangles $ do 204 defObjectArray "SkyCube" Triangles $ do
206 "position" @: Attribute_V3F 205 "position" @: Attribute_V3F
207 defObjectArray "objects" Triangles $ do 206 defObjectArray "objects" Triangles $ do