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

now reparents the fadeScreen to aspect2d rather than render2d. This prevents click-throughs on items behind the alpha mask. Need to be careful with scaling, however.

Browse Source
This commit is contained in:
Chris Brunner 2008-06-24 23:20:33 +00:00
parent 3a74e7e780
commit 080b5176d6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,7 +75,7 @@ class Transitions:
guiId = 'fade', guiId = 'fade',
relief = None, relief = None,
image = self.fadeModel, image = self.fadeModel,
image_scale = 2, image_scale = (4, 2, 2),
state = DGG.NORMAL, state = DGG.NORMAL,
) )
self.fade.setBin('unsorted', 0) self.fade.setBin('unsorted', 0)
@ -89,7 +89,7 @@ class Transitions:
""" """
#self.noTransitions() masad: this creates a one frame pop, is it necessary? #self.noTransitions() masad: this creates a one frame pop, is it necessary?
self.loadFade() self.loadFade()
transitionIval = Sequence(Func(self.fade.reparentTo, render2d, FADE_SORT_INDEX), transitionIval = Sequence(Func(self.fade.reparentTo, aspect2d, FADE_SORT_INDEX),
self.lerpFunc(self.fade, t, self.lerpFunc(self.fade, t,
self.alphaOff, self.alphaOff,
# self.alphaOn, # self.alphaOn,
@ -109,7 +109,7 @@ class Transitions:
self.noTransitions() self.noTransitions()
self.loadFade() self.loadFade()
transitionIval = Sequence(Func(self.fade.reparentTo,render2d,FADE_SORT_INDEX), transitionIval = Sequence(Func(self.fade.reparentTo,aspect2d,FADE_SORT_INDEX),
self.lerpFunc(self.fade, t, self.lerpFunc(self.fade, t,
self.alphaOn, self.alphaOn,
# self.alphaOff, # self.alphaOff,
@ -152,7 +152,7 @@ class Transitions:
# 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(aspect2d, FADE_SORT_INDEX)
self.fade.setColor(self.alphaOn) self.fade.setColor(self.alphaOn)
elif base.config.GetBool('no-loading-screen',0): elif base.config.GetBool('no-loading-screen',0):
self.transitionIval = finishIval self.transitionIval = finishIval
@ -176,7 +176,7 @@ class Transitions:
#print "transitiosn: fadeScreen" #print "transitiosn: fadeScreen"
self.noTransitions() self.noTransitions()
self.loadFade() self.loadFade()
self.fade.reparentTo(render2d, FADE_SORT_INDEX) self.fade.reparentTo(aspect2d, FADE_SORT_INDEX)
self.fade.setColor(self.alphaOn[0], self.fade.setColor(self.alphaOn[0],
self.alphaOn[1], self.alphaOn[1],
self.alphaOn[2], self.alphaOn[2],
@ -191,7 +191,7 @@ class Transitions:
#print "transitiosn: fadeScreenColor" #print "transitiosn: fadeScreenColor"
self.noTransitions() self.noTransitions()
self.loadFade() self.loadFade()
self.fade.reparentTo(render2d, FADE_SORT_INDEX) self.fade.reparentTo(aspect2d, FADE_SORT_INDEX)
self.fade.setColor(color) self.fade.setColor(color)
def noFade(self): def noFade(self):