From 4b72739a9ccc398c9ad92f5f38838d78a86bba44 Mon Sep 17 00:00:00 2001 From: Nat Quayle Nelson Date: Mon, 27 Jun 2022 14:03:26 +0000 Subject: [PATCH] CameraTools.updateScrollWheelZoom --- projects/iso-rpg-engine/source/BladesMapState.kiss | 6 +----- projects/kiss-flixel/src/kiss_flixel/CameraTools.kiss | 9 ++++++++- .../nat-flixel-desktop-playground/source/PlayState.kiss | 3 +++ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/projects/iso-rpg-engine/source/BladesMapState.kiss b/projects/iso-rpg-engine/source/BladesMapState.kiss index cec67f32..69870091 100644 --- a/projects/iso-rpg-engine/source/BladesMapState.kiss +++ b/projects/iso-rpg-engine/source/BladesMapState.kiss @@ -83,11 +83,7 @@ (method &override :Void update [:Float elapsed] (super.update elapsed) // scroll to zoom: - #{ - if (FlxG.mouse.wheel != 0) { - FlxG.camera.zoom += (FlxG.mouse.wheel / 10); - } - }# + (worldCamera.updateScrollWheelZoom elapsed 1) // F1 to toggle fullscreen: (when FlxG.keys.justPressed.F1 (set FlxG.fullscreen !FlxG.fullscreen)) diff --git a/projects/kiss-flixel/src/kiss_flixel/CameraTools.kiss b/projects/kiss-flixel/src/kiss_flixel/CameraTools.kiss index 9369f1ed..da1e00d2 100644 --- a/projects/kiss-flixel/src/kiss_flixel/CameraTools.kiss +++ b/projects/kiss-flixel/src/kiss_flixel/CameraTools.kiss @@ -73,4 +73,11 @@ (<= top mPos.y (+ top margin))) ->(if (= bottom FlxG.height) (<= (- bottom margin) mPos.y) - (<= (- bottom margin) mPos.y bottom))))) \ No newline at end of file + (<= (- bottom margin) mPos.y bottom))))) + +(function updateScrollWheelZoom [:FlxCamera camera :Float elapsed :Float speed] + #{ + if (FlxG.mouse.wheel != 0) { + camera.zoom += (FlxG.mouse.wheel * elapsed * speed); + } + }#) \ No newline at end of file diff --git a/projects/nat-flixel-desktop-playground/source/PlayState.kiss b/projects/nat-flixel-desktop-playground/source/PlayState.kiss index fcd35b17..9b24def3 100644 --- a/projects/nat-flixel-desktop-playground/source/PlayState.kiss +++ b/projects/nat-flixel-desktop-playground/source/PlayState.kiss @@ -128,6 +128,9 @@ ->{FlxG.keys.pressed.UP} ->{FlxG.keys.pressed.DOWN}) (FlxG.camera.updateMouseBorderControl elapsed KEYBOARD_SCROLL_SPEED 0.15) + + (FlxG.camera.updateScrollWheelZoom elapsed 1) + // don't move the ui camera before ui has been placed -- new UI elements could appear offscreen (when (> uiGroup.length 0) (unless (and textInput textInput.hasFocus)