Remove individual uniforms from instancing light maps

2023-03-10 14:11:25 +00:00
parent c8b256c939
commit 5724a0543e
6 changed files with 21 additions and 22 deletions
@@ -145,11 +145,11 @@ preloadRender = do
            -- >>= addUniforms ["lightPos", "radiusUniform","lightID"]
    shadowcapshader <-
        makeShaderUsingVAO "shadow/cap" [vert, geom] ETriangles shPosVAO
-            >>= addUniforms ["lightPos", "lightID"]
+            >>= addUniforms [ "lightID"]
            -- >>= addUniforms ["lightPos"]
    shadowwallshader <-
        makeShaderUsingVAO "shadow/wallShadow" [vert, geom] EPoints wpVAO
-            >>= addUniforms ["lightPos","lightID"]
+            >>= addUniforms ["lightID"]

    -- positional shader
    positionalBlankShad <- makeShader "positional/blank" [vert, frag] [3] ETriangles
@@ -183,7 +183,8 @@ preloadRender = do
            >>= addUniforms ["lightPos", "lumRad"]
    shadowlightshader <-
        makeShaderUsingVAO "shadow/light" [vert, frag] ETriangleStrip fsshadvao
-            >>= addUniforms ["lightPos", "lumRad"]
+            -- >>= addUniforms ["lightPos", "lumRad"]
+            >>= addUniforms ["lightID"]
    barrelShad <- makeShader "texture/barrel" [vert, geom, frag] [2, 2, 2, 1] EPoints
    -- blank wallShader
    wallBlankShad <- makeShaderUsingVAO "wall/blank" [vert, geom, frag] EPoints wpColVAO