kiss-lang/kiss-flixel
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

theoretically should lower bound the zoom by scroll bounds

Browse Source
This commit is contained in:
Nat Quayle Nelson
2022-08-02 13:49:23 +00:00
parent 6427a76fe8
commit afcebbd429
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/kiss_flixel/CameraTools.kiss
View File

@@ -88,10 +88,11 @@
(let [newMouseWorldPosition (FlxG.mouse.getWorldPosition camera)
deltaMousePosition (newMouseWorldPosition.subtractPoint mouseWorldPosition)]
(camera.scroll.subtractPoint deltaMousePosition))
// Undo any scrolling that expands the viewport past its bounds
**(unless (.containsPoint (getScrollBounds camera) camera.scroll)
(-= camera.zoom deltaZoom)
(set camera.scroll scrollPosition))))
// Undo any zooming out that expands the viewport past its bounds
(when (> 0 deltaZoom)
(unless (.containsPoint (getScrollBounds camera) camera.scroll)
(-= camera.zoom deltaZoom)
(set camera.scroll scrollPosition)))))
(otherwise null)))
(function getScrollBounds [:FlxCamera camera]
@@ -100,7 +101,7 @@
// GOTCHA: if you change FlxG.camera to a moving camera, you MUST provide a default camera for FlxG.mouse.getScreenPosition()
(function calculateScrollBounds <>[:FlxSprite T] [:FlxCamera camera :FlxTypedGroup<T> group &opt :FlxCamera screenCamera :Float margin]
(let [r (GroupTools.calculateScreenBounds group screenCamera margin)]
(camera.setScrollBoundsRect r.x r.y ~r.width ~r.height)))
(camera.setScrollBoundsRect r.x r.y r.width r.height)))
// GOTCHA: if you change FlxG.camera to a moving camera, you MUST provide a default camera for FlxG.mouse.getScreenPosition()
(function extendScrollBounds [:FlxCamera camera :FlxSprite sprite &opt :FlxCamera screenCamera :Float margin]