Revert to foldMap-ing worldSPic

This commit is contained in:
2022-07-10 09:59:19 +01:00
parent a5730014c8
commit 2a70dcc9a6
3 changed files with 36 additions and 19 deletions
+19 -6
View File
@@ -49,9 +49,15 @@ doDrawing pdata u = do
-- count mutable vectors setup
layerCounts <- UMV.replicate (numLayers*6) 0
-- attempt to poke in parallel
-- let (ws,wp) = wallSPics <> worldSPic cfig w
let (ws,wp) = wallSPics <> worldSPic cfig w
--( (nWalls, nWins , nFls),(nShapeVs, nIndices, nSilIndices) )
( (nWalls, nWins , nFls),(nShapeVs, nIndices, nSilIndices) )
<- MP.bindM2 (curry return)
<- MP.bindM3 (\_ a b -> return (a,b))
( pokeLayVerxs
shadV
layerCounts
wp
)
( pokeWallsWindowsFloor
(shadVBOptr $ _wallTextureShader pdata)
(shadVBOptr $ _windowShader pdata)
@@ -60,14 +66,21 @@ doDrawing pdata u = do
windowPoints
(_floorTiles w)
)
( pokeSPics
shadV
layerCounts
( pokeShape'
(_vboPtr $ _vaoVBO $ _shadVAO $ _shapeShader pdata)
(_eboPtr $ _shapeEBO pdata)
(_eboPtr $ _silhouetteEBO pdata)
(S.cons wallSPics $ worldSPic cfig w)
(0,0,0)
ws
)
-- ( pokeSPics
-- shadV
-- layerCounts
-- (_vboPtr $ _vaoVBO $ _shadVAO $ _shapeShader pdata)
-- (_eboPtr $ _shapeEBO pdata)
-- (_eboPtr $ _silhouetteEBO pdata)
-- (S.cons wallSPics $ worldSPic cfig w)
-- )
-- <- MP.bindM3 (\ _ wlwifl counts -> return (wlwifl,counts))
-- ( pokeBindFoldableLayer shadV layerCounts wp)
-- ( pokeWallsWindowsFloor