Start modularising shader code

src/Shader/AuxAddition.hs

@@ -0,0 +1,36 @@
+module Shader.AuxAddition
+    ( addTexture
+    , addUniforms
+    ) where
+import Shader.Data
+
+import Foreign
+import Codec.Picture
+import qualified Data.Vector.Storable as V
+import Control.Lens
+import Graphics.Rendering.OpenGL hiding (Point,translate,scale,imageHeight)
+--import Text.RawString.QQ
+    
+-- I am not sure if this assumes that the shader is constructed directly before
+-- the texture is added...
+addTexture :: String -> FullShader -> IO (FullShader)
+addTexture texturePath shad = do
+    Right cmap <- readImage texturePath
+    let tex = convertRGBA8 cmap
+    textureOb <- genObjectName
+    textureBinding Texture2D $= Just textureOb
+    let texData = V.toList $ imageData tex
+        wtex = fromIntegral $ imageWidth  tex
+        htex = fromIntegral $ imageHeight tex
+    withArray texData $ \ptr -> do
+        texImage2D Texture2D NoProxy 0 RGBA8 (TextureSize2D wtex htex) 0 
+                        (PixelData RGBA UnsignedByte ptr)
+    generateMipmap' Texture2D
+    textureFilter Texture2D $= ((Linear',Just Linear') , Nearest)
+    return $ shad & shaderTexture ?~ ShaderTexture {_textureObject = textureOb}
+
+
+addUniforms :: [String] -> FullShader -> IO (FullShader)
+addUniforms uniStrings shad = do
+    uniLocs <- mapM (uniformLocation $ _shaderProgram shad) uniStrings
+    return $ shad & shaderCustomUnis %~ (++ uniLocs)