diff options
Diffstat (limited to 'src/LambdaCube/GL/Type.hs')
-rw-r--r-- | src/LambdaCube/GL/Type.hs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/LambdaCube/GL/Type.hs b/src/LambdaCube/GL/Type.hs index 7f83a2a..ebd0582 100644 --- a/src/LambdaCube/GL/Type.hs +++ b/src/LambdaCube/GL/Type.hs | |||
@@ -10,12 +10,15 @@ import Data.Vector (Vector) | |||
10 | import Data.Word | 10 | import Data.Word |
11 | import Foreign.Ptr | 11 | import Foreign.Ptr |
12 | import Foreign.Storable | 12 | import Foreign.Storable |
13 | import Data.ByteString | ||
13 | 14 | ||
14 | import Graphics.GL.Core33 | 15 | import Graphics.GL.Core33 |
15 | 16 | ||
16 | import Linear | 17 | import Linear |
17 | import IR | 18 | import IR |
18 | 19 | ||
20 | type GLUniformName = String -- ByteString | ||
21 | |||
19 | --------------- | 22 | --------------- |
20 | -- Input API -- | 23 | -- Input API -- |
21 | --------------- | 24 | --------------- |
@@ -101,7 +104,7 @@ data GLStorage | |||
101 | , slotMap :: Map String SlotName | 104 | , slotMap :: Map String SlotName |
102 | , slotVector :: Vector (IORef GLSlot) | 105 | , slotVector :: Vector (IORef GLSlot) |
103 | , objSeed :: IORef Int | 106 | , objSeed :: IORef Int |
104 | , uniformSetter :: Map String InputSetter | 107 | , uniformSetter :: Map GLUniformName InputSetter |
105 | , uniformSetup :: Map String GLUniform | 108 | , uniformSetup :: Map String GLUniform |
106 | , screenSize :: IORef (Word,Word) | 109 | , screenSize :: IORef (Word,Word) |
107 | , pipelines :: IORef (Vector (Maybe GLRenderer)) -- attached pipelines | 110 | , pipelines :: IORef (Vector (Maybe GLRenderer)) -- attached pipelines |
@@ -113,7 +116,7 @@ data Object -- internal type | |||
113 | , objPrimitive :: Primitive | 116 | , objPrimitive :: Primitive |
114 | , objIndices :: Maybe (IndexStream Buffer) | 117 | , objIndices :: Maybe (IndexStream Buffer) |
115 | , objAttributes :: Map String (Stream Buffer) | 118 | , objAttributes :: Map String (Stream Buffer) |
116 | , objUniSetter :: Map String InputSetter | 119 | , objUniSetter :: Map GLUniformName InputSetter |
117 | , objUniSetup :: Map String GLUniform | 120 | , objUniSetup :: Map String GLUniform |
118 | , objOrder :: IORef Int | 121 | , objOrder :: IORef Int |
119 | , objEnabled :: IORef Bool | 122 | , objEnabled :: IORef Bool |