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

added optional parameters in getAnimControls

Browse Source
This commit is contained in:
Samir Naik 2004-12-29 03:25:31 +00:00
parent b1ae01f7db
commit a7288f855b
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
direct/src/interval/ActorInterval.py
View File

@ -183,7 +183,8 @@ class LerpAnimInterval(CLerpAnimEffectInterval):
def __init__(self, actor, duration, startAnim, endAnim, def __init__(self, actor, duration, startAnim, endAnim,
startWeight = 0.0, endWeight = 1.0, startWeight = 0.0, endWeight = 1.0,
blendType = 'noBlend', name = None): blendType = 'noBlend', name = None,
partName=None, lodName=None):
# Generate unique name if necessary # Generate unique name if necessary
if (name == None): if (name == None):
name = 'LerpAnimInterval-%d' % LerpAnimInterval.lerpAnimNum name = 'LerpAnimInterval-%d' % LerpAnimInterval.lerpAnimNum
@ -196,13 +197,17 @@ class LerpAnimInterval(CLerpAnimEffectInterval):
CLerpAnimEffectInterval.__init__(self, name, duration, blendType) CLerpAnimEffectInterval.__init__(self, name, duration, blendType)
if startAnim != None: if startAnim != None:
controls = actor.getAnimControls(startAnim) controls = actor.getAnimControls(
startAnim, partName = partName, lodName = lodName)
#controls = actor.getAnimControls(startAnim)
for control in controls: for control in controls:
self.addControl(control, startAnim, self.addControl(control, startAnim,
1.0 - startWeight, 1.0 - endWeight) 1.0 - startWeight, 1.0 - endWeight)
if endAnim != None: if endAnim != None:
controls = actor.getAnimControls(endAnim) controls = actor.getAnimControls(
endAnim, partName = partName, lodName = lodName)
#controls = actor.getAnimControls(endAnim)
for control in controls: for control in controls:
self.addControl(control, endAnim, self.addControl(control, endAnim,
startWeight, endWeight) startWeight, endWeight)