Replace explicit matrix uniforms with single ubo

src/Shader.hs

@@ -3,11 +3,7 @@ module Shader
     , bindShaderBuffers
     , drawShader
     , drawShaders
-    , setShaderUniforms
-    , resetShaderUniforms
-    , extractProgAndUnis 
     , freeShaderPointers
-    , setPerpMatUniform
     ) where
 import Geometry.Data
 import Shader.Data
@@ -21,9 +17,6 @@ import Graphics.Rendering.OpenGL hiding (Point,translate,scale,imageHeight)
 import Linear.Matrix
 import Linear.V4
 
-extractProgAndUnis :: FullShader -> (Program,UniformLocation)
-extractProgAndUnis s = (_shaderProgram s, _shaderMatrixUniform s)
-
 bindArrayBuffers :: Int -> VBO -> IO ()
 bindArrayBuffers numVs theVBO = do
     bindBuffer ArrayBuffer $= Just (_vbo theVBO)
@@ -49,49 +42,5 @@ drawShader fs i = do
         _   -> return ()
     drawArrays (_shaderDrawPrimitive fs) 0 (fromIntegral i)
 
-resetShaderUniforms :: [(Program, UniformLocation)] -> IO ()
-{-# INLINE resetShaderUniforms #-}
-resetShaderUniforms = setShaderUniforms 0 1 (0,0) (2,2)
-
-setShaderUniforms :: Float -> Float -> Point2 -> Point2 -> [(Program,UniformLocation)] -> IO ()
-{-# INLINE setShaderUniforms #-}
-setShaderUniforms rot czoom (tranx,trany) (winx,winy) fss = do
-    let scalMat = Linear.Matrix.transpose $
-            V4 (V4 (2*czoom/winx) 0             0 (0::GLfloat))
-                (V4 0             (2*czoom/winy) 0 0)
-                (V4 0             0             1 0)
-                (V4 0             0             0 1)
-    let rotMat = Linear.Matrix.transpose $
-            V4 (V4 (cos rot) (sin (-rot)) 0 0)
-                (V4 (sin rot) (cos rot)    0 0)
-                (V4 0             0        1 0)
-                (V4 0             0        0 1)
-    let tranMat = Linear.Matrix.transpose $
-            V4 (V4 1        0        0 0)
-                (V4 0        1        0 0)
-                (V4 0        0        1 0)
-                (V4 (-tranx) (-trany) 0 1)
-    let wmat = scalMat !*! rotMat !*! tranMat
-        vToL (V4 a b c d) = [a,b,c,d]
-    wmata <- (newMatrix RowMajor $ concatMap vToL $ vToL wmat) :: IO (GLmatrix GLfloat)
--- set common uniforms
-    forM_ fss $ \shad -> do
-        currentProgram $= Just (fst shad)
-        uniform (snd shad) $= wmata
-
-setPerpMatUniform 
-    :: Float -- ^ rotation
-    -> Float -- ^ zoom
-    -> Point2 -- ^ translation
-    -> Point2 -- ^ window size
-    -> Point2 -- ^ viewfrom point
-    -> FullShader
-    -> IO ()
-setPerpMatUniform rot czoom trans wins vFrom shad = do
-    pmat <- (newMatrix RowMajor $ perspectiveMatrix rot czoom trans wins vFrom) :: IO (GLmatrix GLfloat)
-    currentProgram $= Just (_shaderProgram shad)
-    uniform (_shaderMatrixUniform shad) $= pmat
-    return ()
-
 freeShaderPointers :: FullShader -> IO ()
 freeShaderPointers fs = free $ _vboPointer $ _vaoVBO $ _shaderVAO fs