Work on textures and lighting

2023-03-23 21:17:24 +00:00
parent 1a2fc7c715
commit 1abfaa3cd0
25 changed files with 641 additions and 710 deletions
@@ -2,7 +2,6 @@ module Render (
    createLightMap,
    renderLayer,
    pingPongBetween,
-    bindTO,
    bindFBO,
 ) where

@@ -28,8 +27,7 @@ import Shader.Data
 -}
 createLightMap ::
    Configuration ->
-    RenderData ->
-    [(Point3, Float, Point3)] -> -- Lights
+    ShadowRendering ->

    -- | number of walls
    Int ->
@@ -37,173 +35,188 @@ createLightMap ::
    Int ->
    -- | number of "caps" to attempt to draw
    Int ->
-    -- | whether to draw object shadows or not
-    ObjectShadows ->
    -- | the texture object giving positions
    TO ->
    -- | the texture object giving normals
    TO ->
+    [(Point3, Float, Point3)] -> -- Lights
+    RenderData ->
    IO ()
-createLightMap cfig pdata lightPoints nWalls nSils nCaps shadsdrawtype 
-    positiontexture 
-    normaltexture
-  = case shadsdrawtype of
-    InstancingShads -> instanceLightMap cfig pdata lightPoints nWalls nSils nCaps positiontexture
-    NoShadows -> do
-        glBindFramebuffer GL_FRAMEBUFFER (_unFBO (fst (_fboLighting pdata)))
-        let ltextShad = _lightingTextureShader pdata
-        -- we assume that the renderbuffer's depth has been correctly set elsewhere
-        -- we will not be changing that here
-        glDepthMask GL_FALSE
-        -- clearColor is specified differently in preloadRender
-        -- the colors are inverted
-        withArray [1,1,1,1] $ \ptr -> glClearNamedFramebufferfv
+createLightMap cfig shadrendertype = case shadrendertype of
+        InstancingShads -> instanceLightMap cfig
+        NoShadows -> const . const . const renderLightingNoShadows
+        NoLighting -> const . const . const . const . const . const renderFlatLighting
+        _ -> renderShadows shadrendertype
+
+renderLightingNoShadows ::
+    TO ->
+    TO ->
+    [(V3 GLfloat, GLfloat, V3 GLfloat)] ->
+    RenderData ->
+    IO ()
+renderLightingNoShadows positiontexture normaltexture lightPoints pdata = do
+    glBindFramebuffer GL_FRAMEBUFFER (_unFBO (fst (_fboLighting pdata)))
+    let ltextShad = _lightingTextureShader pdata
+    -- we assume that the renderbuffer's depth has been correctly set elsewhere
+    -- we will not be changing that here
+    glDepthMask GL_FALSE
+    -- clearColor is specified differently in preloadRender
+    -- the colors are inverted
+    withArray [1, 1, 1, 1] $ \ptr ->
+        glClearNamedFramebufferfv
            (pdata ^. fboLighting . _1 . unFBO)
            GL_COLOR
            0
            ptr
