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

Added proper handling of camera rotation when the camera is underneath grid for new LE

Browse Source
This commit is contained in:
Gyedo Jeon 2010-05-15 00:14:22 +00:00
parent 07eda4ee55
commit d236032656
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
direct/src/directtools/DirectCameraControl.py
View File

@ -35,6 +35,7 @@ class DirectCameraControl(DirectObject):
self.cqEntries = [] self.cqEntries = []
self.coaMarkerRef = base.direct.group.attachNewNode('coaMarkerRef') self.coaMarkerRef = base.direct.group.attachNewNode('coaMarkerRef')
self.camManipRef = base.direct.group.attachNewNode('camManipRef') self.camManipRef = base.direct.group.attachNewNode('camManipRef')
t = CAM_MOVE_DURATION t = CAM_MOVE_DURATION
self.actionEvents = [ self.actionEvents = [
['DIRECT-mouse1', self.mouseRotateStart], ['DIRECT-mouse1', self.mouseRotateStart],
@ -101,6 +102,7 @@ class DirectCameraControl(DirectObject):
self.useMayaCamControls = 0 self.useMayaCamControls = 0
self.altDown = 0 self.altDown = 0
self.perspCollPlane = None # [gjeon] used for new LE self.perspCollPlane = None # [gjeon] used for new LE
self.perspCollPlane2 = None # [gjeon] used for new LE
def toggleMarkerVis(self): def toggleMarkerVis(self):
## if base.direct.cameraControl.coaMarker.isHidden(): ## if base.direct.cameraControl.coaMarker.isHidden():
@ -375,10 +377,16 @@ class DirectCameraControl(DirectObject):
iRay = SelectionRay(base.direct.camera) iRay = SelectionRay(base.direct.camera)
iRay.collider.setFromLens(base.direct.camNode, 0.0, 0.0) iRay.collider.setFromLens(base.direct.camNode, 0.0, 0.0)
iRay.collideWithBitMask(1) iRay.collideWithBitMask(1)
iRay.ct.traverse(self.perspCollPlane)
if base.direct.camera.getPos().getZ() >=0:
iRay.ct.traverse(self.perspCollPlane)
else:
iRay.ct.traverse(self.perspCollPlane2)
if iRay.getNumEntries() > 0: if iRay.getNumEntries() > 0:
entry = iRay.getEntry(0) entry = iRay.getEntry(0)
hitPt = entry.getSurfacePoint(entry.getFromNodePath()) hitPt = entry.getSurfacePoint(entry.getFromNodePath())
# create a temp nodePath to get the position # create a temp nodePath to get the position
np = NodePath('temp') np = NodePath('temp')
np.setPos(base.direct.camera, hitPt) np.setPos(base.direct.camera, hitPt)
@ -425,11 +433,17 @@ class DirectCameraControl(DirectObject):
self.camManipRef.setPos(self.coaMarkerPos) self.camManipRef.setPos(self.coaMarkerPos)
self.camManipRef.setHpr(base.direct.camera, ZERO_POINT) self.camManipRef.setHpr(base.direct.camera, ZERO_POINT)
else: else:
if base.direct.camera.getPos().getZ() >=0:
dirX = -1
else:
dirX = 1
wrt = base.direct.camera.getTransform(self.camManipRef) wrt = base.direct.camera.getTransform(self.camManipRef)
self.camManipRef.setHpr(self.camManipRef, self.camManipRef.setHpr(self.camManipRef,
(-1 * deltaX * 180.0), (dirX * deltaX * 180.0),
(deltaY * 180.0), (deltaY * 180.0),
0.0) 0.0)
if (self.lockRoll == True): if (self.lockRoll == True):
# flatten roll # flatten roll
self.camManipRef.setR(0) self.camManipRef.setR(0)