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

Added support for legacy winControls code

Browse Source
This commit is contained in:
Gyedo Jeon 2009-05-14 01:26:50 +00:00
parent 678acf998a
commit 68c729feca
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -657,14 +657,13 @@ class ShowBase(DirectObject.DirectObject):
self.cam2dp = None self.cam2dp = None
cam.removeNode() cam.removeNode()
# Now we can actually close the window.
self.graphicsEngine.removeWindow(win)
# [gjeon] remove winControl # [gjeon] remove winControl
for winCtrl in self.winControls: for winCtrl in self.winControls:
if winCtrl.win == win: if winCtrl.win == win:
self.winControls.remove(winCtrl) self.winControls.remove(winCtrl)
break break
# Now we can actually close the window.
self.graphicsEngine.removeWindow(win)
self.winList.remove(win) self.winList.remove(win)
mainWindow = False mainWindow = False
@ -2473,7 +2472,8 @@ class WindowControls:
mouseKeyboard=None, closeCmd=lambda: 0): mouseKeyboard=None, closeCmd=lambda: 0):
self.win = win self.win = win
self.camera = cam self.camera = cam
self.camNode = camNode if camNode is None:
self.camNode = cam.node()
self.camera2d = cam2d self.camera2d = cam2d
self.mouseWatcher = mouseWatcher self.mouseWatcher = mouseWatcher
self.mouseKeyboard = mouseKeyboard self.mouseKeyboard = mouseKeyboard
@ -2482,6 +2482,7 @@ class WindowControls:
def __str__(self): def __str__(self):
s = "window = " + str(self.win) + "\n" s = "window = " + str(self.win) + "\n"
s += "camera = " + str(self.camera) + "\n" s += "camera = " + str(self.camera) + "\n"
s += "camNode = " + str(self.camNode) + "\n"
s += "camera2d = " + str(self.camera2d) + "\n" s += "camera2d = " + str(self.camera2d) + "\n"
s += "mouseWatcher = " + str(self.mouseWatcher) + "\n" s += "mouseWatcher = " + str(self.mouseWatcher) + "\n"
s += "mouseAndKeyboard = " + str(self.mouseKeyboard) + "\n" s += "mouseAndKeyboard = " + str(self.mouseKeyboard) + "\n"