Browse Source

changed panda modules import

Dave Schuyler 20 years ago
parent
commit
b4f8764266

+ 1 - 1
direct/src/cluster/ClusterConfig.py

@@ -1,4 +1,4 @@
-from direct.showbase.DirectObject import *
+
 from ClusterClient import *
 import string
 

+ 1 - 1
direct/src/directdevices/DirectDeviceManager.py

@@ -1,6 +1,6 @@
 """ Class used to create and control vrpn devices """
 
-from direct.showbase.DirectObject import *
+from direct.showbase.DirectObject import DirectObject
 from pandac.PandaModules import *
 
 ANALOG_MIN = -0.95

+ 1 - 1
direct/src/directtools/DirectGeometry.py

@@ -1,5 +1,5 @@
+
 from pandac.PandaModules import *
-from direct.showbase.DirectObject import *
 from DirectGlobals import *
 from DirectUtil import *
 import math

+ 4 - 2
direct/src/directtools/DirectGrid.py

@@ -1,8 +1,10 @@
-from direct.showbase.DirectObject import *
+
+from pandac.PandaModules import *
+from direct.showbase.DirectObject import DirectObject
 from DirectUtil import *
 from DirectGeometry import *
 
-class DirectGrid(NodePath,DirectObject):
+class DirectGrid(NodePath, DirectObject):
     def __init__(self):
         # Initialize superclass
         NodePath.__init__(self)

+ 2 - 1
direct/src/directtools/DirectLights.py

@@ -1,4 +1,5 @@
-from direct.showbase.DirectObject import *
+
+from pandac.PandaModules import *
 from string import lower
 
 class DirectLight(NodePath):

+ 7 - 3
direct/src/directtools/DirectUtil.py

@@ -1,4 +1,4 @@
-from direct.showbase.DirectObject import *
+
 from DirectGlobals import *
 
 # Routines to adjust values
@@ -13,7 +13,9 @@ def CLAMP(val, minVal, maxVal):
 
 # Create a tk compatible color string
 def getTkColorString(color):
-    """ Print out a Tk compatible version of a color string """
+    """
+    Print out a Tk compatible version of a color string
+    """
     def toHex(intVal):
         val = int(round(intVal))
         if val < 16:
@@ -27,7 +29,9 @@ def getTkColorString(color):
 
 ## Background Color ##
 def lerpBackgroundColor(r,g,b,duration):
-    """ Function to lerp background color to a new value """
+    """
+    Function to lerp background color to a new value
+    """
     def lerpColor(state):
         dt = globalClock.getDt()
         state.time += dt

+ 0 - 1
direct/src/distributed/DistributedObjectGlobal.py

@@ -1,6 +1,5 @@
 """DistributedObjectGlobal module: contains the DistributedObjectGlobal class"""
 
-from direct.showbase.DirectObject import *
 from direct.directnotify.DirectNotifyGlobal import directNotify
 from direct.distributed.DistributedObject import DistributedObject
 

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

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

+ 0 - 1
direct/src/interval/ProjectileInterval.py

@@ -1,6 +1,5 @@
 """ProjectileInterval module: contains the ProjectileInterval class"""
 
-from direct.showbase.DirectObject import *
 from pandac.PandaModules import *
 from Interval import Interval
 from direct.showbase.PythonUtil import lerp

+ 3 - 1
direct/src/leveleditor/LevelEditor.py

@@ -1,5 +1,7 @@
+
+from pandac.PandaModules import *
 from direct.directbase.DirectStart import *
-from direct.showbase.DirectObject import *
+from direct.showbase.DirectObject import DirectObject
 from PieMenu import *
 from direct.gui.DirectGuiGlobals import *
 from direct.showbase.TkGlobal import *

+ 4 - 2
direct/src/leveleditor/PieMenu.py

@@ -1,4 +1,6 @@
-from direct.showbase.DirectObject import *
+
+from pandac.PandaModules import *
+from direct.showbase.DirectObject import DirectObject
 from direct.directtools.DirectGeometry import *
 from direct.task import Task
 
@@ -21,7 +23,7 @@ class PieMenu(NodePath, DirectObject):
         if self.numItems == 0:
             self.degreesPerItem = 0.0
         else:
-            self.degreesPerItem = 360.0/self.numItems            
+            self.degreesPerItem = 360.0/self.numItems
         self.itemOffset = self.degreesPerItem / 2.0
         self.sfx = self.visibleMenu.getSx()
         self.sfz = self.visibleMenu.getSz()

+ 1 - 1
direct/src/showutil/Effects.py

@@ -1,5 +1,5 @@
 """ Showutil Effects module: contains code for useful showcode effects. """
-from direct.showbase.DirectObject import *
+
 from pandac.PandaModules import *
 from direct.interval.IntervalGlobal import *
 

