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

fixed collison bitmask issues

Browse Source
This commit is contained in:
Josh Wilson 2007-01-27 04:42:41 +00:00
parent 2399409e8f
commit d25dbb573b
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
direct/src/controls/ShipPilot.py
View File

@ -107,7 +107,7 @@ class ShipPilot(PhysicsWalker):
0.0, self.bowPos[1], 0.0, sRadius) 0.0, self.bowPos[1], 0.0, sRadius)
cBowSphereNode = CollisionNode('SP.cBowSphereNode') cBowSphereNode = CollisionNode('SP.cBowSphereNode')
cBowSphereNode.addSolid(cBowSphere) cBowSphereNode.addSolid(cBowSphere)
self.cBowSphereNodePath = self.shipNodePath.attachNewNode( self.cBowSphereNodePath = self.ship.getInteractCollisionRoot().attachNewNode(
cBowSphereNode) cBowSphereNode)
# self.cBowSphereNodePath.show() # self.cBowSphereNodePath.show()
@ -119,7 +119,7 @@ class ShipPilot(PhysicsWalker):
0.0, self.sternPos[1], 0.0, sRadius) 0.0, self.sternPos[1], 0.0, sRadius)
cSternSphereNode = CollisionNode('SP.cSternSphereNode') cSternSphereNode = CollisionNode('SP.cSternSphereNode')
cSternSphereNode.addSolid(cSternSphere) cSternSphereNode.addSolid(cSternSphere)
self.cSternSphereNodePath = self.shipNodePath.attachNewNode( self.cSternSphereNodePath = self.ship.getInteractCollisionRoot().attachNewNode(
cSternSphereNode) cSternSphereNode)
# self.cSternSphereNodePath.show() # self.cSternSphereNodePath.show()
@ -142,9 +142,9 @@ class ShipPilot(PhysicsWalker):
shipCollWall = self.shipNodePath.find("**/collision_hull;+s") shipCollWall = self.shipNodePath.find("**/collision_hull;+s")
if active: if active:
self.cBowSphereNodePath.node().setFromCollideMask(self.wallBitmask | self.floorBitmask) self.cBowSphereNodePath.node().setFromCollideMask(self.wallBitmask | self.floorBitmask)
self.cBowSphereNodePath.node().setFromCollideMask(BitMask32.allOff()) self.cBowSphereNodePath.node().setIntoCollideMask(BitMask32.allOff())
self.cSternSphereNodePath.node().setFromCollideMask(self.wallBitmask | self.floorBitmask) self.cSternSphereNodePath.node().setFromCollideMask(self.wallBitmask | self.floorBitmask)
self.cSternSphereNodePath.node().setFromCollideMask(BitMask32.allOff()) self.cSternSphereNodePath.node().setIntoCollideMask(BitMask32.allOff())
self.cTrav.addCollider(self.cBowSphereNodePath, self.pusher) self.cTrav.addCollider(self.cBowSphereNodePath, self.pusher)
self.cTrav.addCollider(self.cSternSphereNodePath, self.pusher) self.cTrav.addCollider(self.cSternSphereNodePath, self.pusher)
shipCollWall.stash() shipCollWall.stash()
@ -183,9 +183,8 @@ class ShipPilot(PhysicsWalker):
assert self.debugPrint("takedownPhysics()") assert self.debugPrint("takedownPhysics()")
def setTag(self, key, value): def setTag(self, key, value):
if not hasattr(self, "collisionTags"): self.cSternSphereNodePath.setTag(key, value)
self.collisionTags = {} self.cBowSphereNodePath.setTag(key, value)
self.collisionTags[key] = value
def setAvatarPhysicsIndicator(self, indicator): def setAvatarPhysicsIndicator(self, indicator):
""" """
@ -304,7 +303,7 @@ class ShipPilot(PhysicsWalker):
def handleAvatarControls(self, task): def handleAvatarControls(self, task):
""" """
Check on the arrow keys and update the avatar. Check on the arrow keys and update the "avatar" (ship).
""" """
if __debug__: if __debug__:
if self.wantDebugIndicator: if self.wantDebugIndicator:
@ -312,10 +311,9 @@ class ShipPilot(PhysicsWalker):
base.localAvatar.getPos().pPrintValues(),)) base.localAvatar.getPos().pPrintValues(),))
onScreenDebug.append("localAvatar hpr = %s\n"%( onScreenDebug.append("localAvatar hpr = %s\n"%(
base.localAvatar.getHpr().pPrintValues(),)) base.localAvatar.getHpr().pPrintValues(),))
#assert self.debugPrint("handleAvatarControls(task=%s)"%(task,)) # assert self.debugPrint("handleAvatarControls(task=%s)"%(task,))
physObject = self.actorNode.getPhysicsObject() physObject = self.actorNode.getPhysicsObject()
contact = self.actorNode.getContactVector() contact = self.actorNode.getContactVector()
# get the button states: # get the button states:
forward = inputState.isSet("forward") forward = inputState.isSet("forward")
reverse = inputState.isSet("reverse") reverse = inputState.isSet("reverse")
@ -509,6 +507,9 @@ class ShipPilot(PhysicsWalker):
speed /= self.ship.maxSp speed /= self.ship.maxSp
## physObject.setVelocity(speed) ## physObject.setVelocity(speed)
# print self.ship.getZ()
# self.ship.setZ(0)
#rotMat=Mat3.rotateMatNormaxis(self.shipNodePath.getH(), Vec3.up()) #rotMat=Mat3.rotateMatNormaxis(self.shipNodePath.getH(), Vec3.up())
#speed=rotMat.xform(speed) #speed=rotMat.xform(speed)
# The momentumForce makes it feel like we are sliding on ice -- Joe # The momentumForce makes it feel like we are sliding on ice -- Joe