pass skipping to _showScene() and showSet()

This commit is contained in:
2024-10-14 12:40:48 -05:00
parent 273f1acfa2
commit 9b271ce1ce
2 changed files with 4 additions and 2 deletions

View File

@@ -53,7 +53,7 @@ interface Director<Set, Actor, Sound, Song, Prop, VoiceTrack, Camera, LightSourc
function loadSet(path:String):Set; function loadSet(path:String):Set;
function cloneSet(set:Set):Set; function cloneSet(set:Set):Set;
function showSet(set:Set, time:SceneTime, perspective:ScenePerspective, appearance:Appearance, camera:Camera, cc:Continuation):Void; function showSet(set:Set, time:SceneTime, perspective:ScenePerspective, appearance:Appearance, camera:Camera, skipping:Bool, cc:Continuation):Void;
function hideSet(set:Set, camera: Camera, cc:Continuation):Void; function hideSet(set:Set, camera: Camera, cc:Continuation):Void;
function showLighting(sceneTime:SceneTime, lightSources:Array<LightSource>, camera:Camera):Void; function showLighting(sceneTime:SceneTime, lightSources:Array<LightSource>, camera:Camera):Void;

View File

@@ -445,13 +445,14 @@
])] ])]
(director.showLighting scene.time allLightSources scene.camera))) (director.showLighting scene.time allLightSources scene.camera)))
(method _showScene [:Scene<Set,Actor,Prop,Camera> scene :Appearance appearance :Camera camera :Continuation cc] (method _showScene [:Scene<Set,Actor,Prop,Camera> scene :Appearance appearance :Camera camera :Bool skipping :Continuation cc]
(let [cc (let [cc
(makeCC cc (makeCC cc
(_updateLighting) (_updateLighting)
(cc))] (cc))]
// Show current scene background // Show current scene background
(director.showSet scene.set scene.time scene.perspective appearance camera (director.showSet scene.set scene.time scene.perspective appearance camera
skipping
(makeCC cc (makeCC cc
// Show current scene characters // Show current scene characters
(_ccForEach (_ccForEach
@@ -1267,6 +1268,7 @@
(dictGet scenes name) (dictGet scenes name)
(appearanceFlag shownScenes name) (appearanceFlag shownScenes name)
.camera (dictGet scenes name) .camera (dictGet scenes name)
skipping
cc))))))) cc)))))))
// Switch scenes but bring all the characters and props from the current one // Switch scenes but bring all the characters and props from the current one