-        -- for each of the lights:
-        -- 1. stencil out the shadows from this light's point of view
-        -- 2. calculate lighting based on each fragment's position
-        -- to consider: adding normals/a "material" for each fragment
-        glBlendFunc GL_ZERO GL_ONE_MINUS_SRC_COLOR
-        glEnable GL_STENCIL_TEST
-        glStencilOpSeparate GL_FRONT GL_KEEP GL_KEEP GL_INCR_WRAP
-        glStencilOpSeparate GL_BACK GL_KEEP GL_KEEP GL_DECR_WRAP
-        flip VFSM.mapM_ (VFSM.fromList lightPoints) $ \(V3 x y z, rad, V3 r g b) -> do
-            glDepthFunc GL_LESS
-            -- setup stencil
-            glColorMask GL_FALSE GL_FALSE GL_FALSE GL_FALSE
-            with 0 $ \ptr -> glClearNamedFramebufferiv
+    -- for each of the lights:
+    -- 1. stencil out the shadows from this light's point of view
+    -- 2. calculate lighting based on each fragment's position
+    -- to consider: adding normals/a "material" for each fragment
+    glBlendFunc GL_ZERO GL_ONE_MINUS_SRC_COLOR
+    glEnable GL_STENCIL_TEST
+    glStencilOpSeparate GL_FRONT GL_KEEP GL_KEEP GL_INCR_WRAP
+    glStencilOpSeparate GL_BACK GL_KEEP GL_KEEP GL_DECR_WRAP
+    flip VFSM.mapM_ (VFSM.fromList lightPoints) $ \(V3 x y z, rad, V3 r g b) -> do
+        glDepthFunc GL_LESS
+        -- setup stencil
+        glColorMask GL_FALSE GL_FALSE GL_FALSE GL_FALSE
+        with 0 $ \ptr ->
+            glClearNamedFramebufferiv
                (pdata ^. fboLighting . _1 . unFBO)
                GL_STENCIL
-                0 
-                ptr
-            glDisable GL_CULL_FACE
-            glStencilFunc GL_ALWAYS 0 255
-            --draw lightmap itself
-            glDepthFunc GL_ALWAYS
-            -- bind world position texture
-            glBindTextureUnit 0 (positiontexture ^. unTO)
-            glColorMask GL_TRUE GL_TRUE GL_TRUE GL_TRUE
-            glStencilFunc GL_EQUAL 0 255
-            glUseProgram (ltextShad ^. shaderUINT)
-            glUniform3f 0 x y z
-            glUniform4f 1 r g b rad
-            glBindVertexArray $ ltextShad ^. shaderVAO . vaoName
-            glDrawArrays
-                (_unPrimitiveMode (_shaderPrimitive ltextShad))
                0
-                (fromIntegral (4 :: Int))
-        --cleanup: may not be necessary, depending on what comes after...
+                ptr
        glDisable GL_CULL_FACE
-        glDisable GL_STENCIL_TEST
-    NoLighting -> do
-        glBindFramebuffer GL_FRAMEBUFFER (_unFBO (fst (_fboLighting pdata)))
-        glBlendFunc GL_ZERO GL_ONE_MINUS_SRC_COLOR
-        withArray [0,0,0,1] $ \ptr -> glClearNamedFramebufferfv
+        glStencilFunc GL_ALWAYS 0 255
+        --draw lightmap itself
+        glDepthFunc GL_ALWAYS
+        -- bind world position texture
+        glBindTextureUnit 0 (positiontexture ^. unTO)
+        glBindTextureUnit 1 (normaltexture ^. unTO)
+        glColorMask GL_TRUE GL_TRUE GL_TRUE GL_TRUE
+        glStencilFunc GL_EQUAL 0 255
+        glUseProgram (ltextShad ^. shaderUINT)
+        glUniform3f 0 x y z
+        glUniform4f 1 r g b rad
+        glBindVertexArray $ ltextShad ^. shaderVAO . vaoName
+        glDrawArrays
+            (_unPrimitiveMode (_shaderPrimitive ltextShad))
+            0
+            (fromIntegral (4 :: Int))
+    --cleanup: may not be necessary, depending on what comes after...
+    glDisable GL_CULL_FACE
+    glDisable GL_STENCIL_TEST
+
+renderFlatLighting :: RenderData -> IO ()
+renderFlatLighting pdata = do
+    glBindFramebuffer GL_FRAMEBUFFER (_unFBO (fst (_fboLighting pdata)))
+    withArray [1, 1, 1, 1] $ \ptr ->
+        glClearNamedFramebufferfv
            (pdata ^. fboLighting . _1 . unFBO)
            GL_COLOR
            0
            ptr
-        with 1 $ \ptr -> glClearNamedFramebufferfv
+    with 1 $ \ptr ->
+        glClearNamedFramebufferfv
            (pdata ^. fboLighting . _1 . unFBO)
            GL_DEPTH
            0
            ptr
