浏览代码

remove some old panda support

David Rose 17 年之前
父节点
当前提交
7fdd1813ac
共有 3 个文件被更改,包括 2 次插入12 次删除
  1. 0 4
      direct/src/actor/Actor.py
  2. 1 5
      direct/src/gui/DirectEntry.py
  3. 1 3
      direct/src/showbase/Loader.py

+ 0 - 4
direct/src/actor/Actor.py

@@ -1120,10 +1120,6 @@ class Actor(DirectObject, NodePath):
         optimal than controlJoint() for cases in which the transform
         optimal than controlJoint() for cases in which the transform
         is not intended to be animated during the lifetime of the
         is not intended to be animated during the lifetime of the
         Actor. """
         Actor. """
-        # Temporary condition for old Pandas.
-        if not hasattr(PartBundle, 'controlJoint'):
-            return
-        
         if transform == None:
         if transform == None:
             transform = TransformState.makePosHprScale(pos, hpr, scale)
             transform = TransformState.makePosHprScale(pos, hpr, scale)
 
 

+ 1 - 5
direct/src/gui/DirectEntry.py

@@ -144,11 +144,7 @@ class DirectEntry(DirectFrame):
         DirectFrame.destroy(self)
         DirectFrame.destroy(self)
 
 
     def setup(self):
     def setup(self):
-        # Temporary condition for old pandas.
-        if hasattr(self.guiItem, 'setupMinimal'):
-            self.guiItem.setupMinimal(self['width'], self['numLines'])
-        else:
-            self.guiItem.setup(self['width'], self['numLines'])
+        self.guiItem.setupMinimal(self['width'], self['numLines'])
 
 
     def setFocus(self):
     def setFocus(self):
         PGEntry.setFocus(self.guiItem, self['focus'])
         PGEntry.setFocus(self.guiItem, self['focus'])

+ 1 - 3
direct/src/showbase/Loader.py

@@ -51,9 +51,7 @@ class Loader(DirectObject):
 
 
     def destroy(self):
     def destroy(self):
         self.ignore(self.hook)
         self.ignore(self.hook)
-        # Temp condition for old Panda.
-        if hasattr(self.loader, "stopThreads"):
-            self.loader.stopThreads()
+        self.loader.stopThreads()
         del self.base
         del self.base
         del self.loader
         del self.loader