Separate out concrete part of world

This commit is contained in:
2022-07-25 12:10:50 +01:00
parent 3354d108be
commit b2efbd2b3e
134 changed files with 933 additions and 930 deletions
+6 -6
View File
@@ -34,14 +34,14 @@ doDrawing pdata u = do
sTicks <- SDL.ticks
let w = _uvWorld u
cfig = _uvConfig u
rot = _cameraRot w
camzoom = _cameraZoom w
trans = _cameraCenter w
rot = _cameraRot (_cWorld w)
camzoom = _cameraZoom (_cWorld w)
trans = _cameraCenter (_cWorld w)
wins@(V2 winx winy) = V2 (_windowX cfig) (_windowY cfig)
resFact = resFactorNum $ cfig ^. graphics_resolution_factor
(wallPointsCol,windowPoints,wallSPics) = wallsToDraw w
lightPoints = lightsToRender cfig w
viewFroms@(V2 vfx vfy) = _cameraViewFrom w
viewFroms@(V2 vfx vfy) = _cameraViewFrom (_cWorld w)
viewFrom3d = Vector3 vfx vfy 20
shadV = _pictureShaders pdata
lwShad = _lightingWallShadShader pdata
@@ -64,7 +64,7 @@ doDrawing pdata u = do
(shadVBOptr $ _textureArrayShader pdata)
wallPointsCol
windowPoints
(_floorTiles w)
(_floorTiles (_cWorld w))
)
( pokeShape'
(_vboPtr $ _vaoVBO $ _shadVAO $ _shapeShader pdata)
@@ -248,7 +248,7 @@ doDrawing pdata u = do
depthFunc $= Just Always
blendFunc $= (One,Zero)
-- perform any radial distortion
case _distortions w of
case _distortions (_cWorld w) of
[] -> do
bindTO $ fst $ snd $ _fboBase pdata
bindFramebuffer Framebuffer $= defaultFramebufferObject