Browse Source

changed import of panda modules

Dave Schuyler 20 years ago
parent
commit
9e51cf2f8a

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

@@ -1,6 +1,7 @@
 """Actor module: contains the Actor class"""
 """Actor module: contains the Actor class"""
 
 
-from direct.showbase.DirectObject import *
+from pandac.PandaModules import *
+from direct.showbase.DirectObject import DirectObject
 from pandac.PandaModules import LODNode
 from pandac.PandaModules import LODNode
 import types
 import types
 import copy as copy_module
 import copy as copy_module

+ 2 - 1
direct/src/gui/OnscreenGeom.py

@@ -1,6 +1,7 @@
 """OnscreenGeom module: contains the OnscreenGeom class"""
 """OnscreenGeom module: contains the OnscreenGeom class"""
 
 
-from direct.showbase.DirectObject import *
+from pandac.PandaModules import *
+from direct.showbase.DirectObject import DirectObject
 import types
 import types
 
 
 class OnscreenGeom(DirectObject, NodePath):
 class OnscreenGeom(DirectObject, NodePath):

+ 3 - 1
direct/src/gui/OnscreenImage.py

@@ -1,7 +1,9 @@
 """OnscreenImage module: contains the OnscreenImage class"""
 """OnscreenImage module: contains the OnscreenImage class"""
 
 
-from direct.showbase.DirectObject import *
+from pandac.PandaModules import *
+from direct.showbase.DirectObject import DirectObject
 import types
 import types
+import string
 
 
 class OnscreenImage(DirectObject, NodePath):
 class OnscreenImage(DirectObject, NodePath):
     def __init__(self, image = None,
     def __init__(self, image = None,

+ 3 - 1
direct/src/gui/OnscreenText.py

@@ -1,8 +1,10 @@
 """OnscreenText module: contains the OnscreenText class"""
 """OnscreenText module: contains the OnscreenText class"""
 
 
-from direct.showbase.DirectObject import *
+from pandac.PandaModules import *
+from direct.showbase.DirectObject import DirectObject
 import DirectGuiGlobals
 import DirectGuiGlobals
 import types
 import types
+import string
 
 
 ## These are the styles of text we might commonly see.  They set the
 ## These are the styles of text we might commonly see.  They set the
 ## overall appearance of the text according to one of a number of
 ## overall appearance of the text according to one of a number of

+ 0 - 3
direct/src/showbase/DirectObject.py

@@ -1,8 +1,5 @@
 
 
 from MessengerGlobal import messenger
 from MessengerGlobal import messenger
-#from direct.directnotify.DirectNotifyGlobal import *
-from PythonUtil import *
-from pandac.PandaModules import *
 
 
 class DirectObject:
 class DirectObject:
     """
     """