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

*** empty log message ***

Browse Source
This commit is contained in:
Mark Mine 2000-10-28 06:57:52 +00:00
parent 1be26294dd
commit d6b808c8cc
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
direct/src/directutil/DirectCameraControl.py
View File

@ -357,7 +357,7 @@ class DirectCameraControl(PandaObject):
taskMgr.removeTasksNamed('manipulateCamera') taskMgr.removeTasksNamed('manipulateCamera')
# How big is the node? # How big is the node?
nodeScale = self.direct.widget.getScale(render) nodeScale = self.direct.widget.scalingNode.getScale(render)
maxScale = max(nodeScale[0],nodeScale[1],nodeScale[2]) maxScale = max(nodeScale[0],nodeScale[1],nodeScale[2])
maxDim = min(self.chan.nearWidth, self.chan.nearHeight) maxDim = min(self.chan.nearWidth, self.chan.nearHeight)
@ -385,7 +385,7 @@ class DirectCameraControl(PandaObject):
task = 'manipulateCamera') task = 'manipulateCamera')
# Upon death, reparent Cam to parent # Upon death, reparent Cam to parent
fitTask.parent = parent fitTask.parent = parent
fitTask.uponDeath = self.reparentCam fitTask.uponDeath = self.reparentCam
def enableMouseFly(self): def enableMouseFly(self):
self.enableMouseInteraction() self.enableMouseInteraction()
@ -404,6 +404,7 @@ class DirectCameraControl(PandaObject):
self.accept('u', self.uprightCam, [self.chan]) self.accept('u', self.uprightCam, [self.chan])
self.accept('c', self.centerCamIn, [self.chan, 0.5]) self.accept('c', self.centerCamIn, [self.chan, 0.5])
self.accept('h', self.homeCam, [self.chan]) self.accept('h', self.homeCam, [self.chan])
self.accept('f', self.fitOnWidget)
for i in range(1,9): for i in range(1,9):
self.accept(`i`, self.SpawnMoveToView, [self.chan, i]) self.accept(`i`, self.SpawnMoveToView, [self.chan, i])
self.accept('9', self.swingCamAboutWidget, [self.chan, -90.0, t]) self.accept('9', self.swingCamAboutWidget, [self.chan, -90.0, t])
@ -423,6 +424,7 @@ class DirectCameraControl(PandaObject):
self.ignore('u') self.ignore('u')
self.ignore('c') self.ignore('c')
self.ignore('h') self.ignore('h')
self.ignore('f')
for i in range(0,10): for i in range(0,10):
self.ignore(`i`) self.ignore(`i`)
self.ignore('=') self.ignore('=')