TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 16:58:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix camera when reopening window

Browse Source
This commit is contained in:
David Rose 2003-02-25 05:30:24 +00:00
parent 9d611f563f
commit 502d074b5c
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -321,6 +321,11 @@ class ShowBase(DirectObject.DirectObject):
if self.camList.count(cam) != 0: if self.camList.count(cam) != 0:
self.camList.remove(cam) self.camList.remove(cam)
if not cam.isEmpty(): if not cam.isEmpty():
camera = cam.getParent()
if self.cameraList.count(camera) != 0:
self.cameraList.remove(camera)
# Don't throw away self.camera; we want to
# preserve it for reopening the window.
if cam == self.cam: if cam == self.cam:
self.cam = None self.cam = None
cam.removeNode() cam.removeNode()
@ -578,10 +583,22 @@ class ShowBase(DirectObject.DirectObject):
for i in range(chanConfig.getNumGroups()): for i in range(chanConfig.getNumGroups()):
# Create a top level camera node for this group # Create a top level camera node for this group
camera = self.render.attachNewNode(chanConfig.getGroupNode(i))
self.cameraList.append(camera) camera = NodePath(chanConfig.getGroupNode(i))
# Extract camera # Extract camera
cam = camera.find('**/+Camera') cam = camera.find('**/+Camera')
# A special case: if we have a camera but not a
# cameraList, we must have just reopened the window. Use
# that existing camera instead of creating a new one.
if self.camera != None and len(self.cameraList) == 0:
# Throw away the chancfg group in this special case.
camera = self.camera
cam.reparentTo(camera)
else:
camera.reparentTo(self.render)
self.cameraList.append(camera)
self.camList.append(cam) self.camList.append(cam)
# Enforce our expected aspect ratio, overriding whatever # Enforce our expected aspect ratio, overriding whatever
# nonsense ChanConfig put in there. # nonsense ChanConfig put in there.