Commit before connecting each vao to unique vbos

This commit is contained in:
jgk
2021-03-02 00:54:00 +01:00
parent 1e198b551e
commit 18492f00d2
8 changed files with 34 additions and 62 deletions
+5 -5
View File
@@ -166,9 +166,9 @@ collectDrawings w = pictures $ (map screenShift $
ppPicts = map ppDraw (IM.elems (_pressPlates w))
crPicts = map crDraw $ IM.elems $ _creatures w
clPicts = map clDraw $ IM.elems $ _clouds w
wallShadows = map (drawWallShadow w) $ wallShadowsToDraw w
wallShadows = map (setLayer 0 . drawWallShadow w) $ wallShadowsToDraw w
smokeShadows = map (drawSmokeShadow w) $ _smoke w
wlPicts = map drawWall (wallsToDraw w)
wlPicts = map (setLayer 0 . drawWall) (wallsToDraw w)
itFloorPicts = map (drawItem) (IM.elems (_floorItems w))
yourPos = _crPos $ you w
yourRot = _crDir $ you w
@@ -202,7 +202,7 @@ collectDrawings w = pictures $ (map screenShift $
where tst x y sc t = translate x y $ scale sc sc $ color white $ text t
hudDrawings :: World -> Picture
hudDrawings w = (onLayer InvLayer)
hudDrawings w = setLayer 1 $ (onLayer InvLayer)
$ pictures
[ displayInv 0 w
, dShadCol white $ displayHP 0 w
@@ -225,10 +225,10 @@ clDraw :: Cloud -> Drawing
clDraw c = uncurry translate (_clPos c) $ (_clPict c c)
drawCursor :: World -> Picture
drawCursor w = translate (105-halfWidth w)
drawCursor w = setLayer 1
$ translate (105-halfWidth w)
(halfHeight w - (25* (fromIntegral iPos)) - 20
)
$ setLayer 1
$ line [(200,12.5),(-100,12.5),(-100,-12.5),(200,-12.5)]
where iPos = _crInvSel $ _creatures w IM.! _yourID w