Delete cruft, add Reader monad to some internal ai

src/Shader.hs

@@ -1,4 +1,3 @@
-{-# LANGUAGE QuasiQuotes #-}
 module Shader
     ( makeShader
     , addTexture
@@ -47,7 +46,7 @@ extractProgAndUnis :: FullShader a -> (Program,[UniformLocation])
 extractProgAndUnis s = (_shaderProgram s, _shaderUniforms s)
 
 pokeShaders :: [FullShader a] -> F.FoldM IO a [Int]
-pokeShaders fss = traverse pokeShader fss
+pokeShaders = traverse pokeShader
 
 pokeShader :: FullShader a -> F.FoldM IO a Int
 pokeShader fs = F.FoldM (pokeRender fls (zip ptrs nAtss))  (return 0) return
@@ -61,18 +60,17 @@ pokeRender :: (a -> [[[Float]]])
 pokeRender toFs ptrs n rt = pokeList ptrs n (toFs rt)
 
 pokeList :: [(Ptr Float,Int)] -> Int -> [[[Float]]] -> IO Int
-pokeList ptrs n fsss = foldM (pokePtrs ptrs) n fsss
+pokeList ptrs = foldM (pokePtrs ptrs)
 
 pokePtrs :: [(Ptr Float,Int)] -> Int -> [[Float]] -> IO Int
 pokePtrs ptrIs n fss = do
     zipWithM_ f ptrIs fss
     return $ n + 1
-  where f (ptr,i) fs = pokeArrayOff ptr (i*n) fs
+  where 
+    f (ptr,i) fs = pokeArrayOff ptr (i*n) fs
 
 pokeArrayOff :: Storable a => Ptr a -> Int -> [a] -> IO ()
-pokeArrayOff ptr i xs =
-    zipWithM_ (pokeElemOff ptr) [i..] xs
-
+pokeArrayOff ptr i = zipWithM_ (pokeElemOff ptr) [i..]
 
 bindArrayBuffers :: Int -> [(BufferObject,Ptr Float,Int)] -> IO ()
 {-# INLINE bindArrayBuffers #-}
@@ -82,22 +80,20 @@ bindArrayBuffers numVs ps = do
         bufferData ArrayBuffer $= (fromIntegral $ floatSize * numVs * i, ptr, StreamDraw)
 
 bindShaderBuffers :: [FullShader a] -> [Int] -> IO ()
-bindShaderBuffers fss is =
-    zipWithM_ f fss is
+bindShaderBuffers = zipWithM_ f
   where 
     f fs i = bindArrayBuffers i $ _vaoBufferTargets $ _shaderVAO fs
 
 drawShaders :: [FullShader a] -> [Int] -> IO ()
-drawShaders fss is =
-    zipWithM_ drawShader fss is
+drawShaders = zipWithM_ drawShader
 
 drawShader :: FullShader a -> Int -> IO ()
 {-# INLINE drawShader #-}
 drawShader fs i = do 
     currentProgram $= Just (_shaderProgram fs)
-    bindVertexArrayObject $= (Just (_vao $ _shaderVAO fs))
+    bindVertexArrayObject $= Just (_vao $ _shaderVAO fs)
     case _shaderTexture fs of 
-        Just (ShaderTexture {_textureObject = to})
+        Just ShaderTexture{_textureObject = to}
             -> textureBinding Texture2D $= Just to
         _   -> return ()
     drawArrays (_shaderDrawPrimitive fs) 0 (fromIntegral i)