PandaObject to DirectObject

This commit is contained in:
Dave Schuyler 2005-12-20 04:26:50 +00:00
parent 9506f53809
commit c76f0eea10
47 changed files with 116 additions and 115 deletions

View File

@ -1,10 +1,10 @@
"""Actor module: contains the Actor class"""
from direct.showbase.PandaObject import *
from direct.showbase.DirectObject import *
from pandac.PandaModules import LODNode
import types
class Actor(PandaObject, NodePath):
class Actor(DirectObject, NodePath):
"""
Actor class: Contains methods for creating, manipulating
and playing animations on characters

View File

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

View File

@ -1,6 +1,6 @@
""" Class used to create and control radamec device """
from math import *
from direct.showbase.PandaObject import *
from direct.showbase.DirectObject import *
from DirectDeviceManager import *
from direct.directnotify import DirectNotifyGlobal
@ -16,7 +16,7 @@ FAST_X = 0
FAST_Y = 1
FAST_Z = 2
class DirectFastrak(PandaObject):
class DirectFastrak(DirectObject):
fastrakCount = 0
notify = DirectNotifyGlobal.directNotify.newCategory('DirectFastrak')

View File

@ -1,5 +1,5 @@
""" Class used to create and control joybox device """
from direct.showbase.PandaObject import *
from direct.showbase.DirectObject import *
from DirectDeviceManager import *
from direct.directtools.DirectUtil import *
from direct.gui import OnscreenText
@ -32,7 +32,7 @@ JOYBOX_MIN = ANALOG_MIN + ANALOG_DEADBAND
JOYBOX_MAX = ANALOG_MAX - ANALOG_DEADBAND
JOYBOX_RANGE = JOYBOX_MAX - JOYBOX_MIN
class DirectJoybox(PandaObject):
class DirectJoybox(DirectObject):
joyboxCount = 0
xyzMultiplier = 1.0
hprMultiplier = 1.0

View File

@ -1,6 +1,6 @@
""" Class used to create and control radamec device """
from math import *
from direct.showbase.PandaObject import *
from direct.showbase.DirectObject import *
from DirectDeviceManager import *
from direct.directnotify import DirectNotifyGlobal
@ -17,7 +17,7 @@ RAD_TILT = 1
RAD_ZOOM = 2
RAD_FOCUS = 3
class DirectRadamec(PandaObject):
class DirectRadamec(DirectObject):
radamecCount = 0
notify = DirectNotifyGlobal.directNotify.newCategory('DirectRadamec')

View File

@ -1,4 +1,4 @@
from direct.showbase.PandaObject import *
from direct.showbase.DirectObject import *
from DirectUtil import *
from DirectGeometry import *
from DirectGlobals import *
@ -9,7 +9,7 @@ CAM_MOVE_DURATION = 1.2
COA_MARKER_SF = 0.0075
Y_AXIS = Vec3(0,1,0)
class DirectCameraControl(PandaObject):
class DirectCameraControl(DirectObject):
def __init__(self):
# Create the grid
self.startT = 0.0

View File

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

View File

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

View File

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

View File

@ -1,10 +1,10 @@
from direct.showbase.PandaObject import *
from direct.showbase.DirectObject import *
from DirectGlobals import *
from DirectUtil import *
from DirectGeometry import *
from direct.task import Task
class DirectManipulationControl(PandaObject):
class DirectManipulationControl(DirectObject):
def __init__(self):
# Create the grid
self.objectHandles = ObjectHandles()
@ -537,7 +537,7 @@ class DirectManipulationControl(PandaObject):
messenger.send('DIRECT_manipulateObjectCleanup',
[direct.selected.getSelectedAsList()])
class ObjectHandles(NodePath,PandaObject):
class ObjectHandles(NodePath,DirectObject):
def __init__(self):
# Initialize the superclass
NodePath.__init__(self)

View File

@ -1,4 +1,4 @@
from direct.showbase.PandaObject import *
from direct.showbase.DirectObject import *
from DirectGlobals import *
from DirectUtil import *
from DirectGeometry import *
@ -46,7 +46,7 @@ class DirectNodePath(NodePath):
def getMax(self):
return self.bbox.getMax()
class SelectedNodePaths(PandaObject):
class SelectedNodePaths(DirectObject):
def __init__(self):
self.reset()
self.tagList = []

View File

@ -1,4 +1,4 @@
from direct.showbase.PandaObject import *
from direct.showbase.DirectObject import *
from DirectGlobals import *
from DirectUtil import*
from DirectCameraControl import *
@ -17,7 +17,7 @@ import types
import string
from direct.showbase import Loader
class DirectSession(PandaObject):
class DirectSession(DirectObject):
# post this to the bboard to make sure DIRECT doesn't turn on
DIRECTdisablePost = 'disableDIRECT'
@ -801,7 +801,7 @@ class DirectSession(PandaObject):
for iRay in self.iRayList:
iRay.removeUnpickable(item)
class DisplayRegionContext(PandaObject):
class DisplayRegionContext(DirectObject):
regionCount = 0
def __init__(self, cam):
self.cam = cam
@ -926,7 +926,7 @@ class DisplayRegionContext(PandaObject):
self.near,
(self.nearHeight*0.5) * self.mouseY)
class DisplayRegionList(PandaObject):
class DisplayRegionList(DirectObject):
def __init__(self):
self.displayRegionList = []
i = 0

View File

@ -1,4 +1,4 @@
from direct.showbase.PandaObject import *
from direct.showbase.DirectObject import *
from DirectGlobals import *
# Routines to adjust values

View File

@ -1,9 +1,9 @@
from direct.showbase.PandaObject import *
from direct.showbase.DirectObject import *
from direct.directtools.DirectGeometry import *
from pandac.PandaModules import NodePath
class Mopath(PandaObject):
class Mopath(DirectObject):
nameIndex = 1

View File

@ -1,8 +1,8 @@
from direct.showbase.PandaObject import PandaObject
from direct.showbase.DirectObject import DirectObject
#from direct.directnotify.DirectNotifyGlobal import directNotify
class DistributedObjectBase(PandaObject):
class DistributedObjectBase(DirectObject):
"""
The Distributed Object class is the base class for all network based
(i.e. distributed) objects. These will usually (always?) have a

