Add general smooth scrolling, move camera into world

2023-03-26 20:09:00 +01:00
parent 73e742e1a2
commit 07a1d71039
32 changed files with 154 additions and 131 deletions
@@ -82,7 +82,7 @@ useAmmoParams it cr w =
            return $ FlechetteTrajectory tpos
        BezierTrajectory{} -> fromMaybe BasicBulletTrajectory $ do
            tpos <- cr ^? crTargeting . ctPos . _Just
-            return $ BezierTrajectory sp tpos (mouseWorldPos (w ^. input) (w ^. cWorld . cwCam))
+            return $ BezierTrajectory sp tpos (mouseWorldPos (w ^. input) (w ^. wCam))

 bounceDir :: (Point2, Either Creature Wall) -> Maybe Point2
 bounceDir (_, Right wl) | _wlBouncy wl = Just $ uncurry (-.-) (_wlLine wl)