General cleanup

src/Dodge/Data/Config.hs

@@ -33,6 +33,16 @@ data NumShadowCasters
     | NumLight18
     | NumLight19
     | NumLight20
+    | NumLight21
+    | NumLight22
+    | NumLight23
+    | NumLight24
+    | NumLight25
+    | NumLight26
+    | NumLight27
+    | NumLight28
+    | NumLight29
+    | NumLight30
     deriving (Show,Eq,Bounded,Ord,Enum)
 
 data Config = Config

src/Dodge/Render.hs

@@ -138,14 +138,7 @@ doDrawing' win pdata u = do
     --draw walls onto base buffer
     glEnable GL_CULL_FACE
     glCullFace GL_BACK
-    --    glUseProgram (pdata ^. wallShader . shaderUINT)
-    --    glBindVertexArray $ pdata ^. wallShader . shaderVAO . vaoName
-    --    glDrawArrays
-    --        (_unPrimitiveMode $ pdata ^. wallShader . shaderPrimitive)
-    --        0
-    --        (fromIntegral trueNWalls)
     glUseProgram (pdata ^. pullWallShader)
-    --glBindVertexArray $ pdata ^. dummyVAO . vaoName
     glDrawArrays GL_TRIANGLES 0 (fromIntegral trueNWalls * 6)
     --draw object shapes onto base buffer
     let fs = _shapeShader pdata
@@ -157,11 +150,7 @@ doDrawing' win pdata u = do
     glDepthMask GL_FALSE
     glDrawBuffer GL_NONE
     glStencilOp GL_KEEP GL_KEEP GL_INCR
-    with 0 $
-        glClearNamedFramebufferiv
-            (pdata ^. fboBase . _1 . unFBO)
-            GL_STENCIL
-            0
+    with 0 $ glClearNamedFramebufferiv (pdata ^. fboBase . _1 . unFBO) GL_STENCIL 0
     glDrawArrays
         (_unPrimitiveMode $ pdata ^. chasmShader . shaderPrimitive)
         0
@@ -295,12 +284,6 @@ doDrawing' win pdata u = do
         glUseProgram (pdata ^. cloudShader)
         --        glDepthMask GL_TRUE
         glDrawArrays GL_TRIANGLES 0 (fromIntegral nCloudVs * 6)
-        --glDrawArrays GL_TRIANGLES 0 6
-        ----glDrawElements
-        ----    (pdata ^. cloudShader . shaderPrimitive . unPrimitiveMode)
-        ----    (fromIntegral nCloudIs)
-        ----    GL_UNSIGNED_INT
-        ----    nullPtr
         ---
         --        glEnable GL_CULL_FACE
         --        glEnable GL_DEPTH_CLAMP
@@ -382,7 +365,6 @@ doDrawing' win pdata u = do
     glBindTextureUnit 0 (pdata ^. fboWindow . _2 . _1 . unTO)
     glBindTextureUnit 1 (pdata ^. fboWindow . _2 . _2 . unTO)
     glBindTextureUnit 2 (pdata ^. fboCloud . _2 . _1 . unTO)
-    --glBindTextureUnit 3 (pdata ^. fboCloud . _2 . _2 . unTO)
     glBindTextureUnit 3 (pdata ^. fboPos . _2 . unTO)
     
     --drawShader (_transparencyCompShader pdata) 4