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

fix tempcamera handling on scene switch

Browse Source
This commit is contained in:
Nat Quayle Nelson
2024-10-14 11:45:10 -05:00
parent 5784f6c036
commit 76474e31b6
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/hollywoo_flixel/FlxDirector.kiss
View File

@@ -301,13 +301,26 @@
(flxMovie.setCameras skySprite [camera]) (flxMovie.setCameras skySprite [camera])
(.add (first spriteLayers.members) skySprite) (.add (first spriteLayers.members) skySprite)
(FlxG.cameras.remove flxMovie.uiCamera false) // Remove cameras top to bottom:
(FlxG.cameras.remove flxMovie.screenCamera false)
(FlxG.cameras.remove flxMovie.spriteChangeDebugCamera false) (FlxG.cameras.remove flxMovie.spriteChangeDebugCamera false)
(FlxG.cameras.remove flxMovie.uiCamera false)
(doFor camera flxMovie.tempCamerasOrder
(FlxG.cameras.remove camera false))
(FlxG.cameras.remove flxMovie.screenCamera false)
(doFor camera flxMovie.tempBgCamerasOrder
(FlxG.cameras.remove camera false))
// Add cameras bottom to top
(doFor camera flxMovie.tempBgCamerasOrder
(FlxG.cameras.add camera (dictGet flxMovie.tempBgCameras camera)))
(FlxG.cameras.add camera false) (FlxG.cameras.add camera false)
(FlxG.cameras.add flxMovie.screenCamera false) (FlxG.cameras.add flxMovie.screenCamera false)
(doFor camera flxMovie.tempCamerasOrder
(FlxG.cameras.add camera (dictGet flxMovie.tempCameras camera)))
(FlxG.cameras.add flxMovie.uiCamera false) (FlxG.cameras.add flxMovie.uiCamera false)
(FlxG.cameras.add flxMovie.spriteChangeDebugCamera false) (FlxG.cameras.add flxMovie.spriteChangeDebugCamera false)
// Add the set
(flxMovie.setCameras setSprite [camera]) (flxMovie.setCameras setSprite [camera])
(.add (first spriteLayers.members) setSprite) (.add (first spriteLayers.members) setSprite)
(cc)) (cc))

8
src/hollywoo_flixel/FlxMovie.hx
View File

@@ -32,10 +32,10 @@ class FlxMovie extends Movie<FlxSprite, ActorFlxSprite, FlxSound, FlxSound, FlxS
public var screenCamera:FlxCamera; public var screenCamera:FlxCamera;
public var spriteChangeDebugCamera:FlxCamera; public var spriteChangeDebugCamera:FlxCamera;
var tempCamerasOrder:Array<FlxCamera> = []; public var tempCamerasOrder:Array<FlxCamera> = [];
var tempCameras:Map<FlxCamera,Bool> = []; public var tempCameras:Map<FlxCamera,Bool> = [];
var tempBgCamerasOrder:Array<FlxCamera> = []; public var tempBgCamerasOrder:Array<FlxCamera> = [];
var tempBgCameras:Map<FlxCamera,Bool> = []; public var tempBgCameras:Map<FlxCamera,Bool> = [];
public var nextFrameActions:Array<Void->Void> = []; public var nextFrameActions:Array<Void->Void> = [];