From bd9f32875e98e295f4d16676acd34ef9a11092eb Mon Sep 17 00:00:00 2001 From: justin Date: Fri, 24 Mar 2023 12:06:54 +0000 Subject: [PATCH] Cleanup --- data/texture/charMapVertBig.png | Bin 12021 -> 12096 bytes src/Data/Preload.hs | 17 ++++++++--------- src/Dodge/Config/Update.hs | 2 +- src/Dodge/Render.hs | 6 +----- src/Dodge/WindowSize.hs | 8 +++----- src/Preload/Update.hs | 18 +++++------------- src/Render.hs | 6 +++--- 7 files changed, 21 insertions(+), 36 deletions(-) diff --git a/data/texture/charMapVertBig.png b/data/texture/charMapVertBig.png index 4fb820394abd551f153391e4012fcfba534ed35a..948001ed1520d96dc8563c26626fdeab9eb7c7f1 100644 GIT binary patch delta 10578 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 delta 10483 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 Int -> IO () setViewportSize x y = glViewport 0 0 (fromIntegral x) (fromIntegral y) -getWindowSize :: Integral a => (Configuration -> ResFactor) -> Configuration -> (a,a) -getWindowSize f cfig = (g _windowX,g _windowY) - where - g h = fromIntegral $ round (h cfig) `div` resFactorNum (f cfig) - setViewportType :: (Configuration -> ResFactor) -> Configuration -> IO () setViewportType f = uncurry (glViewport 0 0) . getWindowSize f diff --git a/src/Dodge/WindowSize.hs b/src/Dodge/WindowSize.hs index b0584a7a9..643a4b6fa 100644 --- a/src/Dodge/WindowSize.hs +++ b/src/Dodge/WindowSize.hs @@ -2,9 +2,7 @@ module Dodge.WindowSize where import Dodge.Data.Config -getWindowSize :: Configuration -> (Int, Int) -getWindowSize cfig = (x `div` divRes,y `div` divRes) +getWindowSize :: Integral a => (Configuration -> ResFactor) -> Configuration -> (a,a) +getWindowSize f cfig = (g _windowX,g _windowY) where - x = round $ _windowX cfig - y = round $ _windowY cfig - divRes = resFactorNum $ _graphics_world_resolution cfig + g h = fromIntegral $ round (h cfig) `div` resFactorNum (f cfig) diff --git a/src/Preload/Update.hs b/src/Preload/Update.hs index b253e0f1a..3c43709f1 100644 --- a/src/Preload/Update.hs +++ b/src/Preload/Update.hs @@ -2,9 +2,10 @@ module Preload.Update ( updatePreload, - pdataResizeUpdate, + renderDataResizeUpdate, ) where +import Dodge.WindowSize import Dodge.Data.Universe import Control.Lens import qualified Data.ByteString as BS @@ -14,16 +15,13 @@ import Framebuffer.Update import Shader.Compile import Shader.Data +-- i don't like this being here pulling in the dodge universe dependency, but +-- splitting it out would be overkill updatePreload :: Universe -> IO Universe updatePreload u = do - pdata <- pdataResizeUpdate (u ^. uvConfig) (u ^?! preloadData . renderData) + pdata <- renderDataResizeUpdate (u ^. uvConfig) (u ^. preloadData . renderData) return $ u & preloadData . renderData .~ pdata -pdataResizeUpdate :: Configuration -> RenderData -> IO RenderData -pdataResizeUpdate cfig pdata = do - rd <- renderDataResizeUpdate cfig pdata - return rd - renderDataResizeUpdate :: Configuration -> RenderData -> @@ -36,7 +34,6 @@ renderDataResizeUpdate cfig rdata = do (bh, bmid) = BS.breakSubstring "(" bbFrag (_, btt) = BS.breakSubstring ")" bmid bbFrag' = BS.append bh $ BS.append (BSC.pack $ '(' : show xsize ++ "," ++ show ysize) btt - --BSC.putStrLn bbFrag' bbShad <- makeByteStringShaderUsingVAO "bloomBlur" @@ -44,8 +41,3 @@ renderDataResizeUpdate cfig rdata = do pmTriangleStrip (rdata ^. screenTextureVAO) return (rdata'{_bloomBlurShader = bbShad}) - -getWindowSize :: Integral a => (Configuration -> ResFactor) -> Configuration -> (a,a) -getWindowSize f cfig = (g _windowX,g _windowY) - where - g h = fromIntegral $ round (h cfig) `div` resFactorNum (f cfig) diff --git a/src/Render.hs b/src/Render.hs index 9779054c2..e4d6bbda6 100644 --- a/src/Render.hs +++ b/src/Render.hs @@ -240,7 +240,7 @@ instanceLightMap :: IO () instanceLightMap cfig nWalls nSils nCaps toPos tanormals lightPoints pdata = do let lcapShad = _shadowCapShader pdata - (xsize, ysize) = getWindowSize cfig + (xsize, ysize) = getWindowSize _graphics_world_resolution cfig withArray (lightsToArray lightPoints) $ \ptr -> glNamedBufferSubData (pdata ^. lightsUBO) 0 620 ptr forM_ [0 .. 19] $ \i -> @@ -257,8 +257,8 @@ instanceLightMap cfig nWalls nSils nCaps toPos tanormals lightPoints pdata = do 0 0 i - (fromIntegral xsize) - (fromIntegral ysize) + xsize + ysize 1 glBindFramebuffer GL_FRAMEBUFFER $ pdata ^. fboShadow . _1 . unFBO glDepthMask GL_FALSE