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

Make delayLengths a JsonMap

Browse Source
This commit is contained in:
Nat Quayle Nelson
2023-04-03 05:02:11 -06:00
parent 10816aa51e
commit 168c5b9599
4 changed files with 42 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
projects/hollywoo-flixel/src/hollywoo_flixel/FlxMovie.hx
View File

@@ -17,13 +17,13 @@ import openfl.Assets;
class FlxMovie extends Movie<FlxSprite, ActorFlxSprite, FlxSound, String, FlxSprite, FlxSound, FlxCamera, FlxLightSource> { class FlxMovie extends Movie<FlxSprite, ActorFlxSprite, FlxSound, String, FlxSprite, FlxSound, FlxCamera, FlxLightSource> {
// Think of HollywooFlixelDSL.kiss as the corresponding Kiss file for this class! // Think of HollywooFlixelDSL.kiss as the corresponding Kiss file for this class!
public function new(director:FlxDirector, lightSourceJsonFile:String, positionsJson:String, ?voiceLinesAssetPath:String) { public function new(director:FlxDirector, lightSourceJsonFile:String, positionsJson:String, delayLengthsJson:String, ?voiceLinesAssetPath:String) {
var voiceLinesJson = null; var voiceLinesJson = null;
if (voiceLinesAssetPath != null) { if (voiceLinesAssetPath != null) {
voiceLinesJson = Assets.getText(voiceLinesAssetPath); voiceLinesJson = Assets.getText(voiceLinesAssetPath);
} }
super(director, lightSourceJsonFile, new FlxLightSource([], FlxColor.TRANSPARENT), positionsJson, voiceLinesJson); super(director, lightSourceJsonFile, new FlxLightSource([], FlxColor.TRANSPARENT), positionsJson, delayLengthsJson, voiceLinesJson);
} }
public var uiCamera:FlxCamera; public var uiCamera:FlxCamera;
public var screenCamera:FlxCamera; public var screenCamera:FlxCamera;

7
projects/hollywoo/src/hollywoo/DelayLength.hx Normal file
View File

@@ -0,0 +1,7 @@
package hollywoo;
import kiss.Prelude;
import kiss.List;
@:build(kiss.Kiss.build())
class DelayLength {}

4
projects/hollywoo/src/hollywoo/DelayLength.kiss Normal file
View File

@@ -0,0 +1,4 @@
(defNew [&prop :Float length])
(method stringify [] "$length")
(method parse [:String data] (new DelayLength (Std.parseFloat data)))

11
projects/hollywoo/src/hollywoo/Movie.kiss
View File

@@ -155,6 +155,7 @@
:String lightSourceJsonFile :String lightSourceJsonFile
:LightSource defaultLightSource :LightSource defaultLightSource
:String stagePositionsJson :String stagePositionsJson
:String delayLengthsJson
&opt :String voiceLinesJson &opt :String voiceLinesJson
] ]
[ [
@@ -162,6 +163,8 @@
(new JsonMap stagePositionsJson (new StagePosition 0 0 0)) (new JsonMap stagePositionsJson (new StagePosition 0 0 0))
:JsonMap<JsonableArray<LightSource>> lightSources :JsonMap<JsonableArray<LightSource>> lightSources
(new JsonMap lightSourceJsonFile (new JsonableArray [] defaultLightSource)) (new JsonMap lightSourceJsonFile (new JsonableArray [] defaultLightSource))
:JsonMap<DelayLength> delayLengths
(new JsonMap delayLengthsJson (new DelayLength 0.5))
] ]
(set director.movie this) (set director.movie this)
@@ -203,7 +206,11 @@
(#unless subclass (method ,nameAndType ,argList ,@body)) (#unless subclass (method ,nameAndType ,argList ,@body))
})) }))
(hollywooMethod :Void delay true [sec :Continuation cc] (hollywooMethod :Void delay true [:Dynamic length :Continuation cc]
(let [sec (typeCase [length]
([:Float sec] sec)
([:String key] .length (delayLengths.get key))
(never otherwise))]
(case delayHandling (case delayHandling
(Auto (Auto
(Timer.delay cc (* 1000 sec))) (Timer.delay cc (* 1000 sec)))
@@ -227,7 +234,7 @@
(director.stopWaitForInput cc) (director.stopWaitForInput cc)
(cc) (cc)
})) }))
(otherwise (throw "Unsupported delay type $delayHandling")))) (otherwise (throw "Unsupported delay type $delayHandling")))))
(hollywooMethod newSet true [name :Set set] (hollywooMethod newSet true [name :Set set]
(assert isLoading) (assert isLoading)