justin/loop
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Remove afterParticles

Browse Source
This commit is contained in:
justin
2021-03-22 13:30:46 +01:00
parent 46ee0a6d59
commit 506b0c4b8d
5 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Dodge/Data.hs
-1
View File
@@ -54,7 +54,6 @@ data World = World
, _cloudsZone :: IM.IntMap (IM.IntMap (IM.IntMap Cloud)) , _cloudsZone :: IM.IntMap (IM.IntMap (IM.IntMap Cloud))
, _particles :: IM.IntMap Particle , _particles :: IM.IntMap Particle
, _particles' :: ![Particle'] , _particles' :: ![Particle']
, _afterParticles' :: ![Particle']
, _smoke :: [Smoke] , _smoke :: [Smoke]
, _walls :: !(IM.IntMap Wall) , _walls :: !(IM.IntMap Wall)
, _wallsZone :: (IM.IntMap (IM.IntMap (IM.IntMap Wall))) , _wallsZone :: (IM.IntMap (IM.IntMap (IM.IntMap Wall)))
src/Dodge/Prototypes.hs
-1
View File
@@ -192,7 +192,6 @@ basicWorld = World
, _itemPositions = IM.empty , _itemPositions = IM.empty
, _particles = IM.empty , _particles = IM.empty
, _particles' = [] , _particles' = []
, _afterParticles' = []
, _walls = IM.empty , _walls = IM.empty
, _wallsZone = IM.empty , _wallsZone = IM.empty
, _forceFields = IM.empty , _forceFields = IM.empty
src/Dodge/Rendering.hs
-1
View File
@@ -43,7 +43,6 @@ worldPictures w
, map clDraw . IM.elems $ _clouds w , map clDraw . IM.elems $ _clouds w
, map btDraw (IM.elems (_buttons w)) , map btDraw (IM.elems (_buttons w))
, map _ptPict' $ _particles' w , map _ptPict' $ _particles' w
, map _ptPict' $ _afterParticles' w
, map drawWallFloor (wallFloorsToDraw w) , map drawWallFloor (wallFloorsToDraw w)
-- , map (drawWallFace w) (wallShadowsToDraw w) -- , map (drawWallFace w) (wallShadowsToDraw w)
, map (drawSmokeShadow w) $ _smoke w , map (drawSmokeShadow w) $ _smoke w
src/Dodge/Update.hs
-5
View File
@@ -43,7 +43,6 @@ update w
$ set worldEvents id $ _worldEvents w1 $ set worldEvents id $ _worldEvents w1
w1 w1
w3 = updateCamera w3 = updateCamera
$ updateAfterParticles'
$ colCrsWalls $ colCrsWalls
w2 w2
in checkEndGame $ ppEvents w3 in checkEndGame $ ppEvents w3
@@ -79,10 +78,6 @@ updateParticles' :: World -> World
updateParticles' w = set particles' (catMaybes ps) w' updateParticles' w = set particles' (catMaybes ps) w'
where (w',ps) = mapAccumR (\a b -> _ptUpdate' b a b) w $ _particles' 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 :: World -> World
updateCreatures w = f $ set randGen newG $ set creatures (IM.mapMaybe id crs) w 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 where ((f,newG),crs) = IM.mapAccum (\g' cr -> _crUpdate cr w g' cr) (id,_randGen w) $ _creatures w
src/Dodge/WorldActions/Flash.hs
+1 -1
View File
@@ -117,7 +117,7 @@ lowLightWidthHit len wdth col alphay a b w
((p, E3x2 wall):_) ((p, E3x2 wall):_)
-> over particles' ((:) (wallGlareWidth len wdth col alphay p wall)) w -> over particles' ((:) (wallGlareWidth len wdth col alphay p wall)) w
((p, E3x1 cr):_) ((p, E3x1 cr):_)
-> over afterParticles' ((:) (crGlareWidth wdth col alphay p cr)) w -> over particles' ((:) (crGlareWidth wdth col alphay p cr)) w
_ -> w _ -> w