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

fix the loading screen sliver problem

Browse Source
This commit is contained in:
Nat Quayle Nelson
2024-10-11 09:52:28 -05:00
parent ec4ed8853f
commit 66fce7d81d
2 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/hollywoo_flixel/FlxDirector.kiss
View File

@@ -5,7 +5,7 @@
(defAlias &ident flxMovie (cast movie FlxMovie))
(loadFrom "hollywoo-flixel" "src/hollywoo_flixel/Aliases.kiss")
(prop :Array<FlxTypedGroup<FlxSprite>> spriteLayers [])
(prop :FlxTypedGroup<FlxTypedGroup<FlxSprite>> spriteLayers (new FlxTypedGroup))
(var LAYER_MAX 8)
(savedVar :Map<String,String> lastSceneLabels (new Map))
@@ -60,10 +60,10 @@
(kiss_flixel.DebugTools.f2ToLogSprites actionManager))
(set actionManager.resetOnStateSwitch NONE)
// Create the sprite layers but don't add them until skipping ends (This is how I win)
(doFor i (range (+ 1 LAYER_MAX))
(let [g (new FlxTypedGroup<FlxSprite>)]
(spriteLayers.push g)
(FlxG.state.add g)))))
(spriteLayers.add g)))))
(prop :Map<SceneTime,FlxSprite> skySprites (new Map))
(prop &mut :FlxSprite skySprite)
@@ -299,7 +299,7 @@
(set skySprite.x setSprite.x)
(set skySprite.y 0)
(set skySprite.cameras [camera])
(.add (first spriteLayers) skySprite)
(.add (first spriteLayers.members) skySprite)
(FlxG.cameras.remove flxMovie.uiCamera false)
(FlxG.cameras.remove flxMovie.screenCamera false)
@@ -307,15 +307,15 @@
(FlxG.cameras.add flxMovie.screenCamera false)
(FlxG.cameras.add flxMovie.uiCamera false)
(set setSprite.cameras [camera])
(.add (first spriteLayers) setSprite)
(.add (first spriteLayers.members) setSprite)
(cc))
(method :Void hideSet [:FlxSprite set :FlxCamera camera :Continuation cc]
(when (FlxG.cameras.list.contains camera)
(FlxG.cameras.remove camera false))
(.remove (first spriteLayers) skySprite true)
(.remove (first spriteLayers) set true)
(.remove (first spriteLayers.members) skySprite true)
(.remove (first spriteLayers.members) set true)
(cc))
(method :FlxSprite drawLight [:FlxLightSource source]
@@ -547,9 +547,9 @@
// Display with y adjusted by z:
(-= character.actor.y character.stagePosition.z)
(let [layer (- LAYER_MAX 1 (Std.int (/ character.stagePosition.z flxMovie.STAGE_BEHIND_DY)))]
(.add (nth spriteLayers layer) character.actor)))
(.add (nth spriteLayers.members layer) character.actor)))
(true
(.add (nth spriteLayers (min (- LAYER_MAX 1) (Std.int character.stagePosition.z))) character.actor)))
(.add (nth spriteLayers.members (min (- LAYER_MAX 1) (Std.int character.stagePosition.z))) character.actor)))
(cc))
@@ -988,7 +988,7 @@
(let [layerNum position.z]
(assertEquals layerNum (Std.int layerNum))
(.add (nth spriteLayers (min LAYER_MAX (+ 1 (Std.int layerNum)))) prop)))
(.add (nth spriteLayers.members (min LAYER_MAX (+ 1 (Std.int layerNum)))) prop)))
(set prop.x (Math.round prop.x))
(set prop.y (Math.round prop.y))
(cc))

26
src/hollywoo_flixel/HollywooFlixelDSL.kiss
View File

@@ -4,6 +4,8 @@
(loadFrom "hollywoo" "src/hollywoo/Movie.kiss")
(loadFrom "hollywoo-flixel" "src/hollywoo_flixel/Aliases.kiss")
(defAlias &ident flxDirector (cast director FlxDirector))
(function :Dynamic callPrivate [:Dynamic obj :String method &rest :Array<Dynamic> args]
(Reflect.callMethod obj (Reflect.field obj method) args))
@@ -116,6 +118,8 @@
(set onSkipEnd ->{
(superSkipEnd)
(FlxG.state.add flxDirector.spriteLayers)
// If a background shader camera is hidden, reveal it
(underAllCameras
(doFor camera tempBgCamerasOrder
@@ -286,18 +290,34 @@
(defReaderMacro "ASSERTLOGSPRITES" [stream &builder b]
`(#when debug
(when skipping
(FlxG.state.add flxDirector.spriteLayers))
(kiss_flixel.SpriteTools.assertLogSprites ,(read stream))
(when skipping
(FlxG.state.remove flxDirector.spriteLayers true))
(cc)))
(defReaderMacro "ASSERTLOGSPRITESCC" [stream &builder b]
`(#when debug
(kiss_flixel.SpriteTools.assertLogSprites ,(read stream))))
(when skipping
(FlxG.state.add flxDirector.spriteLayers))
(kiss_flixel.SpriteTools.assertLogSprites ,(read stream))
(when skipping
(FlxG.state.remove flxDirector.spriteLayers true))))
(defReaderMacro "WARNLOGSPRITES" [stream &builder b]
`(#when debug
(when skipping
(FlxG.state.add flxDirector.spriteLayers))
(kiss_flixel.SpriteTools.warnLogSprites ,(read stream))
(when skipping
(FlxG.state.remove flxDirector.spriteLayers true))
(cc)))
(defReaderMacro "WARNLOGSPRITESCC" [stream &builder b]
`(#when debug
(kiss_flixel.SpriteTools.warnLogSprites ,(read stream))))
(when skipping
(FlxG.state.add flxDirector.spriteLayers))
(kiss_flixel.SpriteTools.warnLogSprites ,(read stream))
(when skipping
(FlxG.state.remove flxDirector.spriteLayers true))))
@:keep
(method :Void scaleTo [:Bool skipping :FlxSprite sprite :Float scale :Float duration &opt :Void->Void cc]
@@ -408,8 +428,6 @@
(var FAST_FORWARD_MOD 3)
(defAlias &ident flxDirector (cast director FlxDirector))
(method &override :Void update [:Float elapsed]
(when skipMovie
(skipMovie.update elapsed)