Stop bullets when they hit walls

2021-12-14 19:25:37 +00:00
parent 47391f3850
commit e3402bacf1
8 changed files with 64 additions and 21 deletions
@@ -15,13 +15,13 @@ import Control.Lens
 {- Update for a generic bullet.  -}
 mvBullet :: World -> Particle -> (World, Maybe Particle)
 mvBullet w bt' 
-    | t <= 0 || magV (_btVel' bt) < 1 = wAnd Nothing
-    | otherwise = second (fmap dodrag) $ hiteff bt (thingsHitExceptCr mcr p (p +.+ vel) w) w
+    | t <= 0 || magV (_btVel' bt) < 1 = (w,Nothing)
+    | otherwise = second (fmap dodrag) $ 
+        hiteff bt (thingsHitExceptCr mcr p (p +.+ vel) w) w
  where
    bt = foldr (\mg b -> _mgField mg mg b) bt' $ _magnets w
    dodrag = btVel' %~ (drag *.*)
    drag = _btDrag bt
-    wAnd    = (w,)
    mcr     = _btPassThrough' bt
    (p:_)  = _btTrail' bt
    vel     = _btVel' bt