-        glDisable GL_CULL_FACE
-        glBindTextureUnit 0 (positiontexture ^. unTO)
-        glDepthFunc GL_ALWAYS
-        glDepthMask GL_FALSE
-    _ -> do
-        glBindFramebuffer GL_FRAMEBUFFER (_unFBO (fst (_fboLighting pdata)))
-        let llinesShad = _lightingLineShadowShader pdata
-            lcapShad = _lightingCapShader pdata
-            lwallShad = _lightingWallShadShader pdata
-            ltextShad = _lightingTextureShader pdata
-        -- we assume that the renderbuffer's depth has been correctly set elsewhere
-        -- we will not be changing that here
-        glDepthMask GL_FALSE
-        -- clearColor is specified differently in preloadRender
-        -- the colors are inverted
-        withArray [1,1,1,1] $ \ptr -> glClearNamedFramebufferfv
-            (pdata ^. fboLighting . _1 . unFBO)
-            GL_COLOR
-            0
-            ptr
-        -- for each of the lights:
-        -- 1. stencil out the shadows from this light's point of view
-        -- 2. calculate lighting based on each fragment's position
-        -- to consider: adding normals/a "material" for each fragment
-        glBlendFunc GL_ZERO GL_ONE_MINUS_SRC_COLOR
-        glEnable GL_STENCIL_TEST
-        glStencilOpSeparate GL_FRONT GL_KEEP GL_KEEP GL_INCR_WRAP
-        glStencilOpSeparate GL_BACK GL_KEEP GL_KEEP GL_DECR_WRAP
-        flip VFSM.mapM_ (VFSM.fromList lightPoints) $ \(V3 x y z, rad, V3 r g b) -> do
-            glDepthFunc GL_LESS
-            -- setup stencil
-            glColorMask GL_FALSE GL_FALSE GL_FALSE GL_FALSE
-            with 0 $ \ptr -> glClearNamedFramebufferiv
-                (pdata ^. fboLighting . _1 . unFBO)
-                GL_STENCIL
-                0 
-                ptr
-            glDisable GL_CULL_FACE
-            glStencilFunc GL_ALWAYS 0 255
-            --draw wall shadows
-            glUseProgram (_shaderUINT lwallShad)
-            glUniform3f 0 x y z
-            glUniform1f 1 rad
-            glBindVertexArray $ lwallShad ^. shaderVAO . vaoName -- Just (_vao $ _shadVAO lwallShad)
-            glDrawArrays
-                (_unPrimitiveMode $ _shaderPrimitive lwallShad)
-                0
-                (fromIntegral nWalls)
-            case shadsdrawtype of
-                GeoObjShads -> do
-                    --draw silhouette shadows
-                    glEnable GL_DEPTH_CLAMP
-                    glUseProgram (_shaderUINT llinesShad)
-                    glUniform3f 0 x y z
-                    glUniform1f 1 rad
-                    glBindVertexArray (_vaoName $ _shaderVAO llinesShad)
-                    glDrawElements
-                        (_unPrimitiveMode $ _shaderPrimitive llinesShad)
-                        (fromIntegral nSils)
-                        GL_UNSIGNED_SHORT
-                        nullPtr
-                    --draw caps on the near plane as required
-                    glEnable GL_CULL_FACE
-                    glCullFace GL_BACK
-                    glCullFace GL_FRONT
-                    glUseProgram (_shaderUINT lcapShad)
-                    glUniform3f 0 x y z
-                    glBindVertexArray $ lcapShad ^. shaderVAO . vaoName --Just (_vao $ _shadVAO lcapShad)
-                    glDrawElements
-                        (_unPrimitiveMode $ _shaderPrimitive lcapShad)
-                        (fromIntegral nCaps)
-                        GL_UNSIGNED_SHORT
-                        nullPtr
-                    glDisable GL_DEPTH_CLAMP
-                NoObjShads -> return ()
-            --draw lightmap itself
-            glDepthFunc GL_ALWAYS
-            -- bind world position texture
-            glDisable GL_CULL_FACE
-            glBindTextureUnit 0 (positiontexture ^. unTO)
-            glBindTextureUnit 1 (normaltexture ^. unTO)
-            glColorMask GL_TRUE GL_TRUE GL_TRUE GL_TRUE
-            glStencilFunc GL_EQUAL 0 255
-            glUseProgram (ltextShad ^. shaderUINT) --Just (_shadProg ltextShad)
-            glUniform3f 0 x y z
-            glUniform4f 1 r g b rad
-            glBindVertexArray $ ltextShad ^. shaderVAO . vaoName -- Just (_vao $ _shadVAO ltextShad)
-            glDrawArrays
-                (_unPrimitiveMode (_shaderPrimitive ltextShad))
-                0
-                (fromIntegral (4 :: Int))
-        --cleanup: may not be necessary, depending on what comes after...
-        glDisable GL_STENCIL_TEST
+    glDisable GL_CULL_FACE
+    glDepthFunc GL_ALWAYS
+    glDepthMask GL_FALSE
+
+renderShadows shadrendertype nWalls nSils nCaps positiontexture normaltexture lightPoints pdata = do
+            glBindFramebuffer GL_FRAMEBUFFER (_unFBO (fst (_fboLighting pdata)))
+            let llinesShad = _lightingLineShadowShader pdata
+                lcapShad = _lightingCapShader pdata
+                lwallShad = _lightingWallShadShader pdata
+                ltextShad = _lightingTextureShader pdata
+            -- we assume that the renderbuffer's depth has been correctly set elsewhere
+            -- we will not be changing that here
+            glDepthMask GL_FALSE
+            -- clearColor is specified differently in preloadRender
+            -- the colors are inverted
+            withArray [1, 1, 1, 1] $ \ptr ->
+                glClearNamedFramebufferfv
+                    (pdata ^. fboLighting . _1 . unFBO)
+                    GL_COLOR
+                    0
+                    ptr
+            -- for each of the lights:
+            -- 1. stencil out the shadows from this light's point of view
+            -- 2. calculate lighting based on each fragment's position
+            -- to consider: adding normals/a "material" for each fragment
+            glBlendFunc GL_ZERO GL_ONE_MINUS_SRC_COLOR
+            glEnable GL_STENCIL_TEST
+            glStencilOpSeparate GL_FRONT GL_KEEP GL_KEEP GL_INCR_WRAP
+            glStencilOpSeparate GL_BACK GL_KEEP GL_KEEP GL_DECR_WRAP
+            flip VFSM.mapM_ (VFSM.fromList lightPoints) $ \(V3 x y z, rad, V3 r g b) -> do
+                glDepthFunc GL_LESS
+                -- setup stencil
+                glColorMask GL_FALSE GL_FALSE GL_FALSE GL_FALSE
+                with 0 $ \ptr ->
+                    glClearNamedFramebufferiv
+                        (pdata ^. fboLighting . _1 . unFBO)
+                        GL_STENCIL
+                        0
+                        ptr
+                glDisable GL_CULL_FACE
+                glStencilFunc GL_ALWAYS 0 255
+                --draw wall shadows
+                glUseProgram (_shaderUINT lwallShad)
+                glUniform3f 0 x y z
+                glUniform1f 1 rad
+                glBindVertexArray $ lwallShad ^. shaderVAO . vaoName -- Just (_vao $ _shadVAO lwallShad)
+                glDrawArrays
+                    (_unPrimitiveMode $ _shaderPrimitive lwallShad)
+                    0
+                    (fromIntegral nWalls)
+                case shadrendertype of
+                    GeoObjShads -> do
+                        --draw silhouette shadows
+                        glEnable GL_DEPTH_CLAMP
+                        glUseProgram (_shaderUINT llinesShad)
+                        glUniform3f 0 x y z
+                        glUniform1f 1 rad
+                        glBindVertexArray (_vaoName $ _shaderVAO llinesShad)
+                        glDrawElements
+                            (_unPrimitiveMode $ _shaderPrimitive llinesShad)
+                            (fromIntegral nSils)
+                            GL_UNSIGNED_SHORT
+                            nullPtr
+                        --draw caps on the near plane as required
+                        glEnable GL_CULL_FACE
+                        glCullFace GL_BACK
+                        glCullFace GL_FRONT
+                        glUseProgram (_shaderUINT lcapShad)
+                        glUniform3f 0 x y z
+                        glBindVertexArray $ lcapShad ^. shaderVAO . vaoName --Just (_vao $ _shadVAO lcapShad)
+                        glDrawElements
+                            (_unPrimitiveMode $ _shaderPrimitive lcapShad)
+                            (fromIntegral nCaps)
+                            GL_UNSIGNED_SHORT
+                            nullPtr
+                        glDisable GL_DEPTH_CLAMP
+                    NoObjShads -> return ()
+                --draw lightmap itself
+                glDepthFunc GL_ALWAYS
+                -- bind world position texture
+                glDisable GL_CULL_FACE
+                glBindTextureUnit 0 (positiontexture ^. unTO)
+                glBindTextureUnit 1 (normaltexture ^. unTO)
+                glColorMask GL_TRUE GL_TRUE GL_TRUE GL_TRUE
+                glStencilFunc GL_EQUAL 0 255
+                glUseProgram (ltextShad ^. shaderUINT) --Just (_shadProg ltextShad)
+                glUniform3f 0 x y z
+                glUniform4f 1 r g b rad
+                glBindVertexArray $ ltextShad ^. shaderVAO . vaoName -- Just (_vao $ _shadVAO ltextShad)
+                glDrawArrays
+                    (_unPrimitiveMode (_shaderPrimitive ltextShad))
+                    0
+                    (fromIntegral (4 :: Int))
+            --cleanup: may not be necessary, depending on what comes after...
+            glDisable GL_STENCIL_TEST

 lightsToArray :: [(Point3, Float, Point3)] -> [Float]
 lightsToArray xs =
