diff options
author | Joe Crayne <joe@jerkface.net> | 2019-05-02 17:08:04 -0400 |
---|---|---|
committer | Joe Crayne <joe@jerkface.net> | 2019-05-02 17:08:04 -0400 |
commit | 44ec6fa45b71d95650d05ea4e16550698ca7fb93 (patch) | |
tree | c40247b1cccea5a3c63473d47de50d5f56908d6c /MeshSketch.hs | |
parent | 5abe70c7457ebedc5e4e348e3dc5a7b830fab897 (diff) |
Use compiler-support for TextureCube.
Diffstat (limited to 'MeshSketch.hs')
-rw-r--r-- | MeshSketch.hs | 7 |
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 | |||
32 | import LambdaCube.Gtk | 32 | import LambdaCube.Gtk |
33 | import LambdaCube.GL.Data (uploadCubeMapToGPU) | 33 | import LambdaCube.GL.Data (uploadCubeMapToGPU) |
34 | import LambdaCube.GL.Type (TextureData(..)) | 34 | import LambdaCube.GL.Type (TextureData(..)) |
35 | import Text.Show.Pretty (ppShow) | 35 | -- import Text.Show.Pretty (ppShow) |
36 | 36 | ||
37 | import CubeMap | 37 | import CubeMap |
38 | import GLWidget (nullableContext, withCurrentGL) | 38 | import GLWidget (nullableContext, withCurrentGL) |
@@ -43,7 +43,6 @@ import LoadMesh | |||
43 | import InfinitePlane | 43 | import InfinitePlane |
44 | import MtlParser (ObjMaterial(..)) | 44 | import MtlParser (ObjMaterial(..)) |
45 | import Matrix | 45 | import Matrix |
46 | import SavedPipeline | ||
47 | 46 | ||
48 | -- State created by uploadState. | 47 | -- State created by uploadState. |
49 | data State = State | 48 | data 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 |