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

preserve overlay status of props in scenes

Browse Source
This commit is contained in:
Nat Quayle Nelson
2023-06-14 08:08:15 -06:00
parent d4d932299c
commit 10071be9c0
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/hollywoo_flixel/FlxMovie.hx
View File

@@ -35,6 +35,7 @@ class FlxMovie extends Movie<FlxSprite, ActorFlxSprite, FlxSound, String, FlxSpr
public var propScales:JsonMap<HFloat>; public var propScales:JsonMap<HFloat>;
public var propsInScene:Map<String,Array<String>> = []; public var propsInScene:Map<String,Array<String>> = [];
public var overlaidPropsInScenes:Map<String,Map<FlxSprite,String>> = [];
public var tweenedPositionsOfSpritesInScenes:Map<String,Map<FlxSprite,FlxPoint>> = []; public var tweenedPositionsOfSpritesInScenes:Map<String,Map<FlxSprite,FlxPoint>> = [];
public var tweens:Array<FlxTween> = []; public var tweens:Array<FlxTween> = [];

12
src/hollywoo_flixel/HollywooFlixelDSL.kiss
View File

@@ -21,6 +21,9 @@
(method &override :Void _showScene [:Scene<FlxSprite,ActorFlxSprite,FlxSprite,FlxCamera> scene :Appearance appearance :FlxCamera camera :Continuation cc] (method &override :Void _showScene [:Scene<FlxSprite,ActorFlxSprite,FlxSprite,FlxCamera> scene :Appearance appearance :FlxCamera camera :Continuation cc]
(super._showScene scene appearance camera (super._showScene scene appearance camera
(makeCC (makeCC
(whenLet [overlaidProps (dictGet overlaidPropsInScenes sceneKey)]
(doFor =>sprite key overlaidProps
(overlayPropOnCurrentSet key (makeCC null))))
(whenLet [tweenedPositions (dictGet tweenedPositionsOfSpritesInScenes sceneKey)] (whenLet [tweenedPositions (dictGet tweenedPositionsOfSpritesInScenes sceneKey)]
(doFor =>sprite point tweenedPositions (doFor =>sprite point tweenedPositions
(set sprite.x point.x) (set sprite.x point.x)
@@ -32,6 +35,12 @@
(tweenedPositions.remove (dictGet actors actorName))) (tweenedPositions.remove (dictGet actors actorName)))
(super.moveCharacter actorName newPosition newFacing cc)) (super.moveCharacter actorName newPosition newFacing cc))
(method &override removeProp [name :Continuation cc]
(let [prop (dictGet props name)]
(whenLet [overlaidProps (dictGet overlaidPropsInScenes sceneKey)]
(overlaidProps.remove prop)))
(super.removeProp name cc))
(method linearMotion [:FlxSprite sprite :Float destX :Float destY :Float speed &opt :Void->Void cc :String soundLoop :Float volumeMod :Array<FlxSprite> connectedSprites] (method linearMotion [:FlxSprite sprite :Float destX :Float destY :Float speed &opt :Void->Void cc :String soundLoop :Float volumeMod :Array<FlxSprite> connectedSprites]
(unless (tweenedPositionsOfSpritesInScenes.exists sceneKey) (unless (tweenedPositionsOfSpritesInScenes.exists sceneKey)
(dictSet tweenedPositionsOfSpritesInScenes sceneKey (new Map))) (dictSet tweenedPositionsOfSpritesInScenes sceneKey (new Map)))
@@ -229,6 +238,9 @@
(let [propKey (kiss.FuzzyMapTools.bestMatch props propKey)] (let [propKey (kiss.FuzzyMapTools.bestMatch props propKey)]
(dictSet shownProps propKey true) // Don't scale when showing (dictSet shownProps propKey true) // Don't scale when showing
(withProp propKey p (withProp propKey p
(unless (overlaidPropsInScenes.exists sceneKey)
(dictSet overlaidPropsInScenes sceneKey (new Map)))
(dictSet (dictGet overlaidPropsInScenes sceneKey) p propKey)
(withSceneSetCC sceneKey bg (withSceneSetCC sceneKey bg
(addProp propKey (new StagePosition bg.x bg.y 1) cc) (addProp propKey (new StagePosition bg.x bg.y 1) cc)
(p.setGraphicSize (Std.int bg.width) (Std.int bg.height)) (p.setGraphicSize (Std.int bg.width) (Std.int bg.height))