Remove polymorphism of shader type

src/Picture/Render.hs

@@ -34,7 +34,7 @@ setWallDepth
 setWallDepth pdata wallPoints (viewFromx,viewFromy) _ = do
     startTicks <- SDL.ticks
     colorMask $= Color4 Disabled Disabled Disabled Disabled
-    nWalls <- F.foldM (pokeShader $ _lightingOccludeShader pdata) wallPoints
+    nWalls <- F.foldM (pokeShader $ _lightingOccludeShader pdata) (map Render22 wallPoints)
     bindShaderBuffers [_lightingOccludeShader pdata] [nWalls]
 
     currentProgram $= Just (_shaderProgram $ _lightingOccludeShader pdata)
@@ -76,9 +76,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) wallPoints
+    nWallLights <- F.foldM (pokeShader $ _lightingWallShader pdata) (map Render22 wallPoints)
     bindShaderBuffers [_lightingWallShader pdata] [nWallLights]
-    nWalls <- F.foldM (pokeShader $ _lightingOccludeShader pdata) 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)
@@ -237,14 +237,14 @@ setIsoMatrixUniforms pdata rot camZoom (tranx,trany) (winx,winy) = do
     setShaderUniforms rot camZoom (tranx,trany) (winx,winy) 
         ( extractProgAndUnis (_lightingFloorShader pdata) 
         : extractProgAndUnis (_backgroundShader pdata) 
-        : extractProgAndUnis (_textureShader pdata)
+        -- : extractProgAndUnis (_textureShader pdata)
         : map extractProgAndUnis (_pictureShaders pdata)
         )
 
 renderShader
     :: Foldable f
-    => FullShader a
-    -> f a
+    => FullShader
+    -> f RenderType
     -> IO Word32
 renderShader shad dat = do
     sticks <- SDL.ticks