Add visuals for wrist equipment

src/Dodge/Creature/HandPos.hs

@@ -1,6 +1,10 @@
 module Dodge.Creature.HandPos where
 import Dodge.Data
---import Geometry
+import Dodge.Creature.Test
+import Shape
+import ShapePicture
+import Geometry
+
 import Control.Lens
 import Data.Maybe
 
@@ -18,3 +22,47 @@ aimingWeaponZeroPos cr it = aimingWeaponHandlePos cr it
 aimingMuzzlePos :: Creature -> Item -> Float
 aimingMuzzlePos cr it = aimingWeaponZeroPos cr it 
     + fromMaybe 0 (it ^? itDimension . dimPortage . muzPos)
+
+translateToRightHand :: Creature -> SPic -> SPic
+translateToRightHand cr
+    | oneH cr = shoulderSP . translateSPf 11 (-3) . rotateSP (-0.5)-- . scaleSH (V3 1 1.5 1)
+    | twists cr = shoulderSP . translateSPf 0 5 . rotateSP (-1) . translateSPf 4 (-10)
+    | twoFlat cr = waistSP . translateSPf 4 (-8)
+    | otherwise = case cr ^? crStance . carriage of
+        Just (Walking sa LeftForward)  -> waistSP . translateSPf (-f sa) (-off)
+        _ -> waistSP . translateSPf 0 (-off)
+  where
+    off = 8
+    sLen = _strideLength $ _crStance cr
+    f i = negate 2 + negate 6 * fromIntegral (sLen - i) / fromIntegral sLen
+
+translateToLeftHand :: Creature -> SPic -> SPic
+translateToLeftHand cr
+    | oneH cr = waistSP . rotateSP 0.4 . translateSPf 0 off
+    | twists cr = shoulderSP . translateSPf 0 5 . rotateSP (-1) . translateSPf 12 4
+    | twoFlat cr = waistSP . translateSPf 4 8
+    | otherwise = case cr ^? crStance . carriage of
+        Just (Walking sa RightForward)  -> waistSP . translateSPf (-f sa) off
+        _ -> waistSP . translateSPf 0 off
+  where
+    off = 8
+    sLen = _strideLength $ _crStance cr
+    f i = negate 2 + negate 6 * fromIntegral (sLen - i) / fromIntegral sLen
+
+oneH :: Creature -> Bool
+oneH = crInStance OneHand
+
+twoFlat :: Creature -> Bool
+twoFlat = crInStance TwoHandFlat
+
+twists :: Creature -> Bool
+twists = crInStance TwoHandTwist
+
+shoulderSP :: SPic -> SPic
+shoulderSP = translateSPz 20
+waistSP :: SPic -> SPic
+waistSP = translateSPz 10
+
+crInStance :: AimStance -> Creature -> Bool
+crInStance as cr = crIsAiming' cr -- || (_posture (_crStance cr) == Reloading && hasAmmo cr)
+    && cr ^? crInv . ix (_crInvSel cr) . itUse . useAim . aimStance == Just as

src/Dodge/Creature/Picture.hs

@@ -18,6 +18,7 @@ import Dodge.Creature.Test
 --import Dodge.Creature.AlertLevel.Data
 --import Dodge.Picture.Layer
 import Dodge.Clock
+import Dodge.Creature.HandPos (translateToRightHand,translateToLeftHand)
 --import Dodge.Debug.Picture
 import Picture
 import Geometry
@@ -166,21 +167,23 @@ feet cr = case cr ^? crStance . carriage of
 
 arms :: Creature -> Shape
 {-# INLINE arms #-}
-arms cr 
-    | oneH cr = shoulderSH . translateSHf 11 (-3) . rotateSH (-0.5) $ scaleSH (V3 1 1.5 1) aHand
-    | twists cr = shoulderSH . translateSHf 0 5 . rotateSH (-1) $ mconcat 
-        [ translateSHf 12 4    aHand
-        , translateSHf 4 (-10) aHand
-        ]
-    | twoFlat cr = waistSH $ translateSHf 4 8 aHand
-        <> translateSHf 4 (-8) aHand
-    | otherwise = case cr ^? crStance . carriage of
-        Just (Walking sa LeftForward)  -> waistSH $ translateSHf (-f sa) (-off) aHand
-        Just (Walking sa RightForward) -> waistSH $ translateSHf (-f sa) off    aHand
-        _ -> emptySH 
+arms cr = fst $ translateToRightHand cr aHand
+    <> translateToLeftHand cr aHand
+--arms cr 
+--    | oneH cr = shoulderSH . translateSHf 11 (-3) . rotateSH (-0.5) $ scaleSH (V3 1 1.5 1) aHand
+--    | twists cr = shoulderSH . translateSHf 0 5 . rotateSH (-1) $ mconcat 
+--        [ translateSHf 12 4    aHand
+--        , translateSHf 4 (-10) aHand
+--        ]
+--    | twoFlat cr = waistSH $ translateSHf 4 8 aHand
+--        <> translateSHf 4 (-8) aHand
+--    | otherwise = case cr ^? crStance . carriage of
+--        Just (Walking sa LeftForward)  -> waistSH $ translateSHf (-f sa) (-off) aHand
+--        Just (Walking sa RightForward) -> waistSH $ translateSHf (-f sa) off    aHand
+--        _ -> emptySH 
   where
-    aHand :: Shape
-    aHand = translateSHz (-4) . upperPrismPolyHalf 4 $ polyCirc 3 4
+    aHand :: SPic
+    aHand = noPic $ translateSHz (-4) . upperPrismPolyHalf 4 $ polyCirc 3 4
     off = 8
     sLen = _strideLength $ _crStance cr
     f i = negate 2 + negate 6 * fromIntegral (sLen - i) / fromIntegral sLen
@@ -237,6 +240,7 @@ baseShoulder = translateSHz (-10) . scaleSH (V3 0.5 1 1) . upperPrismPolyHalf 10
 
 upperBody :: Color -> Creature -> Shape
 {-# INLINE upperBody #-}
+--upperBody col cr = colorSH (light4 col) $ mconcat
 upperBody col cr = colorSH (light4 col) $ mconcat
     [ arms cr
     , shoulderSH $ torso cr