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

"Converted collision pusher geometry from two spheres at either end of the ship into a single stretched sphere. we'll have to keep an eye out for strange behavior due to the scaling"

Browse Source
This commit is contained in:
Josh Wilson 2007-07-17 19:15:39 +00:00
parent 022b491438
commit f679612f2a
1 changed files with 27 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,8 +60,8 @@ class ShipPilot(PhysicsWalker):
self.wallBitmask = self.wallBitmask &~ oldMask self.wallBitmask = self.wallBitmask &~ oldMask
self.wallBitmask |= newMask self.wallBitmask |= newMask
if self.cSphereNodePath and not self.cSphereNodePath.isEmpty(): if self.cNodePath and not self.cNodePath.isEmpty():
self.cSphereNodePath.node().setFromCollideMask(self.wallBitmask) self.cNodePath.node().setFromCollideMask(self.wallBitmask)
def setFloorBitMask(self, bitMask): def setFloorBitMask(self, bitMask):
self.floorBitmask = bitMask self.floorBitmask = bitMask
@ -73,8 +73,8 @@ class ShipPilot(PhysicsWalker):
if ship is None: if ship is None:
base.controlForce.clearPhysicsObject() base.controlForce.clearPhysicsObject()
self.takedownPhysics() self.takedownPhysics()
self.ship = None
self.setCollisionsActive(0) self.setCollisionsActive(0)
self.ship = ship
else: else:
base.controlForce.setPhysicsObject(ship.node().getPhysicsObject()) base.controlForce.setPhysicsObject(ship.node().getPhysicsObject())
self.ship = ship self.ship = ship
@ -110,38 +110,34 @@ class ShipPilot(PhysicsWalker):
self.pusher.setInPattern("enter%in") self.pusher.setInPattern("enter%in")
self.pusher.setOutPattern("exit%in") self.pusher.setOutPattern("exit%in")
cSphereNode = CollisionNode('SP.cSphereNode') cNode = CollisionNode('SP.cNode')
"""
# Front sphere: # Front sphere:
sRadius = abs((self.portPos - self.starboardPos)[0] / 2.0) sRadius = abs((self.portPos - self.starboardPos)[0] / 2.0)
cBowSphere = CollisionSphere( cBowSphere = CollisionSphere(
0.0, self.bowPos[1]+sRadius, 0.0, sRadius) 0.0, self.bowPos[1]+sRadius, 0.0, sRadius)
cSphereNode.addSolid(cBowSphere)
# cBowSphereNode = CollisionNode('SP.cBowSphereNode')
# cBowSphereNode.addSolid(cBowSphere)
# self.cBowSphereNodePath = self.ship.getInteractCollisionRoot().attachNewNode(
# cBowSphereNode)
# self.pusher.addCollider(
# self.cBowSphereNodePath, self.shipNodePath)
# Back sphere: # Back sphere:
cSternSphere = CollisionSphere( cSternSphere = CollisionSphere(
0.0, self.sternPos[1]-sRadius, 0.0, sRadius) 0.0, self.sternPos[1]-sRadius, 0.0, sRadius)
cSternSphereNode = CollisionNode('SP.cSternSphereNode') cSternSphereNode = CollisionNode('SP.cSternSphereNode')
cSphereNode.addSolid(cSternSphere) """
# cSternSphereNode.addSolid(cSternSphere)
# self.cSternSphereNodePath = self.ship.getInteractCollisionRoot().attachNewNode(
# cSternSphereNode)
# self.pusher.addCollider( # Scaled sphere
# self.cSternSphereNodePath, self.shipNodePath) cObj = CollisionSphere(
0.0, (self.sternPos[1]+self.bowPos[1])/2.0, 0.0, sRadius)
## Combine them all
self.cSphereNodePath = self.ship.getInteractCollisionRoot().attachNewNode( # cNode.addSolid(cBowSphere)
cSphereNode) # cNode.addSolid(cSternSphere)
cNode.addSolid(cObj)
shipIColRoot = self.ship.getInteractCollisionRoot()
self.cNodePath = shipIColRoot.attachNewNode(cNode)
shipLen = abs(self.sternPos[1]-self.bowPos[1])
self.cNodePath.setScale(1,(shipLen/2.0)/sRadius,1)
self.pusher.addCollider( self.pusher.addCollider(
self.cSphereNodePath, self.shipNodePath) self.cNodePath, self.shipNodePath)
self.pusher.setHorizontal(True) self.pusher.setHorizontal(True)
# hide other things on my ship that these spheres might collide # hide other things on my ship that these spheres might collide
# with and which I dont need anyways... # with and which I dont need anyways...
@ -158,20 +154,12 @@ class ShipPilot(PhysicsWalker):
self.collisionsActive = active self.collisionsActive = active
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.cNodePath.node().setFromCollideMask(self.wallBitmask | self.floorBitmask)
# self.cBowSphereNodePath.node().setIntoCollideMask(BitMask32.allOff()) self.cNodePath.node().setIntoCollideMask(BitMask32.allOff())
# self.cSternSphereNodePath.node().setFromCollideMask(self.wallBitmask | self.floorBitmask) self.cTrav.addCollider(self.cNodePath, self.pusher)
# self.cSternSphereNodePath.node().setIntoCollideMask(BitMask32.allOff())
self.cSphereNodePath.node().setFromCollideMask(self.wallBitmask | self.floorBitmask)
self.cSphereNodePath.node().setIntoCollideMask(BitMask32.allOff())
# self.cTrav.addCollider(self.cBowSphereNodePath, self.pusher)
# self.cTrav.addCollider(self.cSternSphereNodePath, self.pusher)
self.cTrav.addCollider(self.cSphereNodePath, self.pusher)
shipCollWall.stash() shipCollWall.stash()
else: else:
# self.cTrav.removeCollider(self.cBowSphereNodePath) self.cTrav.removeCollider(self.cNodePath)
# self.cTrav.removeCollider(self.cSternSphereNodePath)
self.cTrav.removeCollider(self.cSphereNodePath)
shipCollWall.unstash() shipCollWall.unstash()
# Now that we have disabled collisions, make one more pass # Now that we have disabled collisions, make one more pass
# right now to ensure we aren't standing in a wall. # right now to ensure we aren't standing in a wall.
@ -190,9 +178,9 @@ class ShipPilot(PhysicsWalker):
self.cSternSphereNodePath.removeNode() self.cSternSphereNodePath.removeNode()
del self.cSternSphereNodePath del self.cSternSphereNodePath
""" """
if hasattr(self, "cSphereNodePath"): if hasattr(self, "cNodePath"):
self.cSphereNodePath.removeNode() self.cNodePath.removeNode()
del self.cSphereNodePath del self.cNodePath
del self.pusher del self.pusher
@ -212,16 +200,14 @@ class ShipPilot(PhysicsWalker):
assert self.debugPrint("takedownPhysics()") assert self.debugPrint("takedownPhysics()")
def setTag(self, key, value): def setTag(self, key, value):
# self.cSternSphereNodePath.setTag(key, value) self.cNodePath.setTag(key, value)
# self.cBowSphereNodePath.setTag(key, value)
self.cSphereNodePath.setTag(key, value)
def setAvatarPhysicsIndicator(self, indicator): def setAvatarPhysicsIndicator(self, indicator):
""" """
indicator is a NodePath indicator is a NodePath
""" """
assert self.debugPrint("setAvatarPhysicsIndicator()") assert self.debugPrint("setAvatarPhysicsIndicator()")
self.cSphereNodePath.show() self.cNodePath.show()
if indicator: if indicator:
# Indicator Node: # Indicator Node:
change=render.attachNewNode("change") change=render.attachNewNode("change")