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

swap characters in front/behind positions on speech

Browse Source
This commit is contained in:
Nat Quayle Nelson
2022-01-06 14:21:55 -07:00
parent bdfd244d8f
commit 59cdcea039
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/hollywoo/Director.hx
View File

@@ -15,7 +15,8 @@ interface Director<Set, StagePosition, StageFacing, ScreenPosition, Actor, Sound
function showScene(scene:Scene<Set, StagePosition, StageFacing, ScreenPosition, Actor, Prop>, appearance:Appearance, cc:Continuation):Void; function showScene(scene:Scene<Set, StagePosition, StageFacing, ScreenPosition, Actor, Prop>, appearance:Appearance, cc:Continuation):Void;
function showCharacter(character:Character<StagePosition, StageFacing, Actor>, appearance:Appearance, cc:Continuation):Void; function showCharacter(character:Character<StagePosition, StageFacing, Actor>, appearance:Appearance, cc:Continuation):Void;
function hideCharacter(character:Character<StagePosition, StageFacing, Actor>, cc:Continuation):Void; function hideCharacter(character:Character<StagePosition, StageFacing, Actor>, cc:Continuation):Void;
function moveCharacter(character:Character<StagePosition, StageFacing, Actor>, fromPos:StagePosition, fromFacing:StageFacing, toPos:StagePosition, toFacing:StageFacing, cc:Continuation):Void; function moveCharacter(character:Character<StagePosition, StageFacing, Actor>, toPos:StagePosition, toFacing:StageFacing, cc:Continuation):Void;
function swapCharacters(a:Character<StagePosition, StageFacing, Actor>, b:Character<StagePosition, StageFacing, Actor>, cc:Continuation):Void;
function playSound(sound:Sound, volumeMod:Float, waitForEnd:Bool, cc:Continuation):Void; function playSound(sound:Sound, volumeMod:Float, waitForEnd:Bool, cc:Continuation):Void;
function playSong(song:Song, volumeMod:Float, loop:Bool, waitForEnd:Bool, cc:Continuation):Void; function playSong(song:Song, volumeMod:Float, loop:Bool, waitForEnd:Bool, cc:Continuation):Void;
function stopSong():Void; function stopSong():Void;

24
src/hollywoo/Movie.kiss
View File

@@ -231,12 +231,24 @@
(director.hideCharacter c cc))) (director.hideCharacter c cc)))
(hollywooMethod moveCharacter false [actorName :StagePosition newPosition :StageFacing newFacing :Continuation cc] (hollywooMethod moveCharacter false [actorName :StagePosition newPosition :StageFacing newFacing :Continuation cc]
(let [c (dictGet .characters (_currentScene) actorName) (let [c (dictGet .characters (_currentScene) actorName)]
oldPosition c.stagePosition (director.moveCharacter c newPosition newFacing ->:Void {
oldFacing c.stageFacing] (set c.stagePosition newPosition)
(set c.stagePosition newPosition) (set c.stageFacing newFacing)
(set c.stageFacing newFacing) (cc)
(director.moveCharacter c oldPosition oldFacing newPosition newFacing cc))) })))
(hollywooMethod swapCharacters false [actorNameA actorNameB :Continuation cc]
(let [a (dictGet .characters (_currentScene) actorNameA)
b (dictGet .characters (_currentScene) actorNameB)]
(director.swapCharacters a b ->:Void
(let [tempStagePos a.stagePosition
tempStageFacing a.stageFacing]
(set a.stagePosition b.stagePosition)
(set a.stageFacing b.stageFacing)
(set b.stagePosition tempStagePos)
(set b.stageFacing tempStageFacing)
(cc)))))
// TODO moveCharacter remove them, add them to another scene // TODO moveCharacter remove them, add them to another scene
// TODO moveCharacterAndFollow remove them, add them to another scene, set that the scene // TODO moveCharacterAndFollow remove them, add them to another scene, set that the scene