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

showbase: fix iris/fade transitions for extreme aspect ratios

Browse Source 
Fixes #311
This commit is contained in:
rdb 2018-05-05 22:01:10 +02:00
parent b45726001e
commit 11e21af52c
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,7 +94,9 @@ 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, aspect2d, DGG.FADE_SORT_INDEX),
parent = aspect2d if self.fadeModel else render2d
transitionIval = Sequence(Func(self.fade.reparentTo, parent, DGG.FADE_SORT_INDEX),
Func(self.fade.showThrough), # in case aspect2d is hidden for some reason Func(self.fade.showThrough), # in case aspect2d is hidden for some reason
self.lerpFunc(self.fade, t, self.lerpFunc(self.fade, t,
self.alphaOff, self.alphaOff,
@ -115,7 +117,8 @@ class Transitions:
self.noTransitions() self.noTransitions()
self.loadFade() self.loadFade()
transitionIval = Sequence(Func(self.fade.reparentTo,aspect2d,DGG.FADE_SORT_INDEX), parent = aspect2d if self.fadeModel else render2d
transitionIval = Sequence(Func(self.fade.reparentTo, parent, DGG.FADE_SORT_INDEX),
Func(self.fade.showThrough), # in case aspect2d is hidden for some reason Func(self.fade.showThrough), # in case aspect2d is hidden for some reason
self.lerpFunc(self.fade, t, self.lerpFunc(self.fade, t,
self.alphaOn, self.alphaOn,
@ -167,7 +170,9 @@ 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(aspect2d, DGG.FADE_SORT_INDEX)
parent = aspect2d if self.fadeModel else render2d
self.fade.reparentTo(parent, DGG.FADE_SORT_INDEX)
self.fade.setColor(self.alphaOn) self.fade.setColor(self.alphaOn)
elif ConfigVariableBool('no-loading-screen', False): elif ConfigVariableBool('no-loading-screen', False):
if finishIval: if finishIval:
@ -191,7 +196,9 @@ class Transitions:
#print "transitiosn: fadeScreen" #print "transitiosn: fadeScreen"
self.noTransitions() self.noTransitions()
self.loadFade() self.loadFade()
self.fade.reparentTo(aspect2d, DGG.FADE_SORT_INDEX)
parent = aspect2d if self.fadeModel else render2d
self.fade.reparentTo(parent, DGG.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],
@ -206,7 +213,9 @@ class Transitions:
#print "transitiosn: fadeScreenColor" #print "transitiosn: fadeScreenColor"
self.noTransitions() self.noTransitions()
self.loadFade() self.loadFade()
self.fade.reparentTo(aspect2d, DGG.FADE_SORT_INDEX)
parent = aspect2d if self.fadeModel else render2d
self.fade.reparentTo(parent, DGG.FADE_SORT_INDEX)
self.fade.setColor(color) self.fade.setColor(color)
def noFade(self): def noFade(self):
@ -250,8 +259,9 @@ class Transitions:
else: else:
self.iris.reparentTo(aspect2d, DGG.FADE_SORT_INDEX) self.iris.reparentTo(aspect2d, DGG.FADE_SORT_INDEX)
scale = 0.18 * max(base.a2dRight, base.a2dTop)
self.transitionIval = Sequence(LerpScaleInterval(self.iris, t, self.transitionIval = Sequence(LerpScaleInterval(self.iris, t,
scale = 0.18, scale = scale,
startScale = 0.01), startScale = 0.01),
Func(self.iris.detachNode), Func(self.iris.detachNode),
name = self.irisTaskName, name = self.irisTaskName,
@ -277,9 +287,10 @@ class Transitions:
else: else:
self.iris.reparentTo(aspect2d, DGG.FADE_SORT_INDEX) self.iris.reparentTo(aspect2d, DGG.FADE_SORT_INDEX)
scale = 0.18 * max(base.a2dRight, base.a2dTop)
self.transitionIval = Sequence(LerpScaleInterval(self.iris, t, self.transitionIval = Sequence(LerpScaleInterval(self.iris, t,
scale = 0.01, scale = 0.01,
startScale = 0.18), startScale = scale),
Func(self.iris.detachNode), Func(self.iris.detachNode),
# Use the fade to cover up the hole that the iris would leave # Use the fade to cover up the hole that the iris would leave
Func(self.fadeOut, 0), Func(self.fadeOut, 0),