From cda7116930d25086fce5921831864504f1735326 Mon Sep 17 00:00:00 2001 From: justin Date: Fri, 10 Mar 2023 09:45:40 +0000 Subject: [PATCH] Cleanup --- shader/lighting/cap.frag | 6 ------ shader/lighting/lineShadow.frag | 6 ------ src/Data/Preload/Render.hs | 8 ++++++-- src/Preload/Render.hs | 11 ++++++++++- src/Render.hs | 12 ++++++++++++ 5 files changed, 28 insertions(+), 15 deletions(-) delete mode 100644 shader/lighting/cap.frag delete mode 100644 shader/lighting/lineShadow.frag diff --git a/shader/lighting/cap.frag b/shader/lighting/cap.frag deleted file mode 100644 index dce8299ad..000000000 --- a/shader/lighting/cap.frag +++ /dev/null @@ -1,6 +0,0 @@ -#version 450 core -out vec4 fColor; -void main() -{ - fColor = vec4(0,1,0,1); -} diff --git a/shader/lighting/lineShadow.frag b/shader/lighting/lineShadow.frag deleted file mode 100644 index 883591f08..000000000 --- a/shader/lighting/lineShadow.frag +++ /dev/null @@ -1,6 +0,0 @@ -#version 450 core -out vec4 fColor; -void main() -{ -// fColor = vec4 (0,0,0,0); -} diff --git a/src/Data/Preload/Render.hs b/src/Data/Preload/Render.hs index a8904eaad..428e9adfa 100644 --- a/src/Data/Preload/Render.hs +++ b/src/Data/Preload/Render.hs @@ -17,14 +17,18 @@ newtype TO = TO {_unTO :: GLuint} data RenderData = RenderData { _lightingWallShadShader :: FullShader , _lightingLineShadowShader :: FullShader - , _positionalBlankShader :: FullShader , _lightingCapShader :: FullShader + , _lightingTextureShader :: FullShader + , _shadowEdgeShader :: FullShader + , _shadowCapShader :: FullShader + , _shadowWallShader :: FullShader + , _shadowLightShader :: FullShader + , _positionalBlankShader :: FullShader , _wallBlankShader :: FullShader , _windowShader :: FullShader , _wallTextureShader :: FullShader , _textureArrayShader :: FullShader , _fullscreenShader :: FullShader - , _lightingTextureShader :: FullShader , --, _fullscreenAlphaHalveShader :: FullShader _bloomBlurShader :: FullShader , _colorBlurShader :: FullShader diff --git a/src/Preload/Render.hs b/src/Preload/Render.hs index d8551d954..351910d68 100644 --- a/src/Preload/Render.hs +++ b/src/Preload/Render.hs @@ -138,6 +138,11 @@ preloadRender = do lightingLineShadowShad <- makeShaderUsingVAO "lighting/lineShadow" [vert, geom] ELinesAdjacency shEdgeVAO >>= addUniforms ["lightPos", "radiusUniform"] + + shadowedgeshader <- + makeShaderUsingVAO "lighting/lineShadow" [vert, geom] ELinesAdjacency shEdgeVAO + >>= addUniforms ["lightPos", "radiusUniform"] + -- positional shader positionalBlankShad <- makeShader "positional/blank" [vert, frag] [3] ETriangles -- 2D draw shaders @@ -232,8 +237,12 @@ preloadRender = do , _silhouetteEBO = silEBO , _lightingCapShader = lightingCapShad , _lightingLineShadowShader = lightingLineShadowShad - , _positionalBlankShader = positionalBlankShad , _lightingWallShadShader = lightingWallShadShad + , _shadowEdgeShader = shadowedgeshader + , _shadowCapShader = shadowedgeshader + , _shadowWallShader = shadowedgeshader + , _shadowLightShader = shadowedgeshader + , _positionalBlankShader = positionalBlankShad , _wallBlankShader = wallBlankShad , _wallTextureShader = wallTextureShad , _windowShader = wallBlankShad{_shadVAO' = winColVAO} diff --git a/src/Render.hs b/src/Render.hs index 8e466c378..ac67fa14d 100644 --- a/src/Render.hs +++ b/src/Render.hs @@ -137,6 +137,18 @@ createLightMap pdata lightPoints nWalls nSils nCaps shadsdrawtype toPos drawCPUS glDisable GL_CULL_FACE glDisable GL_STENCIL_TEST +instanceLightMap :: + RenderData -> + [(Point3, Float, Point3)] -> -- Lights + -- | number of walls + Int -> + -- | number of silhoutte lines to draw + Int -> + -- | number of "caps" to attempt to draw + Int -> + -- | the texture object giving positions + TO -> + IO () instanceLightMap pdata lightPoints nWalls nSils nCaps toPos = do let llinesShad = _lightingLineShadowShader pdata lcapShad = _lightingCapShader pdata