Cleanup

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)