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

moved lifter to shadow-placer traverser, fixes fall-through-ledge problem

Browse Source
This commit is contained in:
Darren Ranalli 2007-08-01 01:31:56 +00:00
parent 75e9818d69
commit e51f0b2baf
3 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
direct/src/controls/GravityWalker.py
View File

@ -354,6 +354,8 @@ class GravityWalker(DirectObject.DirectObject):
# Each time we change the collision geometry, make one # Each time we change the collision geometry, make one
# more pass to ensure we aren't standing in a wall. # more pass to ensure we aren't standing in a wall.
self.oneTimeCollide() self.oneTimeCollide()
# make sure we have a shadow traverser
base.initShadowTrav()
if active: if active:
if 1: if 1:
# Please let skyler or drose know if this is causing a problem # Please let skyler or drose know if this is causing a problem
@ -364,14 +366,21 @@ class GravityWalker(DirectObject.DirectObject):
if self.wantFloorSphere: if self.wantFloorSphere:
self.cTrav.addCollider(self.cFloorSphereNodePath, self.pusherFloor) self.cTrav.addCollider(self.cFloorSphereNodePath, self.pusherFloor)
self.cTrav.addCollider(self.cEventSphereNodePath, self.event) self.cTrav.addCollider(self.cEventSphereNodePath, self.event)
self.cTrav.addCollider(self.cRayNodePath, self.lifter) # Add the lifter to the shadow traverser, which runs after
# our traverser. This prevents the "fall through wall and
# off ledge" bug. The problem was that we couldn't control
# which collided first, the wall pusher or the lifter, if
# they're in the same collision traverser. If the lifter
# collided first, we'd start falling before getting pushed
# back behind the wall.
base.shadowTrav.addCollider(self.cRayNodePath, self.lifter)
else: else:
if hasattr(self, 'cTrav'): if hasattr(self, 'cTrav'):
self.cTrav.removeCollider(self.cWallSphereNodePath) self.cTrav.removeCollider(self.cWallSphereNodePath)
if self.wantFloorSphere: if self.wantFloorSphere:
self.cTrav.removeCollider(self.cFloorSphereNodePath) self.cTrav.removeCollider(self.cFloorSphereNodePath)
self.cTrav.removeCollider(self.cEventSphereNodePath) self.cTrav.removeCollider(self.cEventSphereNodePath)
self.cTrav.removeCollider(self.cRayNodePath) base.shadowTrav.removeCollider(self.cRayNodePath)
def getCollisionsActive(self): def getCollisionsActive(self):
assert self.debugPrint("getCollisionsActive() returning=%s"%( assert self.debugPrint("getCollisionsActive() returning=%s"%(

5
direct/src/showbase/ShadowPlacer.py
View File

@ -45,10 +45,7 @@ class ShadowPlacer(DirectObject.DirectObject):
if not cTrav: if not cTrav:
# set up the shadow collision traverser # set up the shadow collision traverser
if not base.shadowTrav: base.initShadowTrav()
# set up the shadow collision traverser
base.shadowTrav = CollisionTraverser("base.shadowTrav")
base.shadowTrav.setRespectPrevTransform(False)
cTrav = base.shadowTrav cTrav = base.shadowTrav
self.cTrav = cTrav self.cTrav = cTrav

11
direct/src/showbase/ShowBase.py
View File

@ -1432,6 +1432,12 @@ class ShowBase(DirectObject.DirectObject):
IntervalManager.ivalMgr.step() IntervalManager.ivalMgr.step()
return Task.cont return Task.cont
def initShadowTrav(self):
if not self.shadowTrav:
# set up the shadow collision traverser
self.shadowTrav = CollisionTraverser("base.shadowTrav")
self.shadowTrav.setRespectPrevTransform(False)
def __shadowCollisionLoop(self, state): def __shadowCollisionLoop(self, state):
# run the collision traversal if we have a # run the collision traversal if we have a
# CollisionTraverser set. # CollisionTraverser set.
@ -1509,9 +1515,10 @@ class ShowBase(DirectObject.DirectObject):
# between collisionLoop and igLoop # between collisionLoop and igLoop
self.taskMgr.add(self.__collisionLoop, 'collisionLoop', priority = 30) self.taskMgr.add(self.__collisionLoop, 'collisionLoop', priority = 30)
# do the shadowCollisionLoop after the collisionLoop and # do the shadowCollisionLoop after the collisionLoop and
# befor the igLoop: # before the igLoop and camera updates (this moves the avatar vertically,
# to his final position for the frame):
self.taskMgr.add( self.taskMgr.add(
self.__shadowCollisionLoop, 'shadowCollisionLoop', priority = 45) self.__shadowCollisionLoop, 'shadowCollisionLoop', priority = 44)
# give the igLoop task a reasonably "late" priority, # give the igLoop task a reasonably "late" priority,
# so that it will get run after most tasks # so that it will get run after most tasks
self.taskMgr.add(self.__igLoop, 'igLoop', priority = 50) self.taskMgr.add(self.__igLoop, 'igLoop', priority = 50)