TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

showbase: Add blendType argument for Fade/Iris/Letterbox

Browse Source 
This allows the 'blendType' argument to be passed through the three transitions' Lerp Intervals.
This commit is contained in:
bfrisby2000 2018-08-07 20:23:16 -04:00
parent 2556d006f7
commit 7c375ac531
No known key found for this signature in database
GPG Key ID: D9066361B03BD56E
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,7 +89,7 @@ class Transitions:
self.fade.setBin('unsorted', 0) self.fade.setBin('unsorted', 0)
self.fade.setColor(0,0,0,0) self.fade.setColor(0,0,0,0)
def getFadeInIval(self, t=0.5, finishIval=None): def getFadeInIval(self, t=0.5, finishIval=None, blendType='noBlend'):
""" """
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
@ -103,6 +103,7 @@ class Transitions:
self.lerpFunc(self.fade, t, self.lerpFunc(self.fade, t,
self.alphaOff, self.alphaOff,
# self.alphaOn, # self.alphaOn,
blendType=blendType
), ),
Func(self.fade.detachNode), Func(self.fade.detachNode),
name = self.fadeTaskName, name = self.fadeTaskName,
@ -111,7 +112,7 @@ class Transitions:
transitionIval.append(finishIval) transitionIval.append(finishIval)
return transitionIval return transitionIval
def getFadeOutIval(self, t=0.5, finishIval=None): def getFadeOutIval(self, t=0.5, finishIval=None, blendType='noBlend'):
""" """
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
@ -125,6 +126,7 @@ class Transitions:
self.lerpFunc(self.fade, t, self.lerpFunc(self.fade, t,
self.alphaOn, self.alphaOn,
# self.alphaOff, # self.alphaOff,
blendType=blendType
), ),
name = self.fadeTaskName, name = self.fadeTaskName,
) )
@ -132,7 +134,7 @@ class Transitions:
transitionIval.append(finishIval) transitionIval.append(finishIval)
return transitionIval return transitionIval
def fadeIn(self, t=0.5, finishIval=None): def fadeIn(self, t=0.5, finishIval=None, blendType='noBlend'):
""" """
Play a fade in transition over t seconds. Play a fade in transition over t seconds.
Places a polygon on the aspect2d plane then lerps the color Places a polygon on the aspect2d plane then lerps the color
@ -159,13 +161,13 @@ class Transitions:
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
self.transitionIval = self.getFadeInIval(t, finishIval) self.transitionIval = self.getFadeInIval(t, finishIval, blendType)
self.transitionIval.append(Func(self.__finishTransition)) self.transitionIval.append(Func(self.__finishTransition))
self.__transitionFuture = AsyncFuture() self.__transitionFuture = AsyncFuture()
self.transitionIval.start() self.transitionIval.start()
return self.__transitionFuture return self.__transitionFuture
def fadeOut(self, t=0.5, finishIval=None): def fadeOut(self, t=0.5, finishIval=None, blendType='noBlend'):
""" """
Play a fade out transition over t seconds. Play a fade out transition over t seconds.
Places a polygon on the aspect2d plane then lerps the color Places a polygon on the aspect2d plane then lerps the color
@ -189,7 +191,7 @@ class Transitions:
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
self.transitionIval = self.getFadeOutIval(t, finishIval) self.transitionIval = self.getFadeOutIval(t, finishIval, blendType)
self.transitionIval.append(Func(self.__finishTransition)) self.transitionIval.append(Func(self.__finishTransition))
self.__transitionFuture = AsyncFuture() self.__transitionFuture = AsyncFuture()
self.transitionIval.start() self.transitionIval.start()
@ -264,7 +266,7 @@ class Transitions:
self.iris = loader.loadModel(self.IrisModelName) self.iris = loader.loadModel(self.IrisModelName)
self.iris.setPos(0, 0, 0) self.iris.setPos(0, 0, 0)
def irisIn(self, t=0.5, finishIval=None): def irisIn(self, t=0.5, finishIval=None, blendType = 'noBlend'):
""" """
Play an iris in transition over t seconds. Play an iris in transition over t seconds.
Places a polygon on the aspect2d plane then lerps the scale Places a polygon on the aspect2d plane then lerps the scale
@ -284,7 +286,8 @@ class Transitions:
scale = 0.18 * max(base.a2dRight, base.a2dTop) scale = 0.18 * max(base.a2dRight, base.a2dTop)
self.transitionIval = Sequence(LerpScaleInterval(self.iris, t, self.transitionIval = Sequence(LerpScaleInterval(self.iris, t,
scale = scale, scale = scale,
startScale = 0.01), startScale = 0.01,
blendType=blendType),
Func(self.iris.detachNode), Func(self.iris.detachNode),
Func(self.__finishTransition), Func(self.__finishTransition),
name = self.irisTaskName, name = self.irisTaskName,
@ -295,7 +298,7 @@ class Transitions:
self.transitionIval.start() self.transitionIval.start()
return self.__transitionFuture return self.__transitionFuture
def irisOut(self, t=0.5, finishIval=None): def irisOut(self, t=0.5, finishIval=None, blendType='noBlend'):
""" """
Play an iris out transition over t seconds. Play an iris out transition over t seconds.
Places a polygon on the aspect2d plane then lerps the scale Places a polygon on the aspect2d plane then lerps the scale
@ -318,7 +321,8 @@ class Transitions:
scale = 0.18 * max(base.a2dRight, base.a2dTop) 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 = scale), startScale = scale,
blendType=blendType),
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),
@ -441,7 +445,7 @@ class Transitions:
self.__letterboxFuture.setResult(None) self.__letterboxFuture.setResult(None)
self.__letterboxFuture = None self.__letterboxFuture = None
def letterboxOn(self, t=0.25, finishIval=None): def letterboxOn(self, t=0.25, finishIval=None, blendType='noBlend'):
""" """
Move black bars in over t seconds. Move black bars in over t seconds.
""" """
@ -461,11 +465,13 @@ class Transitions:
t, t,
pos = Vec3(0, 0, -1), pos = Vec3(0, 0, -1),
#startPos = Vec3(0, 0, -1.2), #startPos = Vec3(0, 0, -1.2),
blendType=blendType
), ),
LerpPosInterval(self.letterboxTop, LerpPosInterval(self.letterboxTop,
t, t,
pos = Vec3(0, 0, 0.8), pos = Vec3(0, 0, 0.8),
# startPos = Vec3(0, 0, 1), # startPos = Vec3(0, 0, 1),
blendType=blendType
), ),
), ),
Func(self.__finishLetterbox), Func(self.__finishLetterbox),
@ -476,7 +482,7 @@ class Transitions:
self.letterboxIval.start() self.letterboxIval.start()
return self.__letterboxFuture return self.__letterboxFuture
def letterboxOff(self, t=0.25, finishIval=None): def letterboxOff(self, t=0.25, finishIval=None, blendType='noBlend'):
""" """
Move black bars away over t seconds. Move black bars away over t seconds.
""" """
@ -495,11 +501,13 @@ class Transitions:
t, t,
pos = Vec3(0, 0, -1.2), pos = Vec3(0, 0, -1.2),
# startPos = Vec3(0, 0, -1), # startPos = Vec3(0, 0, -1),
blendType=blendType
), ),
LerpPosInterval(self.letterboxTop, LerpPosInterval(self.letterboxTop,
t, t,
pos = Vec3(0, 0, 1), pos = Vec3(0, 0, 1),
# startPos = Vec3(0, 0, 0.8), # startPos = Vec3(0, 0, 0.8),
blendType=blendType
), ),
), ),
Func(self.letterbox.stash), Func(self.letterbox.stash),