Refactoring

2021-05-03 23:59:20 +02:00
parent b826299cbd
commit e21178b688
20 changed files with 830 additions and 731 deletions
@@ -63,11 +63,11 @@ makeExplosionAt
    :: Point2   -- ^ Position
    -> World 
    -> World
-makeExplosionAt p w = soundOncePos grenadeBang p
+makeExplosionAt p w 
+    = soundOncePos grenadeBang p
    . addFlames 
    . explosionFlashAt p
-    $ makeShockwaveAt [] p 50 10 1 white
-        w
+    $ makeShockwaveAt [] p 50 10 1 white w
  where 
    fVs  = replicateM 75 (randInCirc 1)  & evalState $ _randGen w
    fPs' = replicateM 75 (randInCirc 15) & evalState $ _randGen w
@@ -79,6 +79,5 @@ makeExplosionAt p w = soundOncePos grenadeBang p
    mF q v size time = makeFlameletTimed q v Nothing size time
    newFs = zipWith4 mF fPs (fmap (3 *.*) fVs') sizes times
    addFlames w = foldr ($) w newFs
-    pushAgainstWalls q = maybe q (uncurry (+.+)) 
-                                     $ collidePointWalls p q $ wallsNearPoint q w
+    pushAgainstWalls q = maybe q (uncurry (+.+)) $ reflectPointWalls p q $ wallsNearPoint q w