Fix bad Hollywoo naming conventions

This commit is contained in:
2021-10-25 16:39:18 -04:00
parent 1aae5f7f99
commit f1ffa346bb
5 changed files with 21 additions and 20 deletions

View File

@@ -1,6 +1,6 @@
package hollywoo;
import hollywoo.Stage;
import hollywoo.Scene;
enum Appearance {
FirstAppearance;
@@ -10,6 +10,6 @@ enum Appearance {
typedef Continuation = Void -> Void;
interface Director<Set, StagePosition, StageFacing, ScreenPosition, Actor> {
function showSet(set:Set, appearance:Appearance, cc:Continuation):Void;
function showScene(scene:Scene<Set, StagePosition, StageFacing, ScreenPosition, Actor>, appearance:Appearance, cc:Continuation):Void;
function showCharacter(character:Character<StagePosition, StageFacing, Actor>, appearance:Appearance, cc:Continuation):Void;
}

13
src/hollywoo/Movie.hx Normal file
View File

@@ -0,0 +1,13 @@
package hollywoo;
import kiss.AsyncEmbeddedScript;
/**
* Model of a Hollywoo film
*/
@:build(kiss.Kiss.build())
class Movie<Set, StagePosition, StageFacing, ScreenPosition, Actor> extends AsyncEmbeddedScript {
// TODO for some reason this wasn't working when declared in Movie.kiss:
// Mutable representation of frames in time:
var scenes:Map<String, Scene<Set, StagePosition, StageFacing, ScreenPosition, Actor>> = [];
}

6
src/hollywoo/Movie.kiss Normal file
View File

@@ -0,0 +1,6 @@
// Mostly immutable, reusable resources:
(prop :Map<String,Set> sets (new Map))
(prop :Map<String,Actor> actors (new Map))
// "View" in the Model-View-Controller architecture:
(defNew [&prop :Director<Set,StagePosition,StageFacing,ScreenPosition,Actor> director] (super))

View File

@@ -1,7 +1,5 @@
package hollywoo;
import kiss.EmbeddedScript;
enum SceneTime {
Morning;
Day;
@@ -27,17 +25,3 @@ typedef Scene<Set, StagePosition, StageFacing, ScreenPosition, Actor> = {
time:SceneTime,
perspective:ScenePerspective
};
/**
* Model of a Hollywoo film
*/
@:build(kiss.Kiss.build())
class Stage<Set, StagePosition, StageFacing, ScreenPosition, Actor> extends kiss.AsyncEmbeddedScript {
// Mostly immutable, reusable resources:
var sets:Map<String, Set> = [];
var actors:Map<String, Actor> = [];
// Mutable representation of frames in time:
var scenes:Map<String, Scene<Set, StagePosition, StageFacing, ScreenPosition, Actor>> = [];
}

View File

@@ -1,2 +0,0 @@
// "View" in the Model-View-Controller architecture:
(defNew [&prop :Director<Set,StagePosition,StageFacing,ScreenPosition,Actor> director] (super))