Remove Maybe from custom unis
This commit is contained in:
+4
-9
@@ -24,15 +24,12 @@ import Graphics.Rendering.OpenGL
|
||||
import Foreign
|
||||
import Control.Lens
|
||||
{- | Vertex array object: contains the reference to the object,
|
||||
and its buffer targets.
|
||||
-}
|
||||
and its buffer targets. -}
|
||||
data VAO = VAO
|
||||
{ _vao :: VertexArrayObject
|
||||
, _vaoBufferTargets :: [(BufferObject,Ptr Float,Int)]
|
||||
}
|
||||
{- |
|
||||
Datatype containing the necessary information for a single shader.
|
||||
-}
|
||||
{- | Datatype containing the necessary information for a single shader. -}
|
||||
data FullShader a = FullShader
|
||||
{ _shaderProgram :: Program
|
||||
, _shaderUniforms :: [UniformLocation]
|
||||
@@ -40,11 +37,9 @@ data FullShader a = FullShader
|
||||
, _shaderPokeStrategy :: a -> [[[Float]]]-- -> F.FoldM IO RenderType Int
|
||||
, _shaderDrawPrimitive :: PrimitiveMode
|
||||
, _shaderTexture :: Maybe ShaderTexture
|
||||
, _shaderCustomUnis :: Maybe [UniformLocation]
|
||||
, _shaderCustomUnis :: [UniformLocation]
|
||||
}
|
||||
{- |
|
||||
Datatype containing the reference to a texture object.
|
||||
-}
|
||||
{- | Datatype containing the reference to a texture object. -}
|
||||
newtype ShaderTexture = ShaderTexture
|
||||
{ _textureObject :: TextureObject }
|
||||
|
||||
|
||||
Reference in New Issue
Block a user