From 4d2f4dcc49d955db80b0ac7601d17c499b98be83 Mon Sep 17 00:00:00 2001
From: Dave Schuyler <nthparameter@gmail.com>
Date: Tue, 16 Dec 2003 04:44:22 +0000
Subject: [PATCH] added placeOnFloor()

---
 direct/src/showbase/ControlManager.py   |  3 +++
 direct/src/showbase/GravityWalker.py    | 32 +++++++++++++++----------
 direct/src/showbase/NonPhysicsWalker.py |  9 +++++++
 direct/src/showbase/PhysicsWalker.py    |  9 +++++++
 4 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/direct/src/showbase/ControlManager.py b/direct/src/showbase/ControlManager.py
index 9266849c2b..a05825cf12 100755
--- a/direct/src/showbase/ControlManager.py
+++ b/direct/src/showbase/ControlManager.py
@@ -244,6 +244,9 @@ class ControlManager:
         assert(self.debugPrint("collisionsOff()"))
         self.currentControls.setCollisionsActive(0)
 
+    def placeOnFloor(self):
+        self.currentControls.placeOnFloor()
+
     def enable(self):
         assert(self.debugPrint("enable()"))
         self.isEnabled = 1
diff --git a/direct/src/showbase/GravityWalker.py b/direct/src/showbase/GravityWalker.py
index 1f73ed6caf..eeed1a9c48 100755
--- a/direct/src/showbase/GravityWalker.py
+++ b/direct/src/showbase/GravityWalker.py
@@ -97,31 +97,27 @@ class GravityWalker(DirectObject.DirectObject):
         self.platformRoot.setHpr(toonbase.localToon, Vec3.zero())
         self.platform.reparentTo(self.platformRoot)
 
-        startPos = Vec3(0.0, -15.0, 0.0)
-        upPos = Vec3(0.0, 0.0, 15.0)
-        endPos = Vec3(0.0, 15.0, 0.0)
-        distance = Vec3(startPos-endPos).length()
-        duration = distance/4
+        duration = 7
         self.moveIval = Sequence(
             WaitInterval(0.3),
             LerpPosInterval(self.platform, duration,
-                            endPos, startPos=startPos,
+                            Vec3(0.0, 15.0, 0.0),
                             name='platformOut%s' % fakeId,
                             fluid = 1),
             WaitInterval(0.3),
             LerpPosInterval(self.platform, duration,
-                            startPos, startPos=endPos,
+                            Vec3(0.0, -15.0, 0.0),
                             name='platformBack%s' % fakeId,
                             fluid = 1),
             WaitInterval(0.3),
             LerpPosInterval(self.platform, duration,
-                            upPos,
-                            name='platformOut%s' % fakeId,
+                            Vec3(0.0, -15.0, 15.0),
+                            name='platformUp%s' % fakeId,
                             fluid = 1),
             WaitInterval(0.3),
             LerpPosInterval(self.platform, duration,
-                            startPos,
-                            name='platformOut%s' % fakeId,
+                            Vec3(0.0, -15.0, 0.0),
+                            name='platformDown%s' % fakeId,
                             fluid = 1),
 
             name='platformIval%s' % fakeId,
@@ -232,6 +228,9 @@ class GravityWalker(DirectObject.DirectObject):
     def setAirborneHeightFunc(self, unused_parameter):
         self.getAirborneHeight = self.lifter.getAirborneHeight
 
+    def getAirborneHeight(self):
+        self.lifter.getAirborneHeight()
+
     def setAvatarPhysicsIndicator(self, indicator):
         """
         indicator is a NodePath
@@ -290,6 +289,15 @@ class GravityWalker(DirectObject.DirectObject):
             self.oneTimeCollide()
             self.cRayNodePath.setZ(temp)
         return Task.cont
+    
+    def placeOnFloor(self):
+        """
+        Make a reasonable effor to place the avatar on the ground.
+        For example, this is useful when switching away from the 
+        current walker.
+        """
+        self.oneTimeCollide()
+        self.avatarNodePath.setZ(self.avatarNodePath.getZ()-self.lifter.getAirborneHeight())
 
     def oneTimeCollide(self):
         """
@@ -303,7 +311,7 @@ class GravityWalker(DirectObject.DirectObject):
         tempCTrav.addCollider(self.cFloorSphereNodePath, self.event)
         tempCTrav.addCollider(self.cRayNodePath, self.lifter)
         tempCTrav.traverse(render)
-    
+
     def setMayJump(self, task):
         """
         This function's use is internal to this class (maybe I'll add
diff --git a/direct/src/showbase/NonPhysicsWalker.py b/direct/src/showbase/NonPhysicsWalker.py
index ac0f6d43c8..596a0768c5 100755
--- a/direct/src/showbase/NonPhysicsWalker.py
+++ b/direct/src/showbase/NonPhysicsWalker.py
@@ -133,6 +133,15 @@ class NonPhysicsWalker(DirectObject.DirectObject):
                 # Now that we have disabled collisions, make one more pass
                 # right now to ensure we aren't standing in a wall.
                 self.oneTimeCollide()
+    
+    def placeOnFloor(self):
+        """
+        Make a reasonable effor to place the avatar on the ground.
+        For example, this is useful when switching away from the 
+        current walker.
+        """
+        self.oneTimeCollide()
+        self.setZ(self.getZ()-self.getAirborneHeight())
 
     def oneTimeCollide(self):
         """
diff --git a/direct/src/showbase/PhysicsWalker.py b/direct/src/showbase/PhysicsWalker.py
index 937b5e7911..718dd29399 100755
--- a/direct/src/showbase/PhysicsWalker.py
+++ b/direct/src/showbase/PhysicsWalker.py
@@ -374,6 +374,15 @@ class PhysicsWalker(DirectObject.DirectObject):
         assert(self.debugPrint("getCollisionsActive() returning=%s"%(
             self.collisionsActive,)))
         return self.collisionsActive
+    
+    def placeOnFloor(self):
+        """
+        Make a reasonable effor to place the avatar on the ground.
+        For example, this is useful when switching away from the 
+        current walker.
+        """
+        self.oneTimeCollide()
+        self.setZ(self.getZ()-self.getAirborneHeight())
 
     def oneTimeCollide(self):
         """