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

support passing in a NodePath instead of a filename to loadAnims()

Browse Source
This commit is contained in:
David Rose 2008-11-05 23:39:09 +00:00
parent d5ca1571ba
commit d8e3efb1b9
1 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
direct/src/actor/Actor.py
View File

@ -55,12 +55,13 @@ class Actor(DirectObject, NodePath):
There is a different AnimDef for each different part or There is a different AnimDef for each different part or
sub-part, times each different animation in the AnimDict. """ sub-part, times each different animation in the AnimDict. """
def __init__(self, filename): def __init__(self, filename = None, animBundle = None):
self.filename = filename self.filename = filename
self.animBundle = None
self.animControl = None self.animControl = None
def makeCopy(self): def makeCopy(self):
return Actor.AnimDef(self.filename) return Actor.AnimDef(self.filename, self.animBundle)
def __repr__(self): def __repr__(self):
return 'Actor.AnimDef(%s)' % (repr(self.filename)) return 'Actor.AnimDef(%s)' % (repr(self.filename))
@ -1793,10 +1794,7 @@ class Actor(DirectObject, NodePath):
animControl = acc.getAnim(i) animControl = acc.getAnim(i)
animName = acc.getAnimName(i) animName = acc.getAnimName(i)
# Now we've already bound the animation, but we animDef = Actor.AnimDef()
# have no associated filename. So store the
# animControl, but put None in for the filename.
animDef = Actor.AnimDef(None)
animDef.animControl = animControl animDef.animControl = animControl
self.__animControlDict[lodName][partName][animName] = animDef self.__animControlDict[lodName][partName][animName] = animDef
@ -1942,12 +1940,25 @@ class Actor(DirectObject, NodePath):
for animName, filename in anims.items(): for animName, filename in anims.items():
# make sure this lod is in anim control dict # make sure this lod is in anim control dict
for lName in lodNames: for lName in lodNames:
# store the file path only; we will bind it (and produce if firstLoad:
# an AnimControl) when it is played self.__animControlDict[lName][partName][animName] = Actor.AnimDef()
if not firstLoad:
self.__animControlDict[lName][partName][animName].filename = filename if isinstance(filename, NodePath):
# We were given a pre-load anim bundle, not a filename.
assert not filename.isEmpty()
if filename.node().isOfType(AnimBundleNode.getClassType()):
animBundleNP = filename
else: else:
self.__animControlDict[lName][partName][animName] = Actor.AnimDef(filename) animBundleNP = filename.find('**/+AnimBundleNode')
assert not animBundleNP.isEmpty()
self.__animControlDict[lName][partName][animName].animBundle = animBundleNP.node().getBundle()
else:
# We were given a filename that must be loaded.
# Store the filename only; we will load and bind
# it (and produce an AnimControl) when it is
# played.
self.__animControlDict[lName][partName][animName].filename = filename
def initAnimsOnAllLODs(self,partNames): def initAnimsOnAllLODs(self,partNames):
if self.mergeLODBundles: if self.mergeLODBundles:
@ -2143,6 +2154,11 @@ class Actor(DirectObject, NodePath):
else: else:
bundle = self.__partBundleDict[lodName][subpartDef.truePartName].getBundle() bundle = self.__partBundleDict[lodName][subpartDef.truePartName].getBundle()
if anim.animBundle:
# We already have a bundle; just bind it.
animControl = bundle.bindAnim(anim.animBundle, -1, subpartDef.subset)
else:
# Load and bind the anim. This might be an asynchronous # Load and bind the anim. This might be an asynchronous
# operation that will complete in the background, but if so it # operation that will complete in the background, but if so it
# will still return a usable AnimControl. # will still return a usable AnimControl.