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

take noTransition out of fade ivals, that is just wrong

Browse Source
This commit is contained in:
Samir Naik 2007-04-09 18:36:52 +00:00
parent 50cc26d546
commit 9dad81603f
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,9 +86,9 @@ class Transitions:
Returns an interval without starting it. This is particularly useful in Returns an interval without starting it. This is particularly useful in
cutscenes, so when the cutsceneIval is escaped out of we can finish the fade immediately cutscenes, so when the cutsceneIval is escaped out of we can finish the fade immediately
""" """
transitionIval = Sequence(Func(self.noTransitions), self.noTransitions()
Func(self.loadFade), self.loadFade()
Func(self.fade.reparentTo, render2d, FADE_SORT_INDEX), transitionIval = Sequence(Func(self.fade.reparentTo, render2d, FADE_SORT_INDEX),
self.lerpFunc(self.fade, t, self.lerpFunc(self.fade, t,
self.alphaOff, self.alphaOff,
self.alphaOn), self.alphaOn),
@ -104,9 +104,12 @@ class Transitions:
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
""" """
transitionIval = Sequence(Func(self.noTransitions), self.noTransitions()
Func(self.loadFade), self.loadFade()
Func(self.fade.reparentTo,render2d,FADE_SORT_INDEX),
print "t = %s" % t
transitionIval = Sequence(Func(self.fade.reparentTo,render2d,FADE_SORT_INDEX),
self.lerpFunc(self.fade, t, self.lerpFunc(self.fade, t,
self.alphaOn, self.alphaOn,
self.alphaOff), self.alphaOff),