From 0bb4ab7be41b1873e068004368306f25e859a968 Mon Sep 17 00:00:00 2001 From: Nat Quayle Nelson Date: Mon, 25 Oct 2021 16:39:18 -0400 Subject: [PATCH] Fix bad Hollywoo naming conventions --- .../{FlxActorSprite.hx => ActorFlxSprite.hx} | 2 +- .../{FlxActorSprite.kiss => ActorFlxSprite.kiss} | 0 src/hollywoo_flixel/FlxDirector.hx | 9 +++++---- src/hollywoo_flixel/FlxDirector.kiss | 6 +++--- .../{FlxStageState.hx => FlxMovie.hx} | 10 +++++----- src/hollywoo_flixel/FlxSetState.kiss | 5 ----- .../{FlxSetState.hx => MovieFlxState.hx} | 4 +--- .../{FlxStageState.kiss => MovieFlxState.kiss} | 5 ++--- src/hollywoo_flixel/SceneFlxState.hx | 11 +++++++++++ src/hollywoo_flixel/SceneFlxState.kiss | 12 ++++++++++++ 10 files changed, 40 insertions(+), 24 deletions(-) rename src/hollywoo_flixel/{FlxActorSprite.hx => ActorFlxSprite.hx} (73%) rename src/hollywoo_flixel/{FlxActorSprite.kiss => ActorFlxSprite.kiss} (100%) rename src/hollywoo_flixel/{FlxStageState.hx => FlxMovie.hx} (53%) delete mode 100644 src/hollywoo_flixel/FlxSetState.kiss rename src/hollywoo_flixel/{FlxSetState.hx => MovieFlxState.hx} (50%) rename src/hollywoo_flixel/{FlxStageState.kiss => MovieFlxState.kiss} (64%) create mode 100644 src/hollywoo_flixel/SceneFlxState.hx create mode 100644 src/hollywoo_flixel/SceneFlxState.kiss diff --git a/src/hollywoo_flixel/FlxActorSprite.hx b/src/hollywoo_flixel/ActorFlxSprite.hx similarity index 73% rename from src/hollywoo_flixel/FlxActorSprite.hx rename to src/hollywoo_flixel/ActorFlxSprite.hx index 880b17b..a258fec 100644 --- a/src/hollywoo_flixel/FlxActorSprite.hx +++ b/src/hollywoo_flixel/ActorFlxSprite.hx @@ -5,4 +5,4 @@ import kiss.List; import flixel.FlxSprite; @:build(kiss.Kiss.build()) -class FlxActorSprite extends FlxSprite {} +class ActorFlxSprite extends FlxSprite {} diff --git a/src/hollywoo_flixel/FlxActorSprite.kiss b/src/hollywoo_flixel/ActorFlxSprite.kiss similarity index 100% rename from src/hollywoo_flixel/FlxActorSprite.kiss rename to src/hollywoo_flixel/ActorFlxSprite.kiss diff --git a/src/hollywoo_flixel/FlxDirector.hx b/src/hollywoo_flixel/FlxDirector.hx index 5d9c9f0..a36a9a6 100644 --- a/src/hollywoo_flixel/FlxDirector.hx +++ b/src/hollywoo_flixel/FlxDirector.hx @@ -2,10 +2,11 @@ package hollywoo_flixel; import kiss.Prelude; import kiss.List; +import flixel.FlxG; +import flixel.FlxSprite; +import hollywoo.Scene; import hollywoo.Director; -import hollywoo.Stage; - -import hollywoo_flixel.FlxStageState; +import hollywoo_flixel.FlxMovie; @:build(kiss.Kiss.build()) -class FlxDirector implements Director {} +class FlxDirector implements Director {} diff --git a/src/hollywoo_flixel/FlxDirector.kiss b/src/hollywoo_flixel/FlxDirector.kiss index 071520c..cd0abf9 100644 --- a/src/hollywoo_flixel/FlxDirector.kiss +++ b/src/hollywoo_flixel/FlxDirector.kiss @@ -1,7 +1,7 @@ (defNew []) -(method :Void showSet [:FlxSetState set :Appearance appearance :Continuation cc] - (print "Shneezy")) +(method :Void showScene [:Scene scene :Appearance appearance :Continuation cc] + (FlxG.switchState (cast scene SceneFlxState))) -(method :Void showCharacter [:Character character :Appearance appearance :Continuation cc] +(method :Void showCharacter [:Character character :Appearance appearance :Continuation cc] (print "Character shneezy")) diff --git a/src/hollywoo_flixel/FlxStageState.hx b/src/hollywoo_flixel/FlxMovie.hx similarity index 53% rename from src/hollywoo_flixel/FlxStageState.hx rename to src/hollywoo_flixel/FlxMovie.hx index b925b3d..c3a6bb0 100644 --- a/src/hollywoo_flixel/FlxStageState.hx +++ b/src/hollywoo_flixel/FlxMovie.hx @@ -1,7 +1,10 @@ package hollywoo_flixel; import flixel.FlxState; -import hollywoo.Stage; +import flixel.FlxSprite; +import hollywoo.Movie; +import hollywoo_flixel.ActorFlxSprite; +import hollywoo_flixel.SceneFlxState; enum FlxStagePosition { Left; @@ -22,7 +25,4 @@ enum FlxScreenPosition { UpperCenter; } -typedef FlxStage = Stage; - -@:build(kiss.Kiss.build()) -class FlxStageState extends FlxState {} +class FlxMovie extends Movie {} diff --git a/src/hollywoo_flixel/FlxSetState.kiss b/src/hollywoo_flixel/FlxSetState.kiss deleted file mode 100644 index 0115821..0000000 --- a/src/hollywoo_flixel/FlxSetState.kiss +++ /dev/null @@ -1,5 +0,0 @@ -(method &override :Void create [] - (super.create)) - -(method &override :Void update [:Float elapsed] - (super.update elapsed)) \ No newline at end of file diff --git a/src/hollywoo_flixel/FlxSetState.hx b/src/hollywoo_flixel/MovieFlxState.hx similarity index 50% rename from src/hollywoo_flixel/FlxSetState.hx rename to src/hollywoo_flixel/MovieFlxState.hx index a9316e9..cacaaab 100644 --- a/src/hollywoo_flixel/FlxSetState.hx +++ b/src/hollywoo_flixel/MovieFlxState.hx @@ -1,8 +1,6 @@ package hollywoo_flixel; -import kiss.Prelude; -import kiss.List; import flixel.FlxState; @:build(kiss.Kiss.build()) -class FlxSetState extends FlxState {} +class MovieFlxState extends FlxState {} diff --git a/src/hollywoo_flixel/FlxStageState.kiss b/src/hollywoo_flixel/MovieFlxState.kiss similarity index 64% rename from src/hollywoo_flixel/FlxStageState.kiss rename to src/hollywoo_flixel/MovieFlxState.kiss index c8131b3..6bf108f 100644 --- a/src/hollywoo_flixel/FlxStageState.kiss +++ b/src/hollywoo_flixel/MovieFlxState.kiss @@ -1,11 +1,10 @@ (prop &mut :FlxDirector director) -(prop &mut :FlxStage stage) +(prop &mut :FlxMovie movie) (method &override :Void create [] (super.create) (set director (new FlxDirector)) - //(this.run) - ) + (set movie (new FlxMovie director))) (method &override :Void update [:Float elapsed] (super.update elapsed)) \ No newline at end of file diff --git a/src/hollywoo_flixel/SceneFlxState.hx b/src/hollywoo_flixel/SceneFlxState.hx new file mode 100644 index 0000000..628c170 --- /dev/null +++ b/src/hollywoo_flixel/SceneFlxState.hx @@ -0,0 +1,11 @@ +package hollywoo_flixel; + +import kiss.Prelude; +import kiss.List; +import flixel.FlxState; +import flixel.FlxSprite; +import hollywoo.Scene; +import hollywoo_flixel.FlxMovie; + +@:build(kiss.Kiss.build()) +class SceneFlxState extends FlxState {} diff --git a/src/hollywoo_flixel/SceneFlxState.kiss b/src/hollywoo_flixel/SceneFlxState.kiss new file mode 100644 index 0000000..fc77781 --- /dev/null +++ b/src/hollywoo_flixel/SceneFlxState.kiss @@ -0,0 +1,12 @@ +(defNew [&prop :String set &prop :SceneTime time &prop :ScenePerspective perspective] + [ + :Map> characters (new Map) + ] + (super)) + +(method &override :Void create [] + (super.create) + (add (.loadGraphic (new FlxSprite 0 0) set))) + +(method &override :Void update [:Float elapsed] + (super.update elapsed)) \ No newline at end of file