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

Made selection compatible with multi windows

Browse Source
This commit is contained in:
Gyedo Jeon 2009-05-14 00:58:04 +00:00
parent d5dc94e763
commit f3812fd8dd
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -520,9 +520,9 @@ class SelectionQueue(CollisionHandlerQueue):
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.cam: if self.collisionNodePath.getParent() != base.direct.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.cam) p2cam = self.collisionNodePath.getParent().getMat(base.direct.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
@ -582,7 +582,8 @@ class SelectionRay(SelectionQueue):
return return
mx = base.mouseWatcherNode.getMouseX() mx = base.mouseWatcherNode.getMouseX()
my = base.mouseWatcherNode.getMouseY() my = base.mouseWatcherNode.getMouseY()
self.collider.setFromLens(base.camNode, mx, my)
self.collider.setFromLens(base.direct.camNode, mx, my)
self.ct.traverse(targetNodePath) self.ct.traverse(targetNodePath)
self.sortEntries() self.sortEntries()