TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

still perform passed in ival during transition even if no-loading-screen is True

Browse Source
This commit is contained in:
Josh Wilson 2008-02-04 17:38:03 +00:00
parent 6de182f3bf
commit 6bcd255ec7
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
direct/src/showbase/Transitions.py
View File

@ -148,15 +148,16 @@ class Transitions:
fadeIn or call noFade. fadeIn or call noFade.
lerp lerp
""" """
if base.config.GetBool('no-loading-screen',0):
return
if (t == 0): if (t == 0):
# Fade out immediately with no lerp # Fade out immediately with no lerp
self.noTransitions() self.noTransitions()
self.loadFade() self.loadFade()
self.fade.reparentTo(render2d, FADE_SORT_INDEX) self.fade.reparentTo(render2d, FADE_SORT_INDEX)
self.fade.setColor(self.alphaOn) self.fade.setColor(self.alphaOn)
elif base.config.GetBool('no-loading-screen',0):
self.transitionIval = finishIval
if self.transitionIval:
self.transitionIval.start()
else: else:
# Create a sequence that lerps the color out, then # Create a sequence that lerps the color out, then
# parents the fade to hidden # parents the fade to hidden