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

allow want-direct to work with window-type none

Browse Source
This commit is contained in:
David Rose 2007-02-21 21:23:50 +00:00
parent 4ff0a5af0e
commit 86d6eeefaf
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
direct/src/showbase/ShowBase.py
View File

@ -307,13 +307,6 @@ class ShowBase(DirectObject.DirectObject):
# This needs to be allocated even if the viewer is off. # This needs to be allocated even if the viewer is off.
self.bufferViewer = BufferViewer() self.bufferViewer = BufferViewer()
# Start Tk and DIRECT if specified by Config.prc
fTk = self.config.GetBool('want-tk', 0)
# Start DIRECT if specified in Config.prc or in cluster mode
fDirect = (self.config.GetBool('want-directtools', 0) or
(base.config.GetString("cluster-mode", '') != ''))
# Set fWantTk to 0 to avoid starting Tk with this call
self.startDirect(fWantDirect = fDirect, fWantTk = fTk)
# Start IGLOOP # Start IGLOOP
self.restart() self.restart()
@ -582,6 +575,14 @@ class ShowBase(DirectObject.DirectObject):
# error not to open a window. # error not to open a window.
raise StandardError, 'Could not open window.' raise StandardError, 'Could not open window.'
# Start Tk and DIRECT if specified by Config.prc
fTk = self.config.GetBool('want-tk', 0)
# Start DIRECT if specified in Config.prc or in cluster mode
fDirect = (self.config.GetBool('want-directtools', 0) or
(base.config.GetString("cluster-mode", '') != ''))
# Set fWantTk to 0 to avoid starting Tk with this call
self.startDirect(fWantDirect = fDirect, fWantTk = fTk)
return self.win != None return self.win != None
def isMainWindowOpen(self): def isMainWindowOpen(self):