Refactor loading of background shader

src/Picture/Preload.hs

@@ -21,16 +21,11 @@ import Geometry (Point2)
 
 data RenderData = RenderData
     { _textures :: [TextureObject]
-    , _backShader       :: (Program, [UniformLocation])
-    , _wallShadowShader :: (Program, [UniformLocation])
---    , _lightmapCircleShader :: (Program, [UniformLocation])
     , _lightSourceShader :: FullShader (Float,Float,Float,Float)
-    , _wlShadShader :: FullShader (Point2,Point2,Point2,Point2)
+    , _wallShadowShader  :: FullShader (Point2,Point2,Point2,Point2)
+    , _backgroundShader  :: FullShader (Point2,Point2,Point2,Point2)
     , _listShaders :: [FullShader RenderType]
     , _backVAO :: VAO
-    , _wallVAO :: VAO
-    , _fadeCircVAO :: VAO
-    , _wssLightPos :: UniformLocation
     , _dummyVBO :: BufferObject
     , _dummyPtr :: Ptr Float
     }
@@ -62,19 +57,21 @@ frag = FragmentShader
 pokeWPStrat :: (Point2,Point2,Point2,Point2) -> [[[Float]]]
 pokeWPStrat ((x,y),(z,w),(a,b),(c,d)) = [[[x,y,z,w],[a,b,c,d]]]
 
+pokeBGStrat :: a -> [[[Float]]]
+pokeBGStrat = const []
+
 preloadRender :: IO RenderData
 preloadRender = do
 -- compile shader programs
     lsShad <- makeShader "lightmapCircle" [vert,geom,frag] [(0,4)] Points (return . return . flat4)
 --    fcs <- makeSourcedShader "lightmapCircle" [VertexShader,GeometryShader,FragmentShader]
-    bgs <- makeSourcedShader "background" [VertexShader,GeometryShader,FragmentShader]
-    wss <- makeSourcedShader "wallShadow" [VertexShader,GeometryShader,FragmentShader]
+
+    bgShad <- makeTextureShader "background" [vert,geom,frag] [(0,4),(1,2)] Points pokeBGStrat
+                                "data/texture/smudgedDirt.png"
 
     wsShad <- makeShaderCustomUnis "wallShadow" [vert,geom,frag] [(0,4),(1,4)] Points pokeWPStrat
                 ["lightPos"]
 
-    wssLightPosUniLoc   <- GL.uniformLocation (fst wss) "lightPos"
-
     bslist <- makeShader "basic"   [vert,frag]      [(0,3),(1,4)]       Triangles pokeTriStrat
     lslist <- makeShader "basic"   [vert,frag]      [(0,3),(1,4)]       Lines     pokeLineStrat
     aslist <- makeShader "arc"     [vert,geom,frag] [(0,3),(1,4),(2,3)] Points    pokeArcStrat
@@ -106,23 +103,17 @@ preloadRender = do
 -- input a list of (attribute location, attrib length) pairs
 -- these will have buffers and pointers created
     backgroundvao <- setupVAO [(0,4),(1,2)]
-    wallvao       <- setupVAO [(0,4),(1,4)]
-    fadevao       <- setupVAO [(0,4)]
     
     return $ RenderData
         { _textures = [dirttex,dirttex]
         , _listShaders = [bslist,lslist,cslist,aslist,eslist]
 --        , _lightmapCircleShader = fcs
-        , _backShader = bgs
-        , _wallShadowShader = wss
         , _backVAO = backgroundvao
-        , _wallVAO = wallvao
-        , _fadeCircVAO = fadevao
         , _dummyVBO = dummyvbo
         , _dummyPtr = dummyptr
-        , _wssLightPos = wssLightPosUniLoc
         , _lightSourceShader = lsShad
-        , _wlShadShader = wsShad
+        , _wallShadowShader  = wsShad
+        , _backgroundShader  = bgShad
         }
 
 vaoPointers :: VAO -> [Ptr Float]