View File

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

View File

@ -1,18 +1,18 @@
### Tools
from libpandaexpress import *
def Dtool_ObjectToDict(clas,name,obj):
clas.DtoolClassDict[name] = obj;
def Dtool_funcToMethod(func,clas,method_name=None):
"""Adds func to class so it is an accessible method; use method_name to specify the name to be used for calling the method.
The new method is accessible to any instance immediately."""
func.im_class=clas
func.im_func=func
func.im_self=None
if not method_name:
method_name = func.__name__
clas.DtoolClassDict[method_name] = func;
### Tools
from libpandaexpress import *
def Dtool_ObjectToDict(clas,name,obj):
clas.DtoolClassDict[name] = obj;
def Dtool_funcToMethod(func,clas,method_name=None):
"""Adds func to class so it is an accessible method; use method_name to specify the name to be used for calling the method.
The new method is accessible to any instance immediately."""
func.im_class=clas
func.im_func=func
func.im_self=None
if not method_name:
method_name = func.__name__
clas.DtoolClassDict[method_name] = func;

View File

@ -3,7 +3,7 @@ from OnscreenText import *
from OnscreenGeom import *
from OnscreenImage import *
from direct.directtools.DirectUtil import ROUND_TO
from direct.showbase import PandaObject
from direct.showbase import DirectObject
from direct.task import Task
import string
from direct.showbase import ShowBase
@ -93,7 +93,7 @@ Code Overview:
are left unused. If so, an error is raised.
"""
class DirectGuiBase(PandaObject.PandaObject):
class DirectGuiBase(DirectObject.DirectObject):
def __init__(self):
# Default id of all gui object, subclasses should override this
self.guiId = 'guiObject'

View File

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

View File

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

View File

@ -1,6 +1,6 @@
"""OnscreenText module: contains the OnscreenText class"""
from direct.showbase.PandaObject import *
from direct.showbase.DirectObject import *
import DirectGuiGlobals
import types
@ -14,7 +14,7 @@ ScreenPrompt = 3
NameConfirm = 4
BlackOnWhite = 5
class OnscreenText(PandaObject, NodePath):
class OnscreenText(DirectObject, NodePath):
def __init__(self, text = '',
style = Plain,

View File

@ -33,23 +33,23 @@ class IntervalManager(CIntervalManager):
self.ivals = []
self.removedIvals = {}
else: ## the old interface
def __init__(self, globalPtr = 0):
# Pass globalPtr == 1 to the constructor to trick it into
# "constructing" a Python wrapper around the global
# CIntervalManager object.
if globalPtr:
#CIntervalManager.__init__(self, None)
cObj = CIntervalManager.getGlobalPtr()
self.this = cObj.this
self.userManagesMemory = 0
else:
CIntervalManager.__init__(self)
# Set up a custom event queue for handling C++ events from
# intervals.
self.eventQueue = EventQueue()
self.MyEventmanager = EventManager.EventManager(self.eventQueue)
self.setEventQueue(self.eventQueue)
self.ivals = []
def __init__(self, globalPtr = 0):
# Pass globalPtr == 1 to the constructor to trick it into
# "constructing" a Python wrapper around the global
# CIntervalManager object.
if globalPtr:
#CIntervalManager.__init__(self, None)
cObj = CIntervalManager.getGlobalPtr()
self.this = cObj.this
self.userManagesMemory = 0
else:
CIntervalManager.__init__(self)
# Set up a custom event queue for handling C++ events from
# intervals.
self.eventQueue = EventQueue()
self.MyEventmanager = EventManager.EventManager(self.eventQueue)
self.setEventQueue(self.eventQueue)
self.ivals = []
self.removedIvals = {}

View File

@ -1,5 +1,5 @@
from direct.directbase.DirectStart import *
from direct.showbase.PandaObject import *
from direct.showbase.DirectObject import *
from PieMenu import *
from direct.gui.DirectGuiGlobals import *
from direct.showbase.TkGlobal import *
@ -412,7 +412,7 @@ def DNASetBaselineString(baseline, text):
baseline.add(text)
class LevelEditor(NodePath, PandaObject):
class LevelEditor(NodePath, DirectObject):
"""Class used to create a Toontown LevelEditor object"""
# Init the list of callbacks:
@ -4927,7 +4927,7 @@ class DNAWallStyle:
'Cornice Color: %s\n' % self.cornice_color
)
class OldLevelEditor(NodePath, PandaObject):
class OldLevelEditor(NodePath, DirectObject):
pass
class LevelEditorPanel(Pmw.MegaToplevel):

View File

@ -1,8 +1,8 @@
from direct.showbase.PandaObject import *
from direct.showbase.DirectObject import *
from direct.directtools.DirectGeometry import *
from direct.task import Task
class PieMenu(NodePath, PandaObject):
class PieMenu(NodePath, DirectObject):
def __init__(self, visibleMenu, menuItems,
action = None, fUpdateOnlyOnChange = 1):
NodePath.__init__(self)

View File

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

View File

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

View File

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

View File

@ -1,7 +1,7 @@
""" Mopath Recorder Panel Module """
# Import Tkinter, Pmw, and the dial code from this directory tree.
from direct.showbase.PandaObject import *
from direct.showbase.DirectObject import *
from direct.showbase.TkGlobal import *
from direct.tkwidgets.AppShell import *
from direct.directtools.DirectGlobals import *
@ -25,7 +25,7 @@ PRF_UTILITIES = [
'lambda s = self: s.playbackMarker.setZ(render, 0.0)',
'lambda s = self: s.followTerrain(10.0)']
class MopathRecorder(AppShell, PandaObject):
class MopathRecorder(AppShell, DirectObject):
# Override class variables here
appname = 'Mopath Recorder Panel'
frameWidth = 450

View File

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

View File

@ -34,7 +34,7 @@ class TaskManagerPanel(AppShell):
self.ignore('TaskManager-setVerbose')
self.taskMgrWidget.onDestroy()
class TaskManagerWidget(PandaObject):
class TaskManagerWidget(DirectObject):
"""
TaskManagerWidget class: this class contains methods for creating
a panel to control taskManager tasks.

