TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 18:31:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
Mark Mine 2002-02-09 02:26:33 +00:00
parent 4ecb0b5d0b
commit 65d0c69b14
6 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
direct/src/actor/Actor.py
View File

@ -908,9 +908,6 @@ class Actor(PandaObject, NodePath):
# actions # actions
def animPanel(self): def animPanel(self):
base.wantDIRECT = 1
base.wantTk = 1
from ShowBaseGlobal import *
import TkGlobal import TkGlobal
import AnimPanel import AnimPanel
return AnimPanel.AnimPanel(self) return AnimPanel.AnimPanel(self)

2
direct/src/directdevices/DirectDeviceManager.py
View File

@ -6,7 +6,7 @@ from PandaModules import *
ANALOG_MIN = -0.95 ANALOG_MIN = -0.95
ANALOG_MAX = 0.95 ANALOG_MAX = 0.95
ANALOG_RANGE = ANALOG_MAX - ANALOG_MIN ANALOG_RANGE = ANALOG_MAX - ANALOG_MIN
ANALOG_DEADBAND = 0.075 ANALOG_DEADBAND = 0.125
try: try:
myBase = base myBase = base

2
direct/src/directtools/DirectSession.py
View File

@ -165,7 +165,7 @@ class DirectSession(PandaObject):
'mouse3', 'mouse3-up'] 'mouse3', 'mouse3-up']
if base.wantTk: if base.wantTk:
from TkGlobal import tkroot import TkGlobal
self.panel = DirectSessionPanel(parent = tkroot) self.panel = DirectSessionPanel(parent = tkroot)
if self.iAmAServer: if self.iAmAServer:

23
direct/src/extensions/NodePath-extensions.py
View File

@ -785,42 +785,37 @@
return self.__lerp(functorFunc, time, blendType) return self.__lerp(functorFunc, time, blendType)
def place(self): def place(self):
base.wantDIRECT = 1
base.wantTk = 1 base.wantTk = 1
#from ShowBaseGlobal import * base.wantDIRECT = 1
#from DirectSession import * import DirectSession
import TkGlobal direct.enable()
import Placer import Placer
return Placer.place(self) return Placer.place(self)
def explore(self): def explore(self):
base.wantDIRECT = 1
base.wantTk = 1 base.wantTk = 1
#from ShowBaseGlobal import * base.wantDIRECT = 1
import TkGlobal import TkGlobal
import SceneGraphExplorer import SceneGraphExplorer
return SceneGraphExplorer.explore(self) return SceneGraphExplorer.explore(self)
def rgbPanel(self, cb = None): def rgbPanel(self, cb = None):
base.wantDIRECT = 1
base.wantTk = 1 base.wantTk = 1
#from ShowBaseGlobal import * base.wantDIRECT = 1
import TkGlobal import TkGlobal
import EntryScale import EntryScale
return EntryScale.rgbPanel(self, cb) return EntryScale.rgbPanel(self, cb)
def select(self): def select(self):
base.wantDIRECT = 1
base.wantTk = 1 base.wantTk = 1
#from ShowBaseGlobal import * base.wantDIRECT = 1
import TkGlobal import DirectSession
direct.select(self) direct.select(self)
def deselect(self): def deselect(self):
base.wantDIRECT = 1
base.wantTk = 1 base.wantTk = 1
#from ShowBaseGlobal import * base.wantDIRECT = 1
import TkGlobal import DirectSession
direct.deselect(self) direct.deselect(self)
def setAlphaScale(self, alpha): def setAlphaScale(self, alpha):

3
direct/src/interval/Interval.py
View File

@ -169,12 +169,11 @@ class Interval(DirectObject):
""" popupControls() """ popupControls()
Popup control panel for interval. Popup control panel for interval.
""" """
base.wantTk = 1
import TkGlobal import TkGlobal
import fpformat import fpformat
import string import string
# I moved this here because Toontown does not ship Tk # I moved this here because Toontown does not ship Tk
from Tkinter import Toplevel, Frame, Button from Tkinter import Toplevel, Frame, Button, LEFT, X
import Pmw import Pmw
import EntryScale import EntryScale
if tl == None: if tl == None:

6
direct/src/showbase/PythonUtil.py
View File

@ -292,21 +292,19 @@ def adjust(command = None, parent = None, **kw):
10.0 10.0
""" """
# Make sure we enable Tk # Make sure we enable Tk
base.wantDIRECT = 1
base.wantTk = 1
import TkGlobal import TkGlobal
import Tkinter import Tkinter
import EntryScale import EntryScale
import Pmw import Pmw
# Create toplevel if needed # Create toplevel if needed
if not parent: if not parent:
parent = Toplevel() parent = Tkinter.Toplevel()
parent.title('Parameter Adjust') parent.title('Parameter Adjust')
# Set command if specified # Set command if specified
if command: if command:
kw['command'] = command kw['command'] = command
es = apply(EntryScale.EntryScale, (parent,), kw) es = apply(EntryScale.EntryScale, (parent,), kw)
es.pack(expand = 1, fill = X) es.pack(expand = 1, fill = 'x')
es.parent = parent es.parent = parent
return es return es