Add more sounds

src/Dodge/Prop/Gib.hs

@@ -14,6 +14,7 @@ import RandomHelp
 
 import qualified Quaternion as Q
 import Data.List (zip4)
+import Data.Foldable
 
 aGib :: Prop
 aGib = PropZ
@@ -56,7 +57,7 @@ addCrGibs cr w = case damageDirection $ _csDamage $ _crState cr of
     cpos = _crPos cr
 
 addGibsAt :: Float -> Float -> Color -> Point2 -> World -> World
-addGibsAt minh maxh col p w = foldr addg w (zip4 vels zspeeds quats hs)
+addGibsAt minh maxh col p w = foldl' (flip $ addGib4 p col) w (zip4 vels zspeeds quats hs)
     & randGen .~ newg
   where
     (speeds,newg) = replicateM 4 (state (randomR (1,4))) & runState $ _randGen w
@@ -66,18 +67,10 @@ addGibsAt minh maxh col p w = foldr addg w (zip4 vels zspeeds quats hs)
     zspeeds = replicateM 4 (state (randomR (-8,8))) & evalState $ _randGen w
     quats :: [Q.Quaternion Float]
     quats = replicateM 4 (Q.vToQuat (V3 0 0 1) <$> randOnUnitSphere) & evalState $ _randGen w
-    addg (v,zs,q,h) = plNew props pjID (aGib & prPos .~ p +.+ (5 *.* normalizeV v)
-        & pjColor .~ col
-        & pjVel .~ v
-        & pjQuatSpin .~ Q.axisAngle (vNormal v `v2z` 0) (-0.1)
-        & pjQuat .~ q
-        & pjVelZ .~ zs
-        & pjPosZ .~ h
-        )
 
 -- this is ugly because it is mostly copy-paste from addGibsAt
 addGibsAtDir :: Float -> Float -> Float -> Color -> Point2 -> World -> World
-addGibsAtDir dir minh maxh col p w = foldr addg w (zip4 vels zspeeds quats hs)
+addGibsAtDir dir minh maxh col p w = foldl' (flip $ addGib4 p col) w (zip4 vels zspeeds quats hs)
     & randGen .~ newg
   where
     (speeds,newg) = replicateM 4 (state (randomR (1,4))) & runState $ _randGen w
@@ -87,15 +80,18 @@ addGibsAtDir dir minh maxh col p w = foldr addg w (zip4 vels zspeeds quats hs)
     zspeeds = replicateM 4 (state (randomR (-8,8))) & evalState $ _randGen w
     quats :: [Q.Quaternion Float]
     quats = replicateM 4 (Q.vToQuat (V3 0 0 1) <$> randOnUnitSphere) & evalState $ _randGen w
-    addg (v,zs,q,h) = plNew props pjID (aGib & prPos .~ p +.+ (5 *.* normalizeV v)
-        & pjColor .~ col
-        & pjVel .~ v
-        & pjQuatSpin .~ Q.axisAngle (vNormal v `v2z` 0) (-0.1)
-        & pjQuat .~ q
-        & pjVelZ .~ zs
-        & pjPosZ .~ h
-        )
   
+addGib4 :: Point2 -> Color -> (Point2, Float, Q.Quaternion Float, Float)
+    -> World -> World
+addGib4 p col (v,zs,q,h) = plNew props pjID (aGib & prPos .~ p +.+ (5 *.* normalizeV v)
+    & pjColor .~ col
+    & pjVel .~ v
+    & pjQuatSpin .~ Q.axisAngle (vNormal v `v2z` 0) (-0.1)
+    & pjQuat .~ q
+    & pjVelZ .~ zs
+    & pjPosZ .~ h
+    )
+
 addGibAt :: Float -> Color -> Point2 -> World -> World
 addGibAt h col p w = w
     & plNew props pjID gib