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

Close #160 and make screenCamera non-optional

Browse Source
This commit is contained in:
Nat Quayle Nelson
2022-10-08 20:50:13 +00:00
parent 042d9fc1b3
commit 2bbccad2d5
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
projects/iso-rpg-engine/source/BladesMapState.kiss
View File

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

2
projects/kiss-flixel/src/kiss_flixel/CameraTools.kiss
View File

@@ -51,7 +51,7 @@
(-= camera.height dy (* border.scale.y borderSizeBottom)))))
// 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]
(function updateMouseBorderControl [:FlxCamera camera :Float elapsed :Float speed :Float heightFraction :FlxCamera screenCamera]
(let [viewport (ifLet [bc (dictGet borderCameras camera)] bc camera)
left viewport.x
top viewport.y

3
projects/nat-flixel-desktop-playground/source/PlayState.kiss
View File

@@ -38,6 +38,7 @@
(add debugLayer)
(prop uiCamera (new FlxCamera 0 0 FlxG.width FlxG.height))
(prop screenCamera (new FlxCamera 0 0 FlxG.width FlxG.height))
(set uiCamera.bgColor FlxColor.TRANSPARENT)
(FlxG.cameras.add uiCamera false)
@@ -106,7 +107,7 @@
->{FlxG.keys.pressed.RIGHT}
->{FlxG.keys.pressed.UP}
->{FlxG.keys.pressed.DOWN})
(FlxG.camera.updateMouseBorderControl elapsed KEYBOARD_SCROLL_SPEED 0.01)
(FlxG.camera.updateMouseBorderControl elapsed KEYBOARD_SCROLL_SPEED 0.01 screenCamera)
(FlxG.camera.updateScrollWheelZoom elapsed 1)