fix CameraTools updateMouseBorderControl for moving cameras

This commit is contained in:
2022-08-01 18:43:53 +00:00
parent 5b4a07ac65
commit 5bacff9f01
3 changed files with 5 additions and 4 deletions

View File

@@ -25,7 +25,7 @@
(super.update elapsed)
(pieceCamera.updateScrollWheelZoom elapsed 1)
(pieceCamera.updateMouseBorderControl elapsed KEYBOARD_SCROLL_SPEED 0.15)
(pieceCamera.updateMouseBorderControl elapsed KEYBOARD_SCROLL_SPEED 0.002 uiCamera)
// Hold left-click to hide the habit text and see the image clearly:
(when entryTexts (if FlxG.mouse.pressed (remove entryTexts) (add entryTexts)))

View File

@@ -97,4 +97,4 @@
->{FlxG.keys.pressed.RIGHT}
->{FlxG.keys.pressed.UP}
->{FlxG.keys.pressed.DOWN})
(worldCamera.updateMouseBorderControl elapsed CAMERA_SPEED 0.15))
(worldCamera.updateMouseBorderControl elapsed CAMERA_SPEED 0.02))

View File

@@ -50,7 +50,8 @@
(-= camera.width dx (* border.scale.x borderSizeRight))
(-= camera.height dy (* border.scale.y borderSizeBottom)))))
(function updateMouseBorderControl [:FlxCamera camera :Float elapsed :Float speed :Float heightFraction]
// GOTCHA: if you change FlxG.camera to a moving camera, you MUST provide a default camera for FlxG.mouse.getScreenPosition()
(function updateMouseBorderControl [:FlxCamera camera :Float elapsed :Float speed :Float heightFraction &opt :FlxCamera screenCamera]
(let [viewport (ifLet [bc (dictGet borderCameras camera)] bc camera)
left viewport.x
top viewport.y
@@ -59,7 +60,7 @@
// Use the same margin size for x and y, and calculate it based on height
// (in a landscape view, this just makes more sense to me)
margin (* viewport.height heightFraction)
mPos (FlxG.mouse.getScreenPosition)]
mPos (FlxG.mouse.getScreenPosition screenCamera)]
(updateKeyControl camera elapsed speed
// when the camera takes the whole screen, count the letterbox zones as margin
->(if (= left 0)