justin/loop
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.xkjq.uk:30001/justin/dodge

Browse Source
This commit is contained in:
Ross
2021-03-21 17:57:20 +00:00
parent b91f056d63 a7591bb1d7
commit d76fd5263c
5 changed files with 102 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Picture/Render.hs
+32 -13
View File
@@ -31,19 +31,8 @@ import qualified Data.IntMap.Strict as IM
import qualified SDL as SDL
renderPicture' :: RenderData -> Float -> Float -> (Float,Float) -> (Float,Float) ->
[(Point2,Point2)] -> [Point4] ->
(Float,Float) -> Picture -> IO (Word32,Word32)
renderPicture' pdata rot zoom (tranx,trany) (winx,winy) wallPoints lightPoints
(viewFromx,viewFromy) pic = do
wallPokeStart <- SDL.ticks
-- setting the depth function to less, instead of lequal,
-- seems to stop a lot of unecessary drawing
-- of wall shadows when creating the light map
depthFunc $= Just Less
-- set common uniforms
setCommonUniforms :: RenderData -> Float -> Float -> (Float,Float) -> (Float,Float) -> IO ()
setCommonUniforms pdata rot zoom (tranx,trany) (winx,winy) = do
setShaderUniforms rot zoom (tranx,trany) (winx,winy)
( (extractProgAndUnis $ _lightSourceShader pdata)
: (extractProgAndUnis $ _wallShadowShader pdata)
@@ -52,6 +41,36 @@ renderPicture' pdata rot zoom (tranx,trany) (winx,winy) wallPoints lightPoints
: (map extractProgAndUnis $ _listShaders pdata)
)
createLightMap :: RenderData -> Float -> Float -> (Float,Float) -> (Float,Float) ->
[(Point2,Point2)] -> [Point4] ->
(Float,Float) -> Picture -> IO ()
createLightMap pdata rot zoom (tranx,trany) (winx,winy) wallPoints lightPoints
(viewFromx,viewFromy) pic = do
return ()
renderPicture' :: RenderData -> Float -> Float -> (Float,Float) -> (Float,Float) ->
[(Point2,Point2)] -> [Point4] ->
(Float,Float) -> Picture -> IO (Word32,Word32)
renderPicture' pdata rot zoom trans wins wallPoints lightPoints
viewFroms pic = do
startTicks <- SDL.ticks
setCommonUniforms pdata rot zoom trans wins
renderPicture pdata rot zoom trans wins wallPoints lightPoints viewFroms pic
endTicks <- SDL.ticks
return (startTicks, endTicks - startTicks)
renderPicture :: RenderData -> Float -> Float -> (Float,Float) -> (Float,Float) ->
[(Point2,Point2)] -> [Point4] ->
(Float,Float) -> Picture -> IO (Word32,Word32)
renderPicture pdata rot zoom (tranx,trany) (winx,winy) wallPoints lightPoints
(viewFromx,viewFromy) pic = do
wallPokeStart <- SDL.ticks
-- setting the depth function to less, instead of lequal,
-- seems to stop a lot of unecessary drawing
-- of wall shadows when creating the light map
depthFunc $= Just Less
-- draw lightmap
bindFramebuffer Framebuffer $= (_spareFBO pdata)