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

Fixed crash in Pirates

Browse Source
This commit is contained in:
Gyedo Jeon 2009-05-15 21:08:35 +00:00
parent 38b8cd1171
commit 8370d2be12
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
direct/src/directtools/DirectSelection.py
View File

@ -516,13 +516,18 @@ class SelectionQueue(CollisionHandlerQueue):
# Well, no way to tell. Assume we're not backfacing. # Well, no way to tell. Assume we're not backfacing.
return 0 return 0
if direct:
cam = base.direct.cam
else:
cam = base.cam
fromNodePath = entry.getFromNodePath() fromNodePath = entry.getFromNodePath()
v = Vec3(entry.getSurfacePoint(fromNodePath)) v = Vec3(entry.getSurfacePoint(fromNodePath))
n = entry.getSurfaceNormal(fromNodePath) n = entry.getSurfaceNormal(fromNodePath)
# Convert to camera space for backfacing test # Convert to camera space for backfacing test
if self.collisionNodePath.getParent() != base.direct.cam: if self.collisionNodePath.getParent() != cam:
# Problem: assumes base.cam is the camera in question # Problem: assumes base.cam is the camera in question
p2cam = self.collisionNodePath.getParent().getMat(base.direct.cam) p2cam = self.collisionNodePath.getParent().getMat(cam)
v = Vec3(p2cam.xformPoint(v)) v = Vec3(p2cam.xformPoint(v))
n = p2cam.xformVec(n) n = p2cam.xformVec(n)
# Normalize and check angle between to vectors # Normalize and check angle between to vectors
@ -583,7 +588,10 @@ class SelectionRay(SelectionQueue):
mx = base.mouseWatcherNode.getMouseX() mx = base.mouseWatcherNode.getMouseX()
my = base.mouseWatcherNode.getMouseY() my = base.mouseWatcherNode.getMouseY()
self.collider.setFromLens(base.direct.camNode, mx, my) if direct:
self.collider.setFromLens(base.direct.camNode, mx, my)
else:
self.collider.setFromLens(base.camNode, mx, my)
self.ct.traverse(targetNodePath) self.ct.traverse(targetNodePath)
self.sortEntries() self.sortEntries()