Start cleanup

This commit is contained in:
2021-08-12 15:02:26 +02:00
parent 62af1402ad
commit 53555865f6
10 changed files with 121 additions and 387 deletions
+24 -23
View File
@@ -1,6 +1,6 @@
module Shader.Compile
( makeShader
, makeVShader
--, makeVShader
, makeShaderSized
, makeShaderUsingShaderVAO
, makeSourcedShader
@@ -16,28 +16,28 @@ import Control.Monad
--import Control.Lens
import Graphics.Rendering.OpenGL hiding (Point,translate,scale,imageHeight)
{- |
Compiles a vertex shader found within the shader directory.
The shader is made up of files begining with the inputted string with extensions .vert, .geom etc.
-}
makeVShader
:: String -- ^ First part of the name of the shader
-> [ShaderType] -- ^ Filetype extensions
-> [Int] -- ^ The input vertex sizes
-> EPrimitiveMode
-> IO VShader
makeVShader s shaderlist sizes pm = do
prog <- makeSourcedShader s shaderlist
vaob <- setupVAO sizes
return $ VShader
{ _vshaderProgram = prog
, _vshaderVAO = vaob
, _vshaderTexture = Nothing
, _vshaderCustomUnis = []
, _vshaderDrawPrimitive = pm
}
--{- |
--Compiles a vertex shader found within the shader directory.
--The shader is made up of files begining with the inputted string with extensions .vert, .geom etc.
---}
--makeVShader
-- :: String -- ^ First part of the name of the shader
-- -> [ShaderType] -- ^ Filetype extensions
-- -> [Int] -- ^ The input vertex sizes
-- -> EPrimitiveMode
-- -> IO VShader
--makeVShader s shaderlist sizes pm = do
-- prog <- makeSourcedShader s shaderlist
-- vaob <- setupVAO sizes
-- return $ VShader
-- { _vshaderProgram = prog
-- , _vshaderVAO = vaob
-- , _vshaderTexture = Nothing
-- , _vshaderCustomUnis = []
-- , _vshaderDrawPrimitive = pm
-- }
-- | Takes the VAO and poke strategy from another shader
-- | Takes the VAO from another shader
makeShaderUsingShaderVAO
:: String -- ^ First part of the name of the shader
-> [ShaderType] -- ^ Filetype extensions
@@ -60,7 +60,8 @@ makeShader
:: String -- ^ First part of the name of the shader
-> [ShaderType] -- ^ Filetype extensions
-> [Int] -- ^ The input vertex sizes
-> EPrimitiveMode -> IO FullShader
-> EPrimitiveMode
-> IO FullShader
makeShader s shaderlist sizes pm = do
prog <- makeSourcedShader s shaderlist
vaob <- setupVAO sizes