Cleanup

src/Dodge/Prop/Gib.hs

@@ -18,7 +18,7 @@ import Data.List (zip4)
 
 aGib :: Prop
 aGib = PropZ
-    {_pjPos = 0
+    {_prPos = 0
     ,_pjStartPos = 0
     ,_pjVel = 0
     ,_prDraw = drawGib 3
@@ -34,7 +34,7 @@ aGib = PropZ
 drawGib :: Float -> Prop -> SPic
 drawGib x pr = noPic
     . translateSHz (_pjPosZ pr)
-    . uncurryV translateSHf (_pjPos pr) 
+    . uncurryV translateSHf (_prPos pr) 
     . overPosSH (Q.rotate (_pjQuat pr))
     $ flesh <> skin
   where
@@ -68,10 +68,10 @@ updateGib' w pr
     newposz = _pjPosZ pr + velz
     velz = _pjVelZ pr
     vel  = _pjVel pr
-    pos  = _pjPos pr
+    pos  = _prPos pr
     updateWithVel v = case reflectPointWallsDamp 0.5 pos (pos + v) $ wallsAlongLine pos (pos +v) w of
-        Nothing -> pjPos +~ v
-        Just (p,v') -> (pjPos .~ p) . (pjVel .~ v')
+        Nothing -> prPos +~ v
+        Just (p,v') -> (prPos .~ p) . (pjVel .~ v')
 
 addCrGibs :: Creature -> World -> World
 addCrGibs cr w = case damageDirection $ _crDamage $ _crState cr of
@@ -98,7 +98,7 @@ 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 & pjPos .~ p +.+ (5 *.* normalizeV v)
+    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)
@@ -119,7 +119,7 @@ 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 & pjPos .~ p +.+ (5 *.* normalizeV v)
+    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)
@@ -141,7 +141,7 @@ addGibAt h col p w = w
         q <- Q.vToQuat (V3 0 0 1) <$> randOnUnitSphere
         let v = s *.* dir
         return $ aGib
-            & pjPos .~ p
+            & prPos .~ p
             & pjColor .~ col
             & pjVel .~ v
             & pjQuatSpin .~ Q.axisAngle (vNormal v `v2z` 0) (-0.1)
@@ -161,7 +161,7 @@ addGibAtDir dir h col p w = w
         q <- Q.vToQuat (V3 0 0 1) <$> randOnUnitSphere
         let v = s *.* unitVectorAtAngle dir
         return $ aGib
-            & pjPos .~ p
+            & prPos .~ p
             & pjColor .~ col
             & pjVel .~ v
             & pjQuatSpin .~ Q.axisAngle (vNormal v `v2z` 0) (-0.1)