summaryrefslogtreecommitdiff
path: root/examples/Hello.hs
diff options
context:
space:
mode:
authorCsaba Hruska <csaba.hruska@gmail.com>2016-01-29 15:25:49 +0100
committerCsaba Hruska <csaba.hruska@gmail.com>2016-01-29 15:25:49 +0100
commit32646973035dcb3f35c7501d0654607dfaeec091 (patch)
treeb92156c74372af734da74342e4a4a0a12d6a8fdf /examples/Hello.hs
parent0d46a5cda433fe1a97f3c35002c192d8050e747a (diff)
simplify Mesh data add some missing function
Diffstat (limited to 'examples/Hello.hs')
-rw-r--r--examples/Hello.hs12
1 files changed, 5 insertions, 7 deletions
diff --git a/examples/Hello.hs b/examples/Hello.hs
index 1dfc547..89553d0 100644
--- a/examples/Hello.hs
+++ b/examples/Hello.hs
@@ -1,7 +1,7 @@
1{-# LANGUAGE PackageImports, LambdaCase, OverloadedStrings #-} 1{-# LANGUAGE PackageImports, LambdaCase, OverloadedStrings #-}
2import "GLFW-b" Graphics.UI.GLFW as GLFW 2import "GLFW-b" Graphics.UI.GLFW as GLFW
3import qualified Data.Map as Map 3import qualified Data.Map as Map
4import qualified Data.Vector.Storable as SV 4import qualified Data.Vector as V
5 5
6import LambdaCube.GL as LambdaCubeGL -- renderer 6import LambdaCube.GL as LambdaCubeGL -- renderer
7import LambdaCube.GL.Mesh as LambdaCubeGL 7import LambdaCube.GL.Mesh as LambdaCubeGL
@@ -69,21 +69,19 @@ main = do
69triangleA :: LambdaCubeGL.Mesh 69triangleA :: LambdaCubeGL.Mesh
70triangleA = Mesh 70triangleA = Mesh
71 { mAttributes = Map.fromList 71 { mAttributes = Map.fromList
72 [ ("position", A_V2F $ SV.fromList [V2 1 1, V2 1 (-1), V2 (-1) (-1)]) 72 [ ("position", A_V2F $ V.fromList [V2 1 1, V2 1 (-1), V2 (-1) (-1)])
73 , ("uv", A_V2F $ SV.fromList [V2 1 1, V2 0 1, V2 0 0]) 73 , ("uv", A_V2F $ V.fromList [V2 1 1, V2 0 1, V2 0 0])
74 ] 74 ]
75 , mPrimitive = P_Triangles 75 , mPrimitive = P_Triangles
76 , mGPUData = Nothing
77 } 76 }
78 77
79triangleB :: LambdaCubeGL.Mesh 78triangleB :: LambdaCubeGL.Mesh
80triangleB = Mesh 79triangleB = Mesh
81 { mAttributes = Map.fromList 80 { mAttributes = Map.fromList
82 [ ("position", A_V2F $ SV.fromList [V2 1 1, V2 (-1) (-1), V2 (-1) 1]) 81 [ ("position", A_V2F $ V.fromList [V2 1 1, V2 (-1) (-1), V2 (-1) 1])
83 , ("uv", A_V2F $ SV.fromList [V2 1 1, V2 0 0, V2 1 0]) 82 , ("uv", A_V2F $ V.fromList [V2 1 1, V2 0 0, V2 1 0])
84 ] 83 ]
85 , mPrimitive = P_Triangles 84 , mPrimitive = P_Triangles
86 , mGPUData = Nothing
87 } 85 }
88 86
89initWindow :: String -> Int -> Int -> IO Window 87initWindow :: String -> Int -> Int -> IO Window