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

don't try to remove tempCameras that aren't in yet

Browse Source
This commit is contained in:
Nat Quayle Nelson
2024-10-14 12:43:38 -05:00
parent 5467b36511
commit 28695473ea
3 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
haxe_libraries/hollywoo.hxml
View File

@@ -1,6 +1,6 @@
# @install: lix --silent download "gh://github.com/kiss-lang/hollywoo#f2f1ce942885c140821e6116ec8aef69cf3398bc" into hollywoo/0.0.0/github/f2f1ce942885c140821e6116ec8aef69cf3398bc # @install: lix --silent download "gh://github.com/kiss-lang/hollywoo#9b271ce1ce0b3edf803c08febd3e5e3a49af1624" into hollywoo/0.0.0/github/9b271ce1ce0b3edf803c08febd3e5e3a49af1624
# @run: haxelib run-dir hollywoo "${HAXE_LIBCACHE}/hollywoo/0.0.0/github/f2f1ce942885c140821e6116ec8aef69cf3398bc" # @run: haxelib run-dir hollywoo "${HAXE_LIBCACHE}/hollywoo/0.0.0/github/9b271ce1ce0b3edf803c08febd3e5e3a49af1624"
-lib kiss -lib kiss
-lib kiss-tools -lib kiss-tools
-cp ${HAXE_LIBCACHE}/hollywoo/0.0.0/github/f2f1ce942885c140821e6116ec8aef69cf3398bc/src/ -cp ${HAXE_LIBCACHE}/hollywoo/0.0.0/github/9b271ce1ce0b3edf803c08febd3e5e3a49af1624/src/
-D hollywoo=0.0.0 -D hollywoo=0.0.0

22
src/hollywoo_flixel/FlxDirector.kiss
View File

@@ -264,7 +264,7 @@
(method cloneSet [set] (method cloneSet [set]
(set.clone)) (set.clone))
(method :Void showSet [:FlxSprite setSprite :SceneTime time :ScenePerspective perspective :Appearance appearance :FlxCamera camera :Continuation cc] (method :Void showSet [:FlxSprite setSprite :SceneTime time :ScenePerspective perspective :Appearance appearance :FlxCamera camera :Bool skipping :Continuation cc]
(doFor layer spriteLayers (doFor layer spriteLayers
(set layer.cameras [camera])) (set layer.cameras [camera]))
(case appearance (case appearance
@@ -305,19 +305,23 @@
// Remove cameras top to bottom: // Remove cameras top to bottom:
(FlxG.cameras.remove flxMovie.spriteChangeDebugCamera false) (FlxG.cameras.remove flxMovie.spriteChangeDebugCamera false)
(FlxG.cameras.remove flxMovie.uiCamera false) (FlxG.cameras.remove flxMovie.uiCamera false)
(doFor camera flxMovie.tempCamerasOrder (unless skipping
(FlxG.cameras.remove camera false)) (doFor camera flxMovie.tempCamerasOrder
(FlxG.cameras.remove camera false)))
(FlxG.cameras.remove flxMovie.screenCamera false) (FlxG.cameras.remove flxMovie.screenCamera false)
(doFor camera flxMovie.tempBgCamerasOrder (unless skipping
(FlxG.cameras.remove camera false)) (doFor camera flxMovie.tempBgCamerasOrder
(FlxG.cameras.remove camera false)))
// Add cameras bottom to top // Add cameras bottom to top
(doFor camera flxMovie.tempBgCamerasOrder (unless skipping
(FlxG.cameras.add camera (dictGet flxMovie.tempBgCameras camera))) (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 (unless skipping
(FlxG.cameras.add camera (dictGet flxMovie.tempCameras camera))) (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)

4
src/hollywoo_flixel/HollywooFlixelDSL.kiss
View File

@@ -59,8 +59,9 @@
(tweenedPositions.remove sprite))) (tweenedPositions.remove sprite)))
(super.moveToScene skipping name cc)) (super.moveToScene skipping name cc))
(method &override :Void _showScene [:Scene scene :Appearance appearance :FlxCamera camera :Continuation cc] (method &override :Void _showScene [:Scene scene :Appearance appearance :FlxCamera camera :Bool skipping :Continuation cc]
(super._showScene scene appearance camera (super._showScene scene appearance camera
skipping
(makeCC cc (makeCC cc
(whenLet [overlaidProps (dictGet overlaidPropsInScenes sceneKey)] (whenLet [overlaidProps (dictGet overlaidPropsInScenes sceneKey)]
(doFor =>sprite key overlaidProps (doFor =>sprite key overlaidProps
@@ -790,6 +791,7 @@
scene scene
(hollywoo.Movie.appearanceFlag shownScenes name) (hollywoo.Movie.appearanceFlag shownScenes name)
camera camera
skipping
(makeCC finish (makeCC finish
(linearMotion skipping inCameraPos 0 0 speed finish soundLoop volumeMod [outCameraPos]))))) (linearMotion skipping inCameraPos 0 0 speed finish soundLoop volumeMod [outCameraPos])))))