From 24939094c6f8836641218c5c9094139ee141ca84 Mon Sep 17 00:00:00 2001 From: justin Date: Sun, 28 May 2023 15:09:42 +0100 Subject: [PATCH] Cleanup --- src/Dodge/Creature/HandPos.hs | 27 +++++++++++++++++++-------- src/Dodge/Item/HeldOffset.hs | 8 ++++++-- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/src/Dodge/Creature/HandPos.hs b/src/Dodge/Creature/HandPos.hs index 1ade64072..1079e2609 100644 --- a/src/Dodge/Creature/HandPos.hs +++ b/src/Dodge/Creature/HandPos.hs @@ -1,17 +1,33 @@ -module Dodge.Creature.HandPos where +module Dodge.Creature.HandPos ( + aimingWeaponZeroPos, + aimingMuzzlePos, + aimingMuzzleLength, + translatePointToLeftHand, + translatePointToRightHand, + translatePointToHead, + translateToLeftWrist, + translateToRightWrist, + translateToLeftLeg, + translateToRightLeg, + translateToHead, + translateToChest, + translateToBack, + translateToLeftHand, + translateToRightHand, +) where -import Linear import Control.Lens import Data.Maybe import Dodge.Creature.Test import Dodge.Data.Creature import Geometry +import Linear import ShapePicture -- the position of a weapon handle aimingWeaponHandlePos :: Creature -> Item -> Point2 aimingWeaponHandlePos _ it = case it ^? itUse . heldAim . aimStance of - Just TwoHandUnder -> 0 + Just TwoHandUnder -> 0 Just TwoHandOver -> V2 (-7) 0 Just OneHand -> V2 10 (-2) Just TwoHandFlat -> V2 10 0 @@ -27,11 +43,6 @@ aimingMuzzlePos cr it = fmap ((+ zp) . _mzPos) (it ^.. itUse . heldAim . aimMuzz where zp = aimingWeaponZeroPos cr it -aimingMuzzleOff :: Creature -> Item -> [Point2] -aimingMuzzleOff cr it = fmap (rotateV (_crDir cr) . (+ zp) . _mzPos) (it ^.. itUse . heldAim . aimMuzzles . folded) - where - zp = aimingWeaponZeroPos cr it - aimingMuzzleLength :: Creature -> Item -> Float aimingMuzzleLength cr it = head (aimingMuzzlePos cr it) ^. _x diff --git a/src/Dodge/Item/HeldOffset.hs b/src/Dodge/Item/HeldOffset.hs index ee543fc5e..c757a48d5 100644 --- a/src/Dodge/Item/HeldOffset.hs +++ b/src/Dodge/Item/HeldOffset.hs @@ -1,4 +1,8 @@ -module Dodge.Item.HeldOffset where +module Dodge.Item.HeldOffset ( + turretItemOffset, + twoFlatHRot, + heldItemOffset, +) where import Data.Maybe import Dodge.Creature.HandPos @@ -66,4 +70,4 @@ strideRot cr = case cr ^? crStance . carriage of sLen = _strideLength $ _crStance cr twoFlatHRot :: Creature -> Float -twoFlatHRot cr = 2 * strideRot cr +twoFlatHRot = (2 *) . strideRot