Refactor text rendering

2021-06-23 01:35:38 +02:00
parent 39218ed3b5
commit 899c1c5f6e
13 changed files with 48 additions and 56 deletions
@@ -206,37 +206,20 @@ renderBackground pdata rot camZoom (tranx,trany) (winx,winy) = do
    textureBinding Texture2D $= _textureObject <$> _shaderTexture (_backgroundShader pdata)
    drawArrays Points 0 1

-setCommonUniforms
+setPerpMatrixUniforms
    :: RenderData
    -> Float            -- ^ Rotation
    -> Float            -- ^ Zoom
    -> (Float,Float)    -- ^ Translation
    -> (Float,Float)    -- ^ Window size
+    -> (Float,Float)    -- ^ ViewFrom
    -> IO ()
-setCommonUniforms pdata rot camZoom (tranx,trany) (winx,winy) = do
-    setShaderUniforms rot camZoom (tranx,trany) (winx,winy) 
-        ( extractProgAndUnis (_lightingFloorShader pdata) 
-        : extractProgAndUnis (_lightingOccludeShader pdata) 
-        : extractProgAndUnis (_lightingWallShader pdata) 
-        : extractProgAndUnis (_backgroundShader pdata) 
-        : extractProgAndUnis (_textureShader pdata) 
-        : map extractProgAndUnis (_pictureShaders pdata)
-        )
-
-setIsoMatrixUniforms 
-    :: RenderData
-    -> Float            -- ^ Rotation
-    -> Float            -- ^ Zoom
-    -> (Float,Float)    -- ^ Translation
-    -> (Float,Float)    -- ^ Window size
-    -> IO ()
-setIsoMatrixUniforms pdata rot camZoom (tranx,trany) (winx,winy) = do
-    setShaderUniforms rot camZoom (tranx,trany) (winx,winy) 
-        ( extractProgAndUnis (_lightingFloorShader pdata) 
-        : extractProgAndUnis (_backgroundShader pdata) 
-        : extractProgAndUnis (_textureShader pdata)
-        : extractProgAndUnis (_textureArrayShader pdata)
-        : map extractProgAndUnis (_pictureShaders pdata)
+setPerpMatrixUniforms pdata rot czoom trans wins vfs = mapM_ (setPerpMatUniform rot czoom trans wins vfs)
+    $ ( (_lightingFloorShader pdata) 
+        : (_backgroundShader pdata) 
+        : (_textureShader pdata)
+        : (_textureArrayShader pdata)
+        : (_pictureShaders pdata)
        )

 renderShader
@@ -252,12 +235,6 @@ renderShader shad dat = do
    eticks <- SDL.ticks
    return $ eticks - sticks

--renderPictureLayer
--    :: PictureShaderData
--    -> Picture
--    -> IO Word32
--renderPictureLayer 
-
 renderFoldable
    :: Foldable f
    => RenderData