View File

@ -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 (doughellmann@mindspring.com).
"""
from direct.showbase.PandaObject import *
from direct.showbase.DirectObject import *
from direct.showbase.TkGlobal import *
from tkFileDialog import *
import Dial
@ -38,7 +38,7 @@ def resetVariableDict():
# Inherit from MegaWidget instead of Toplevel so you can pass in a toplevel
# to use as a container if you wish. If no toplevel passed in, create one
class AppShell(Pmw.MegaWidget, PandaObject):
class AppShell(Pmw.MegaWidget, DirectObject):
appversion = '1.0'
appname = 'Generic Application Frame'
copyright = ('Copyright 2004 Walt Disney Imagineering.' +

View File

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

View File

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

View File

@ -1,4 +1,4 @@
from direct.showbase.PandaObject import *
from direct.showbase.DirectObject import *
from direct.showbase.TkGlobal import *
from Tree import *
@ -17,7 +17,7 @@ DEFAULT_MENU_ITEMS = [
'Place', 'Set Name', 'Set Color', 'Explore',
'Separator']
class SceneGraphExplorer(Pmw.MegaWidget, PandaObject):
class SceneGraphExplorer(Pmw.MegaWidget, DirectObject):
"Graphical display of a scene graph"
def __init__(self, parent = None, nodePath = render, **kw):
# Define the megawidget options.

View File

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

View File

@ -1,4 +1,4 @@
from direct.showbase.PandaObject import *
from direct.showbase.DirectObject import *
from direct.showbase.TkGlobal import *
import tkColorChooser
import WidgetPropertiesDialog

View File

@ -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.PandaObject import *
from direct.showbase.DirectObject import *
from direct.directtools.DirectUtil import *
from seGeometry import *
from direct.directtools.DirectGlobals import *
@ -21,7 +21,7 @@ CAM_MOVE_DURATION = 1.2
COA_MARKER_SF = 0.0075
Y_AXIS = Vec3(0,1,0)
class DirectCameraControl(PandaObject):
class DirectCameraControl(DirectObject):
def __init__(self):
# Create the grid
self.startT = 0.0

View File

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

View File

@ -11,11 +11,11 @@
# (If we do change original directools, it will force user has to install the latest version of OUR Panda)
#
#################################################################
from direct.showbase.PandaObject import *
from direct.showbase.DirectObject import *
from direct.directtools.DirectUtil import *
from seGeometry import *
class DirectGrid(NodePath,PandaObject):
class DirectGrid(NodePath,DirectObject):
def __init__(self):
# Initialize superclass
NodePath.__init__(self)

View File

@ -2,7 +2,7 @@
# seLights.py
# Written by Yi-Hong Lin, yihhongl@andrew.cmu.edu, 2004
#################################################################
from direct.showbase.PandaObject import *
from direct.showbase.DirectObject import *
from string import lower
from direct.directtools import DirectUtil
import string

View File

@ -12,13 +12,13 @@
#
#################################################################
from direct.showbase.PandaObject import *
from direct.showbase.DirectObject import *
from direct.directtools.DirectGlobals import *
from direct.directtools.DirectUtil import *
from seGeometry import *
from direct.task import Task
class DirectManipulationControl(PandaObject):
class DirectManipulationControl(DirectObject):
def __init__(self):
# Create the grid
self.objectHandles = ObjectHandles()
@ -506,7 +506,7 @@ class DirectManipulationControl(PandaObject):
# Let everyone know that something was moved
messenger.send('DIRECT_manipulateObjectCleanup')
class ObjectHandles(NodePath,PandaObject):
class ObjectHandles(NodePath,DirectObject):
def __init__(self):
# Initialize the superclass
NodePath.__init__(self)

View File

@ -13,7 +13,7 @@
#################################################################
# Import Tkinter, Pmw, and the dial code from this directory tree.
from direct.showbase.PandaObject import *
from direct.showbase.DirectObject import *
from direct.showbase.TkGlobal import *
from direct.tkwidgets.AppShell import *
from direct.directtools.DirectGlobals import *
@ -37,7 +37,7 @@ PRF_UTILITIES = [
'lambda s = self: s.playbackMarker.setZ(render, 0.0)',
'lambda s = self: s.followTerrain(10.0)']
class MopathRecorder(AppShell, PandaObject):
class MopathRecorder(AppShell, DirectObject):
# Override class variables here
appname = 'Mopath Recorder Panel'
frameWidth = 450

View File

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

View File

@ -8,7 +8,7 @@
# Do forget to check the seTree.
#
#################################################################
from direct.showbase.PandaObject import *
from direct.showbase.DirectObject import *
from direct.showbase.TkGlobal import *
from seTree import *
@ -37,7 +37,7 @@ DEFAULT_MENU_ITEMS = [
'Align Tool',
'Separator']
class seSceneGraphExplorer(Pmw.MegaWidget, PandaObject):
class seSceneGraphExplorer(Pmw.MegaWidget, DirectObject):
"Graphical display of a scene graph"
def __init__(self, parent = None, nodePath = render, **kw):
# Define the megawidget options.

View File

@ -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.PandaObject import *
from direct.showbase.DirectObject import *
from direct.directtools.DirectGlobals import *
from direct.directtools.DirectUtil import *
from seGeometry import *
@ -56,7 +56,7 @@ class DirectNodePath(NodePath):
def getMax(self):
return self.bbox.getMax()
class SelectedNodePaths(PandaObject):
class SelectedNodePaths(DirectObject):
def __init__(self):
self.reset()

View File

@ -8,7 +8,7 @@
# Also, the way of selecting, renaming and some hot-key controls are changed.
#
#################################################################
from direct.showbase.PandaObject import *
from direct.showbase.DirectObject import *
from direct.directtools.DirectGlobals import *
from direct.directtools.DirectUtil import*
from direct.interval.IntervalGlobal import *
@ -24,7 +24,7 @@ import types
import string
from direct.showbase import Loader
class SeSession(PandaObject): ### Customized DirectSession
class SeSession(DirectObject): ### Customized DirectSession
def __init__(self):
# Establish a global pointer to the direct object early on
@ -748,7 +748,7 @@ class SeSession(PandaObject): ### Customized DirectSession
return
class DisplayRegionContext(PandaObject):
class DisplayRegionContext(DirectObject):
regionCount = 0
def __init__(self, cam):
self.cam = cam
@ -873,7 +873,7 @@ class DisplayRegionContext(PandaObject):
self.near,
(self.nearHeight*0.5) * self.mouseY)
class DisplayRegionList(PandaObject):
class DisplayRegionList(DirectObject):
def __init__(self):
self.displayRegionList = []
i = 0

View File

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