+ 0 - 1
direct/src/tkpanels/DirectSessionPanel.py

@@ -1,7 +1,6 @@
 """ DIRECT Session Main panel """
 
 # Import Tkinter, Pmw, and the dial code
-from direct.showbase.DirectObject import *
 from direct.showbase.TkGlobal import *
 from direct.tkwidgets.AppShell import *
 

+ 0 - 1
direct/src/tkpanels/FSMInspector.py

@@ -1,5 +1,4 @@
 """ Finite State Machine Inspector module """
-from direct.showbase.DirectObject import *
 from direct.tkwidgets.AppShell import *
 from direct.showbase.TkGlobal import *
 from tkSimpleDialog import askstring

+ 2 - 1
direct/src/tkpanels/MopathRecorder.py

@@ -1,7 +1,8 @@
 """ Mopath Recorder Panel Module """
 
 # Import Tkinter, Pmw, and the dial code from this directory tree.
-from direct.showbase.DirectObject import *
+from pandac.PandaModules import *
+from direct.showbase.DirectObject import DirectObject
 from direct.showbase.TkGlobal import *
 from direct.tkwidgets.AppShell import *
 from direct.directtools.DirectGlobals import *

+ 1 - 1
direct/src/tkpanels/Placer.py

@@ -1,7 +1,7 @@
 """ DIRECT Nine DoF Manipulation Panel """
 
 # Import Tkinter, Pmw, and the dial code from this directory tree.
-from direct.showbase.DirectObject import *
+from pandac.PandaModules import *
 from direct.showbase.TkGlobal import *
 from direct.tkwidgets.AppShell import *
 from direct.tkwidgets import Dial

+ 1 - 1
direct/src/tkwidgets/AppShell.py

@@ -4,7 +4,7 @@ This is an adaption of AppShell.py found in Python and Tkinter Programming
 by John E. Grayson which is a streamlined adaptation of GuiAppD.py, originally
 created by Doug Hellmann ([email protected]).
 """
-from direct.showbase.DirectObject import *
+from direct.showbase.DirectObject import DirectObject
 from direct.showbase.TkGlobal import *
 from tkFileDialog import *
 import Dial

+ 1 - 1
direct/src/tkwidgets/EntryScale.py

@@ -1,7 +1,7 @@
 """
 EntryScale Class: Scale with a label, and a linked and validated entry
 """
-from direct.showbase.DirectObject import *
+from direct.showbase.DirectObject import DirectObject
 from direct.showbase.TkGlobal import *
 import string
 import tkColorChooser

+ 0 - 1
direct/src/tkwidgets/Floater.py

@@ -2,7 +2,6 @@
 Floater Class: Velocity style controller for floating point values with
                 a label, entry (validated), and scale
 """
-from direct.showbase.DirectObject import *
 from direct.showbase.TkGlobal import *
 from Valuator import *
 from direct.task import Task

+ 1 - 1
direct/src/tkwidgets/SceneGraphExplorer.py

@@ -1,4 +1,4 @@
-from direct.showbase.DirectObject import *
+from direct.showbase.DirectObject import DirectObject
 from direct.showbase.TkGlobal import *
 from Tree import *
 

+ 0 - 1
direct/src/tkwidgets/Tree.py

@@ -19,7 +19,6 @@ import os
 import sys
 import string
 from direct.showbase.TkGlobal import *
-from direct.showbase.DirectObject import *
 
 # Initialize icon directory
 ICONDIR = getModelPath().findFile(Filename('icons')).toOsSpecific()

+ 1 - 1
doc/SceneEditor/seCameraControl.py

@@ -11,7 +11,7 @@
 # (If we do change original directools, it will force user has to install the latest version of OUR Panda)
 #
 #################################################################
-from direct.showbase.DirectObject import *
+from direct.showbase.DirectObject import DirectObject
 from direct.directtools.DirectUtil import *
 from seGeometry import *
 from direct.directtools.DirectGlobals import *

+ 1 - 1
doc/SceneEditor/seForceGroup.py

@@ -1,5 +1,5 @@
 from pandac.PandaModules import *
-from direct.showbase.DirectObject import *
+from direct.showbase.DirectObject import DirectObject
 from direct.showbase.PhysicsManagerGlobal import *
 #Manakel 2/12/2005: replace from pandac import by from pandac.PandaModules import
 from pandac.PandaModules import ForceNode

+ 0 - 1
doc/SceneEditor/seGeometry.py

@@ -13,7 +13,6 @@
 #################################################################
 
 from pandac.PandaModules import *
-from direct.showbase.DirectObject import *
 from direct.directtools.DirectGlobals import *
 from direct.directtools.DirectUtil import *
 import math