@@ -213,11 +226,9 @@ lightsToArray xs =
    t (V3 a b c, _, _) = [a, b, c, 1]
    s (_, d, V3 e f g) = [e, f, g, d]

-
 instanceLightMap ::
    Configuration ->
-    RenderData ->
-    [(Point3, Float, Point3)] -> -- Lights
+
    -- | number of walls
    Int ->
    -- | number of silhoutte lines to draw
@@ -226,8 +237,11 @@ instanceLightMap ::
    Int ->
    -- | the texture object giving positions
    TO ->
+    TO ->
+    [(Point3, Float, Point3)] -> -- Lights
+    RenderData ->
    IO ()
-instanceLightMap cfig pdata lightPoints nWalls nSils nCaps toPos = do
+instanceLightMap cfig nWalls nSils nCaps toPos tanormals lightPoints pdata = do
    let lcapShad = _shadowCapShader pdata
        (xsize, ysize) = getWindowSize cfig
    withArray (lightsToArray lightPoints) $ \ptr ->
@@ -251,16 +265,18 @@ instanceLightMap cfig pdata lightPoints nWalls nSils nCaps toPos = do
            1
    glBindFramebuffer GL_FRAMEBUFFER $ pdata ^. fboShadow . _1 . unFBO
    glDepthMask GL_FALSE
