Cleanup: remove uniforms from shader datatype

2023-03-20 01:19:10 +00:00
parent 33f31aa385
commit 32ecf46343
17 changed files with 24 additions and 99 deletions
@@ -127,8 +127,10 @@ doDrawing' win pdata u = do
    glDepthFunc GL_LESS
    -- draw wall occlusions from the camera's point of view
    glUseProgram (pdata ^. lightingWallShadShader . shadName)
-    glUniform3f (pdata ^?! lightingWallShadShader . shadUnis . ix 0) vfx vfy 20
-    glUniform1f (pdata ^?! lightingWallShadShader . shadUnis . ix 1) 1000
+    glProgramUniform3f (pdata ^. lightingWallShadShader . shadName) 
+        0 vfx vfy 20
+    glProgramUniform1f (pdata ^. lightingWallShadShader . shadName) 
+        1 1000
    glBindVertexArray $ pdata ^. lightingWallShadShader . shadVAO . vaoName
    unless (debugOn Remove_LOS cfig) $
        glDrawArrays