Remove afterParticles
This commit is contained in:
@@ -54,7 +54,6 @@ data World = World
|
||||
, _cloudsZone :: IM.IntMap (IM.IntMap (IM.IntMap Cloud))
|
||||
, _particles :: IM.IntMap Particle
|
||||
, _particles' :: ![Particle']
|
||||
, _afterParticles' :: ![Particle']
|
||||
, _smoke :: [Smoke]
|
||||
, _walls :: !(IM.IntMap Wall)
|
||||
, _wallsZone :: (IM.IntMap (IM.IntMap (IM.IntMap Wall)))
|
||||
|
||||
@@ -192,7 +192,6 @@ basicWorld = World
|
||||
, _itemPositions = IM.empty
|
||||
, _particles = IM.empty
|
||||
, _particles' = []
|
||||
, _afterParticles' = []
|
||||
, _walls = IM.empty
|
||||
, _wallsZone = IM.empty
|
||||
, _forceFields = IM.empty
|
||||
|
||||
@@ -43,7 +43,6 @@ worldPictures w
|
||||
, map clDraw . IM.elems $ _clouds w
|
||||
, map btDraw (IM.elems (_buttons w))
|
||||
, map _ptPict' $ _particles' w
|
||||
, map _ptPict' $ _afterParticles' w
|
||||
, map drawWallFloor (wallFloorsToDraw w)
|
||||
-- , map (drawWallFace w) (wallShadowsToDraw w)
|
||||
, map (drawSmokeShadow w) $ _smoke w
|
||||
|
||||
@@ -43,7 +43,6 @@ update w
|
||||
$ set worldEvents id $ _worldEvents w1
|
||||
w1
|
||||
w3 = updateCamera
|
||||
$ updateAfterParticles'
|
||||
$ colCrsWalls
|
||||
w2
|
||||
in checkEndGame $ ppEvents w3
|
||||
@@ -79,10 +78,6 @@ updateParticles' :: World -> World
|
||||
updateParticles' w = set particles' (catMaybes ps) w'
|
||||
where (w',ps) = mapAccumR (\a b -> _ptUpdate' b a b) w $ _particles' w
|
||||
|
||||
updateAfterParticles' :: World -> World
|
||||
updateAfterParticles' w = set afterParticles' (catMaybes ps) w'
|
||||
where (w',ps) = mapAccumR (\a b -> _ptUpdate' b a b) w $ _afterParticles' w
|
||||
|
||||
updateCreatures :: World -> World
|
||||
updateCreatures w = f $ set randGen newG $ set creatures (IM.mapMaybe id crs) w
|
||||
where ((f,newG),crs) = IM.mapAccum (\g' cr -> _crUpdate cr w g' cr) (id,_randGen w) $ _creatures w
|
||||
|
||||
@@ -117,7 +117,7 @@ lowLightWidthHit len wdth col alphay a b w
|
||||
((p, E3x2 wall):_)
|
||||
-> over particles' ((:) (wallGlareWidth len wdth col alphay p wall)) w
|
||||
((p, E3x1 cr):_)
|
||||
-> over afterParticles' ((:) (crGlareWidth wdth col alphay p cr)) w
|
||||
-> over particles' ((:) (crGlareWidth wdth col alphay p cr)) w
|
||||
_ -> w
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user