-    withArray [0,0,0,0] $ \ptr -> glClearNamedFramebufferfv
-        (pdata ^. fboShadow . _1 . unFBO)
-        GL_COLOR
-        0
-        ptr
-    with 0 $ \ptr -> glClearNamedFramebufferiv
-        (pdata ^. fboShadow . _1 . unFBO)
-        GL_STENCIL
-        0 
-        ptr
+    withArray [0, 0, 0, 0] $ \ptr ->
+        glClearNamedFramebufferfv
+            (pdata ^. fboShadow . _1 . unFBO)
+            GL_COLOR
+            0
+            ptr
+    with 0 $ \ptr ->
+        glClearNamedFramebufferiv
+            (pdata ^. fboShadow . _1 . unFBO)
+            GL_STENCIL
+            0
+            ptr
    -- stencil out the shadows from each light's point of view
    -- setup stencil
    glEnable GL_STENCIL_TEST
@@ -303,8 +319,7 @@ instanceLightMap cfig pdata lightPoints nWalls nSils nCaps toPos = do
    glStencilFunc GL_EQUAL 0 255
    glUseProgram (pdata ^. shadowLightShader . _1 . shaderUINT)
    -- bind world position texture
-    bindTO toPos
--    glBindVertexArray $ pdata ^. shadowLightShader . shaderVAO' . vaoName
+    glBindTextureUnit 0 (toPos ^. unTO)
    glDrawArrays
        (_unPrimitiveMode $ pdata ^. shadowLightShader . _1 . shaderPrimitive)
        0
