Refactor poking slightly

src/Picture/Render.hs

@@ -9,6 +9,8 @@ module Picture.Render
     where
 
 import Shader
+import Shader.Data
+import Shader.Poke
 --import MatrixHelper
 import Picture.Preload
 import Picture.Data
@@ -34,7 +36,7 @@ setWallDepth
 setWallDepth pdata wallPoints (viewFromx,viewFromy) _ = do
     startTicks <- SDL.ticks
     colorMask $= Color4 Disabled Disabled Disabled Disabled
-    nWalls <- F.foldM (pokeShader' $ _lightingOccludeShader pdata) (map Render22 wallPoints)
+    nWalls <- F.foldM (pokeShader $ _lightingOccludeShader pdata) (map Render22 wallPoints)
     bindShaderBuffers [_lightingOccludeShader pdata] [nWalls]
 
     currentProgram $= Just (_shaderProgram $ _lightingOccludeShader pdata)
@@ -76,9 +78,9 @@ createLightMap pdata resDiv wallPoints lightPoints (viewFromx,viewFromy) pmat _
     bindFramebuffer Framebuffer $= _spareFBO pdata
 
 -- store wall and light positions into buffer
-    nWallLights <- F.foldM (pokeShader' $ _lightingWallShader pdata) (map Render22 wallPoints)
+    nWallLights <- F.foldM (pokeShader $ _lightingWallShader pdata) (map Render22 wallPoints)
     bindShaderBuffers [_lightingWallShader pdata] [nWallLights]
-    nWalls <- F.foldM (pokeShader' $ _lightingOccludeShader pdata) (map Render22 wallPoints)
+    nWalls <- F.foldM (pokeShader $ _lightingOccludeShader pdata) (map Render22 wallPoints)
     bindShaderBuffers [_lightingOccludeShader pdata] [nWalls]
 -- set uniforms for shader that draws lights
     currentProgram $= Just (_shaderProgram $ _lightingWallShader pdata)
@@ -246,7 +248,7 @@ renderShader
     -> IO Word32
 renderShader shad dat = do
     sticks <- SDL.ticks
-    i <- F.foldM  (pokeShader' shad) dat
+    i <- F.foldM  (pokeShader shad) dat
     bindShaderBuffers [shad] [i]
     drawShader shad i
     eticks <- SDL.ticks
@@ -257,13 +259,13 @@ renderFoldable
     => RenderData
     -> f RenderType
     -> IO Word32
-renderFoldable pdata tree = do
+renderFoldable pdata struct = do
     pokeStartTicks <- SDL.ticks
 
     let slist = _pictureShaders pdata
 
 -- poke data, returns list of number of vertices for each shader
-    is <- F.foldM (pokeShaders slist) tree
+    is <- F.foldM (pokeShaders slist) struct
 
 -- the idea of binding many buffers at once, rather than interweaving with draw
 -- calls, is to prevent opengl from waiting for a draw call to finish