Jelajahi Sumber

remove old panda support

David Rose 17 tahun lalu
induk
melakukan
e570510887
3 mengubah file dengan 4 tambahan dan 27 penghapusan
  1. 1 11
      direct/src/actor/Actor.py
  2. 2 10
      direct/src/showbase/Loader.py
  3. 1 6
      direct/src/showbase/ShowBase.py

+ 1 - 11
direct/src/actor/Actor.py

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

+ 2 - 10
direct/src/showbase/Loader.py

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

+ 1 - 6
direct/src/showbase/ShowBase.py

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