diff --git a/haxe_libraries/hollywoo.hxml b/haxe_libraries/hollywoo.hxml index 91b59da..2c98e58 100644 --- a/haxe_libraries/hollywoo.hxml +++ b/haxe_libraries/hollywoo.hxml @@ -1,6 +1,6 @@ -# @install: lix --silent download "gh://github.com/kiss-lang/hollywoo#f2f1ce942885c140821e6116ec8aef69cf3398bc" into hollywoo/0.0.0/github/f2f1ce942885c140821e6116ec8aef69cf3398bc -# @run: haxelib run-dir hollywoo "${HAXE_LIBCACHE}/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/9b271ce1ce0b3edf803c08febd3e5e3a49af1624" -lib kiss -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 \ No newline at end of file diff --git a/src/hollywoo_flixel/FlxDirector.kiss b/src/hollywoo_flixel/FlxDirector.kiss index f9a75d5..32b7675 100644 --- a/src/hollywoo_flixel/FlxDirector.kiss +++ b/src/hollywoo_flixel/FlxDirector.kiss @@ -264,7 +264,7 @@ (method cloneSet [set] (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 (set layer.cameras [camera])) (case appearance @@ -305,19 +305,23 @@ // Remove cameras top to bottom: (FlxG.cameras.remove flxMovie.spriteChangeDebugCamera false) (FlxG.cameras.remove flxMovie.uiCamera false) - (doFor camera flxMovie.tempCamerasOrder - (FlxG.cameras.remove camera false)) + (unless skipping + (doFor camera flxMovie.tempCamerasOrder + (FlxG.cameras.remove camera false))) (FlxG.cameras.remove flxMovie.screenCamera false) - (doFor camera flxMovie.tempBgCamerasOrder - (FlxG.cameras.remove camera false)) + (unless skipping + (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))) + (unless skipping + (doFor camera flxMovie.tempBgCamerasOrder + (FlxG.cameras.add camera (dictGet flxMovie.tempBgCameras camera)))) (FlxG.cameras.add camera false) (FlxG.cameras.add flxMovie.screenCamera false) - (doFor camera flxMovie.tempCamerasOrder - (FlxG.cameras.add camera (dictGet flxMovie.tempCameras camera))) + (unless skipping + (doFor camera flxMovie.tempCamerasOrder + (FlxG.cameras.add camera (dictGet flxMovie.tempCameras camera)))) (FlxG.cameras.add flxMovie.uiCamera false) (FlxG.cameras.add flxMovie.spriteChangeDebugCamera false) diff --git a/src/hollywoo_flixel/HollywooFlixelDSL.kiss b/src/hollywoo_flixel/HollywooFlixelDSL.kiss index 5096530..1a4f91c 100644 --- a/src/hollywoo_flixel/HollywooFlixelDSL.kiss +++ b/src/hollywoo_flixel/HollywooFlixelDSL.kiss @@ -59,8 +59,9 @@ (tweenedPositions.remove sprite))) (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 + skipping (makeCC cc (whenLet [overlaidProps (dictGet overlaidPropsInScenes sceneKey)] (doFor =>sprite key overlaidProps @@ -790,6 +791,7 @@ scene (hollywoo.Movie.appearanceFlag shownScenes name) camera + skipping (makeCC finish (linearMotion skipping inCameraPos 0 0 speed finish soundLoop volumeMod [outCameraPos])))))