From 02b2f9831fe6c80e62d062d1f74cac8ced16cfae Mon Sep 17 00:00:00 2001 From: justin Date: Mon, 23 Dec 2024 16:59:55 +0000 Subject: [PATCH] Cleanup, fix bug in floating camera zoom --- src/Dodge/Item/Grammar.hs | 9 ++++----- src/Dodge/Update/Camera.hs | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/Dodge/Item/Grammar.hs b/src/Dodge/Item/Grammar.hs index f8f6ab1cf..c162e9434 100644 --- a/src/Dodge/Item/Grammar.hs +++ b/src/Dodge/Item/Grammar.hs @@ -115,13 +115,12 @@ itemToFunction itm = case itm ^. itType of _ -> UncomposableIsolateSF basePCI :: Item -> ComposedItem -basePCI itm = case _itType itm of - _ -> (itm, itemToFunction itm, itemBaseConnections itm) +basePCI itm = (itm, itemToFunction itm, itemBaseConnections itm) itemBaseConnections :: Item -> LinkTest itemBaseConnections itm = case _itType itm of HELD LASER -> laserLinkTest itm - CRAFT SPRING -> springLinkTest itm + CRAFT SPRING -> springLinkTest _ -> uncurry useBreakL $ itemToBreakLists itm (itemToFunction itm) laserLinkTest :: Item -> LinkTest @@ -145,8 +144,8 @@ toLasgunUpdate itm = (\(par, _, _) -> (par, HeldPlatformSF, uncurry useBreakL $ itemToBreakLists itm HeldPlatformSF)) (\(chi, _, up) -> (chi, FunctionChangeSF, up)) -springLinkTest :: Item -> LinkTest -springLinkTest itm = LTest (const Nothing) $ +springLinkTest :: LinkTest +springLinkTest = LTest (const Nothing) $ \ci -> case ci ^. _1 . itType of CRAFT HARDWARE -> Just diff --git a/src/Dodge/Update/Camera.hs b/src/Dodge/Update/Camera.hs index 30ea3353d..ea4b31640 100644 --- a/src/Dodge/Update/Camera.hs +++ b/src/Dodge/Update/Camera.hs @@ -64,7 +64,7 @@ translateFloatingCameraKeys theinput = (camCenter -~ thetran) . (camViewFrom -~ zoomFloatingCamera :: Input -> Camera -> Camera zoomFloatingCamera theinput | ButtonRight `M.member` (theinput ^. mouseButtons) = - camZoom *~ (39/40 ^^ negate (getSmoothScrollValue theinput)) + camZoom *~ ((39/40) ^^ negate (getSmoothScrollValue theinput)) | otherwise = id -- the 39/40 is taken from zoomSpeed