call _updateLighting
This commit is contained in:
@@ -442,23 +442,25 @@
|
|||||||
(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 :Continuation cc]
|
||||||
|
(let [cc
|
||||||
// Show current scene background
|
|
||||||
(director.showSet scene.set scene.time scene.perspective appearance camera
|
|
||||||
(makeCC cc
|
(makeCC cc
|
||||||
// Show current scene characters
|
(_updateLighting)
|
||||||
(_ccForEach
|
(cc))]
|
||||||
(object iterator ->(scene.characters.keys))
|
// Show current scene background
|
||||||
->[:String key :Continuation cc]
|
(director.showSet scene.set scene.time scene.perspective appearance camera
|
||||||
(director.showCharacter (dictGet scene.characters key) (appearanceFlag shownCharacters key) camera cc)
|
(makeCC cc
|
||||||
(makeCC cc
|
// Show current scene characters
|
||||||
// show current scene props, etc.
|
(_ccForEach
|
||||||
(_ccForEach
|
(object iterator ->(scene.characters.keys))
|
||||||
scene.propOrder
|
->[:String key :Continuation cc]
|
||||||
->[:String propKey :Continuation cc]
|
(director.showCharacter (dictGet scene.characters key) (appearanceFlag shownCharacters key) camera cc)
|
||||||
(let [p (dictGet scene.props propKey)]
|
(makeCC cc
|
||||||
(director.showProp p.prop p.position ReAppearance .camera (_currentScene) cc))
|
// show current scene props, etc.
|
||||||
cc))))))
|
(_ccForEach
|
||||||
|
->[:String propKey :Continuation cc]
|
||||||
|
(let [p (dictGet scene.props propKey)]
|
||||||
|
(director.showProp p.prop p.position ReAppearance .camera (_currentScene) cc))
|
||||||
|
cc)))))))
|
||||||
|
|
||||||
(prop &mut :Bool paused false)
|
(prop &mut :Bool paused false)
|
||||||
(prop &mut :Continuation onComplete null)
|
(prop &mut :Continuation onComplete null)
|
||||||
@@ -852,8 +854,7 @@
|
|||||||
(let [arr (lightSources.get sceneKey)]
|
(let [arr (lightSources.get sceneKey)]
|
||||||
(arr.elements.push source)
|
(arr.elements.push source)
|
||||||
(lightSources.put sceneKey arr)
|
(lightSources.put sceneKey arr)
|
||||||
(director.hideLighting)
|
(_updateLighting)
|
||||||
(director.showLighting .time (_currentScene) arr.elements .camera (_currentScene))
|
|
||||||
(cc))
|
(cc))
|
||||||
}))
|
}))
|
||||||
(shortcutHandler.registerItem "[d]efine [l]ight source" defineLightSource)
|
(shortcutHandler.registerItem "[d]efine [l]ight source" defineLightSource)
|
||||||
@@ -870,8 +871,7 @@
|
|||||||
(let [ls (dictGet stringMap choice)]
|
(let [ls (dictGet stringMap choice)]
|
||||||
(arr.elements.remove ls)
|
(arr.elements.remove ls)
|
||||||
(lightSources.put sceneKey arr)
|
(lightSources.put sceneKey arr)
|
||||||
(director.hideLighting)
|
(_updateLighting)
|
||||||
(director.showLighting .time (_currentScene) arr.elements .camera (_currentScene))
|
|
||||||
(cc))))))
|
(cc))))))
|
||||||
(shortcutHandler.registerItem "[r]emove [l]ight source" removeLightSource)
|
(shortcutHandler.registerItem "[r]emove [l]ight source" removeLightSource)
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user