Add in "linear" lWorld to separate time reversable worlds

This commit is contained in:
2022-10-28 12:24:51 +01:00
parent 5f6bd43599
commit 7e790b7153
130 changed files with 827 additions and 980 deletions
+6 -6
View File
@@ -32,14 +32,14 @@ doDrawing pdata u = do
sTicks <- SDL.ticks
let w = _uvWorld u
cfig = _uvConfig u
rot = w ^. cWorld . cwCam . cwcRot
camzoom = w ^. cWorld . cwCam . cwcZoom
trans = w ^. cWorld . cwCam . cwcCenter
rot = w ^. cWorld . lWorld . cwCam . cwcRot
camzoom = w ^. cWorld . lWorld . cwCam . cwcZoom
trans = w ^. cWorld . lWorld . cwCam . cwcCenter
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) = w ^. cWorld . cwCam . cwcViewFrom
viewFroms@(V2 vfx vfy) = w ^. cWorld . lWorld . cwCam . cwcViewFrom
viewFrom3d = Vector3 vfx vfy 20
shadV = _pictureShaders pdata
lwShad = _lightingWallShadShader pdata
@@ -63,7 +63,7 @@ doDrawing pdata u = do
(shadVBOptr $ _textureArrayShader pdata)
wallPointsCol
windowPoints
(_floorTiles (_cWorld w))
(w ^. cWorld . lWorld . floorTiles)
)
( pokeShape
(_vboPtr $ _vaoVBO $ _shadVAO $ _shapeShader pdata)
@@ -254,7 +254,7 @@ doDrawing pdata u = do
depthFunc $= Just Always
blendFunc $= (One, Zero)
-- perform any radial distortion
case _distortions (_cWorld w) of
case w ^. cWorld . lWorld . distortions of
[] -> do
bindTO $ fst $ snd $ _fboBase pdata
bindFramebuffer Framebuffer $= defaultFramebufferObject