@@ -313,12 +328,13 @@ instanceLightMap cfig pdata lightPoints nWalls nSils nCaps toPos = do
    glDisable GL_STENCIL_TEST
    --draw to the lighting framebuffer here
    glBindFramebuffer GL_FRAMEBUFFER (_unFBO (fst (_fboLighting pdata)))
-    withArray [1,1,1,1] $ \ptr -> glClearNamedFramebufferfv
-        (pdata ^. fboLighting . _1 . unFBO)
-        GL_COLOR
-        0
-        ptr
-    glBindTexture GL_TEXTURE_2D_ARRAY (pdata ^. fboShadow . _2 . _1 . unTO)
+    withArray [1, 1, 1, 1] $ \ptr ->
+        glClearNamedFramebufferfv
+            (pdata ^. fboLighting . _1 . unFBO)
+            GL_COLOR
+            0
+            ptr
+    glBindTextureUnit 0 (pdata ^. fboShadow . _2 . _1 . unTO)
    glEnable GL_BLEND
    glBlendFunc GL_ZERO GL_ONE_MINUS_SRC_COLOR
    glUseProgram (pdata ^. shadowCombineShader . _1 . shaderUINT)
@@ -339,20 +355,16 @@ pingPongBetween ::
    Shader ->
    IO ()
 pingPongBetween (fb1, to1) (fb2, to2) fs = do
-    --bindFramebuffer Framebuffer $= fb2
    glBindFramebuffer GL_FRAMEBUFFER (_unFBO fb2)
-    --textureBinding Texture2D $= Just to1
-    glBindTexture GL_TEXTURE_2D (_unTO to1)
+    glBindTextureUnit 0 (_unTO to1)
    drawShader fs 4
-    --bindFramebuffer Framebuffer $= fb1
    glBindFramebuffer GL_FRAMEBUFFER (_unFBO fb1)
-    --textureBinding Texture2D $= Just to2
-    glBindTexture GL_TEXTURE_2D (_unTO to2)
+    glBindTextureUnit 0 (_unTO to2)
    drawShader fs 4

 renderLayer ::
    Layer ->
-    MV.MVector (PrimState IO) (Shader,VBO) ->
+    MV.MVector (PrimState IO) (Shader, VBO) ->
    UMV.MVector (PrimState IO) Int ->
    IO ()
 renderLayer layer shads counts = do
@@ -361,11 +373,6 @@ renderLayer layer shads counts = do
  where
    ln = layerNum layer

-bindTO :: TO -> IO ()
-bindTO t = glBindTexture GL_TEXTURE_2D (_unTO t)
-
--textureBinding Texture2D $= Just t
-
 bindFBO :: FBO -> IO ()
 bindFBO fb =
    --bindFramebuffer Framebuffer $= fb