diff options
author | Csaba Hruska <csaba.hruska@gmail.com> | 2016-01-29 15:25:49 +0100 |
---|---|---|
committer | Csaba Hruska <csaba.hruska@gmail.com> | 2016-01-29 15:25:49 +0100 |
commit | 32646973035dcb3f35c7501d0654607dfaeec091 (patch) | |
tree | b92156c74372af734da74342e4a4a0a12d6a8fdf /examples/Hello.hs | |
parent | 0d46a5cda433fe1a97f3c35002c192d8050e747a (diff) |
simplify Mesh data add some missing function
Diffstat (limited to 'examples/Hello.hs')
-rw-r--r-- | examples/Hello.hs | 12 |
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 #-} |
2 | import "GLFW-b" Graphics.UI.GLFW as GLFW | 2 | import "GLFW-b" Graphics.UI.GLFW as GLFW |
3 | import qualified Data.Map as Map | 3 | import qualified Data.Map as Map |
4 | import qualified Data.Vector.Storable as SV | 4 | import qualified Data.Vector as V |
5 | 5 | ||
6 | import LambdaCube.GL as LambdaCubeGL -- renderer | 6 | import LambdaCube.GL as LambdaCubeGL -- renderer |
7 | import LambdaCube.GL.Mesh as LambdaCubeGL | 7 | import LambdaCube.GL.Mesh as LambdaCubeGL |
@@ -69,21 +69,19 @@ main = do | |||
69 | triangleA :: LambdaCubeGL.Mesh | 69 | triangleA :: LambdaCubeGL.Mesh |
70 | triangleA = Mesh | 70 | triangleA = 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 | ||
79 | triangleB :: LambdaCubeGL.Mesh | 78 | triangleB :: LambdaCubeGL.Mesh |
80 | triangleB = Mesh | 79 | triangleB = 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 | ||
89 | initWindow :: String -> Int -> Int -> IO Window | 87 | initWindow :: String -> Int -> Int -> IO Window |