Attempt to fix some space leaks, general cleanup
This commit is contained in:
+15
-2
@@ -90,7 +90,10 @@ functionalUpdate w =
|
||||
. over uvWorld (cWorld . cwTime . worldClock +~ 1)
|
||||
. over uvWorld updateWorldSelect
|
||||
. over uvWorld doRewind
|
||||
. over uvWorld (hammers . each %~ moveHammerUp)
|
||||
-- . over uvWorld (hammers . each %~ moveHammerUp)
|
||||
-- . over (uvWorld . hammers . each) moveHammerUp
|
||||
-- . over uvWorld (hammers %~ fmap moveHammerUp)
|
||||
. moveHammersUp
|
||||
. over uvWorld updateDistortions
|
||||
. over uvWorld updateCreatureSoundPositions
|
||||
. over uvWorld ppEvents
|
||||
@@ -138,8 +141,18 @@ functionalUpdate w =
|
||||
. updateBounds -- where should this go? next to update camera?
|
||||
$ over uvWorld updateCloseObjects w
|
||||
|
||||
moveHammersUp :: Universe -> Universe
|
||||
--moveHammersUp = uvWorld . hammers .~ M.empty
|
||||
moveHammersUp = uvWorld . hammers %~ M.map moveHammerUp
|
||||
--moveHammersUp = uvWorld . hammers . each %~ (moveHammerUp $!)
|
||||
--moveHammersUp = uvWorld %~ ( (hammers . each %~ (moveHammerUp $!)) $!)
|
||||
--moveHammersUp uv = uv { _uvWorld = w' }
|
||||
-- where
|
||||
-- w = _uvWorld uv
|
||||
-- w' = w {_hammers = fmap moveHammerUp (_hammers w)}
|
||||
|
||||
doWorldEvents :: World -> World
|
||||
doWorldEvents w = foldr doWdWd (w & cWorld . worldEvents .~ []) (_worldEvents (_cWorld w))
|
||||
doWorldEvents w = foldl' (flip doWdWd) (w & cWorld . worldEvents .~ []) (_worldEvents (_cWorld w))
|
||||
|
||||
updateLasers :: World -> World
|
||||
updateLasers w =
|
||||
|
||||
Reference in New Issue
Block a user