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

Removed default bitmask from persp coll plane

Browse Source
This commit is contained in:
Gyedo Jeon 2010-05-18 01:09:31 +00:00
parent a617a5cb97
commit 385f6e5920
3 changed files with 401 additions and 375 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
direct/src/leveleditor/LevelEditorBase.py
View File

@ -24,6 +24,8 @@ class LevelEditorBase(DirectObject):
self.fileMgr = FileMgr(self) self.fileMgr = FileMgr(self)
self.actionMgr = ActionMgr() self.actionMgr = ActionMgr()
self.fMoveCamera = False
self.NPParent = render self.NPParent = render
# define your own config file in inherited class # define your own config file in inherited class
@ -56,7 +58,12 @@ class LevelEditorBase(DirectObject):
('LE-SaveScene', self.ui.onSave), ('LE-SaveScene', self.ui.onSave),
('LE-OpenScene', self.ui.onOpen), ('LE-OpenScene', self.ui.onOpen),
('LE-Quit', self.ui.quit), ('LE-Quit', self.ui.quit),
('DIRECT-mouse1', self.handleMouse1),
('DIRECT-mouse1Up', self.handleMouse1Up),
('DIRECT-mouse2', self.handleMouse2),
('DIRECT-mouse2Up', self.handleMouse2Up),
('DIRECT-mouse3', self.handleMouse3), ('DIRECT-mouse3', self.handleMouse3),
('DIRECT-mouse3Up', self.handleMouse3Up),
('DIRECT-toggleWidgetVis', self.toggleWidget), ('DIRECT-toggleWidgetVis', self.toggleWidget),
]) ])
@ -111,12 +118,32 @@ class LevelEditorBase(DirectObject):
return return
base.direct.toggleWidgetVis() base.direct.toggleWidgetVis()
def handleMouse1(self, modifiers):
if base.direct.fAlt or modifiers == 4:
self.fMoveCamera = True
return
def handleMouse1Up(self):
self.fMoveCamera = False
def handleMouse2(self, modifiers):
if base.direct.fAlt or modifiers == 4:
self.fMoveCamera = True
return
def handleMouse2Up(self):
self.fMoveCamera = False
def handleMouse3(self, modifiers): def handleMouse3(self, modifiers):
if base.direct.fAlt or modifiers == 4: if base.direct.fAlt or modifiers == 4:
self.fMoveCamera = True
return return
self.ui.onRightDown() self.ui.onRightDown()
def handleMouse3Up(self):
self.fMoveCamera = False
def handleDelete(self): def handleDelete(self):
oldSelectedNPs = base.direct.selected.getSelectedAsList() oldSelectedNPs = base.direct.selected.getSelectedAsList()
oldUIDs = [] oldUIDs = []

3
direct/src/leveleditor/LevelEditorUIBase.py
View File

@ -69,9 +69,6 @@ class PandaTextDropTarget(wx.TextDropTarget):
break break
if hitPt is None: if hitPt is None:
if self.view.name == 'persp':
iRay.collideWithBitMask(1)
else:
iRay.collideWithBitMask(BitMask32.bit(21)) iRay.collideWithBitMask(BitMask32.bit(21))
iRay.ct.traverse(self.view.collPlane) iRay.ct.traverse(self.view.collPlane)
if iRay.getNumEntries() > 0: if iRay.getNumEntries() > 0:

10
direct/src/wxwidgets/ViewPort.py
View File

@ -226,15 +226,17 @@ class Viewport(wx.Panel, DirectObject):
v.grid = DirectGrid(parent=render) v.grid = DirectGrid(parent=render)
collPlane = CollisionNode('PerspGridCol') collPlane = CollisionNode('PerspGridCol')
collPlane.addSolid(CollisionPlane(Plane(0, 0, 1, 0))) collPlane.addSolid(CollisionPlane(Plane(0, 0, 1, 0)))
oldBitmask = collPlane.getIntoCollideMask() #oldBitmask = collPlane.getIntoCollideMask()
collPlane.setIntoCollideMask(BitMask32.bit(21)|oldBitmask) #collPlane.setIntoCollideMask(BitMask32.bit(21)|oldBitmask)
collPlane.setIntoCollideMask(BitMask32.bit(21))
v.collPlane = NodePath(collPlane) v.collPlane = NodePath(collPlane)
v.collPlane.reparentTo(v.grid) v.collPlane.reparentTo(v.grid)
collPlane2 = CollisionNode('PerspGridCol2') collPlane2 = CollisionNode('PerspGridCol2')
collPlane2.addSolid(CollisionPlane(Plane(0, 0, -1, 0))) collPlane2.addSolid(CollisionPlane(Plane(0, 0, -1, 0)))
oldBitmask = collPlane2.getIntoCollideMask() #oldBitmask = collPlane2.getIntoCollideMask()
collPlane2.setIntoCollideMask(BitMask32.bit(21)|oldBitmask) #collPlane2.setIntoCollideMask(BitMask32.bit(21)|oldBitmask)
collPlane2.setIntoCollideMask(BitMask32.bit(21))
v.collPlane2 = NodePath(collPlane2) v.collPlane2 = NodePath(collPlane2)
v.collPlane2.reparentTo(v.grid) v.collPlane2.reparentTo(v.grid)