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

remove old panda support

Browse Source
This commit is contained in:
David Rose 2008-12-24 19:22:11 +00:00
parent 8335c5778c
commit e570510887
3 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -752,10 +752,6 @@ class Actor(DirectObject, NodePath):
away. """ away. """
self.__LODAnimation = (farDistance, nearDistance, delayFactor) self.__LODAnimation = (farDistance, nearDistance, delayFactor)
# Temporary hasattr for old Panda.
if not hasattr(Character, 'setLodAnimation'):
return
for lodData in self.__partBundleDict.values(): for lodData in self.__partBundleDict.values():
for partData in lodData.values(): for partData in lodData.values():
@ -770,10 +766,6 @@ class Actor(DirectObject, NodePath):
self.__LODAnimation = None self.__LODAnimation = None
# Temporary hasattr for old Panda.
if not hasattr(Character, 'setLodAnimation'):
return
for lodData in self.__partBundleDict.values(): for lodData in self.__partBundleDict.values():
for partData in lodData.values(): for partData in lodData.values():
char = partData.partBundleNP char = partData.partBundleNP
@ -2300,9 +2292,7 @@ class Actor(DirectObject, NodePath):
to be loaded immediately. """ to be loaded immediately. """
for bundle in self.getPartBundles(partName = partName): for bundle in self.getPartBundles(partName = partName):
# Temporary hasattr for old Pandas. bundle.waitPending()
if hasattr(bundle, 'waitPending'):
bundle.waitPending()
def __bindAnimToPart(self, animName, partName, lodName, def __bindAnimToPart(self, animName, partName, lodName,
allowAsyncBind = True): allowAsyncBind = True):

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

@ -43,11 +43,7 @@ class Loader(DirectObject):
# special methods # special methods
def __init__(self, base): def __init__(self, base):
self.base = base self.base = base
# Temporary hasattr for old Pandas. self.loader = PandaLoader.getGlobalPtr()
if hasattr(PandaLoader, 'getGlobalPtr'):
self.loader = PandaLoader.getGlobalPtr()
else:
self.loader = PandaLoader()
self.hook = "async_loader_%s" % (Loader.loaderIndex) self.hook = "async_loader_%s" % (Loader.loaderIndex)
Loader.loaderIndex += 1 Loader.loaderIndex += 1
@ -182,11 +178,7 @@ class Loader(DirectObject):
cb = Loader.Callback(len(modelList), gotList, callback, extraArgs) cb = Loader.Callback(len(modelList), gotList, callback, extraArgs)
i=0 i=0
for modelPath in modelList: for modelPath in modelList:
# Temporary hasattr for old Pandas. request = self.loader.makeAsyncRequest(Filename(modelPath), loaderOptions)
if hasattr(self.loader, 'makeAsyncRequest'):
request = self.loader.makeAsyncRequest(Filename(modelPath), loaderOptions)
else:
request = ModelLoadRequest(Filename(modelPath), loaderOptions)
request.setDoneEvent(self.hook) request.setDoneEvent(self.hook)
request.setPythonObject((cb, i)) request.setPythonObject((cb, i))
i+=1 i+=1

7
direct/src/showbase/ShowBase.py
View File

@ -168,12 +168,7 @@ class ShowBase(DirectObject.DirectObject):
self.hidden = NodePath('hidden') self.hidden = NodePath('hidden')
# Temporary hasattr for old pandas. self.graphicsEngine = GraphicsEngine.getGlobalPtr()
if hasattr(GraphicsEngine, 'getGlobalPtr'):
self.graphicsEngine = GraphicsEngine.getGlobalPtr()
else:
self.graphicsEngine = GraphicsEngine()
self.setupRender() self.setupRender()
self.setupRender2d() self.setupRender2d()
self.setupDataGraph() self.setupDataGraph()