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

base.oobe() accepts cam argument

Browse Source
This commit is contained in:
David Rose 2012-02-07 22:08:53 +00:00
parent e125604c50
commit 71871ba28b
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2188,7 +2188,7 @@ class ShowBase(DirectObject.DirectObject):
dr.setCamera(self.showVertices) dr.setCamera(self.showVertices)
def oobe(self): def oobe(self, cam = None):
""" """
Enable a special "out-of-body experience" mouse-interface Enable a special "out-of-body experience" mouse-interface
mode. This can be used when a "god" camera is needed; it mode. This can be used when a "god" camera is needed; it
@ -2209,6 +2209,9 @@ class ShowBase(DirectObject.DirectObject):
This is a toggle; the second time this function is called, it This is a toggle; the second time this function is called, it
disables the mode. disables the mode.
""" """
if cam is None:
cam = self.cam
# If oobeMode was never set, set it to false and create the # If oobeMode was never set, set it to false and create the
# structures we need to implement OOBE. # structures we need to implement OOBE.
try: try:
@ -2223,7 +2226,7 @@ class ShowBase(DirectObject.DirectObject):
self.oobeLens.setNearFar(0.1, 10000.0) self.oobeLens.setNearFar(0.1, 10000.0)
self.oobeLens.setMinFov(40) self.oobeLens.setMinFov(40)
self.oobeTrackball = NodePath(Trackball('oobeTrackball'), 1) self.oobeTrackball = NodePath(Trackball('oobeTrackball'))
self.oobe2cam = self.oobeTrackball.attachNewNode(Transform2SG('oobe2cam')) self.oobe2cam = self.oobeTrackball.attachNewNode(Transform2SG('oobe2cam'))
self.oobe2cam.node().setNode(self.oobeCameraTrackball.node()) self.oobe2cam.node().setNode(self.oobeCameraTrackball.node())
@ -2259,8 +2262,9 @@ class ShowBase(DirectObject.DirectObject):
bt.setButtonRepeatEvent('') bt.setButtonRepeatEvent('')
bt.setButtonUpEvent('') bt.setButtonUpEvent('')
self.cam.reparentTo(self.camera) cam.reparentTo(self.camera)
self.camNode.setLens(self.camLens) #if cam == self.cam:
# self.camNode.setLens(self.camLens)
self.oobeCamera.reparentTo(self.hidden) self.oobeCamera.reparentTo(self.hidden)
self.oobeMode = 0 self.oobeMode = 0
bboard.post('oobeEnabled', False) bboard.post('oobeEnabled', False)
@ -2287,7 +2291,7 @@ class ShowBase(DirectObject.DirectObject):
mat.invertInPlace() mat.invertInPlace()
self.oobeTrackball.node().setMat(mat) self.oobeTrackball.node().setMat(mat)
self.cam.reparentTo(self.oobeCameraTrackball) cam.reparentTo(self.oobeCameraTrackball)
# Temporarily disable button events by routing them # Temporarily disable button events by routing them
# through the oobe filters. # through the oobe filters.
@ -2298,7 +2302,8 @@ class ShowBase(DirectObject.DirectObject):
bt.setButtonUpEvent('oobe-up') bt.setButtonUpEvent('oobe-up')
# Don't change the camera lens--keep it with the original lens. # Don't change the camera lens--keep it with the original lens.
#self.camNode.setLens(self.oobeLens) #if cam == self.cam:
# self.camNode.setLens(self.oobeLens)
if self.oobeVis: if self.oobeVis:
self.oobeVis.reparentTo(self.camera) self.oobeVis.reparentTo(self.camera)