Browse Source

fix for jumping on lift

Dave Schuyler 22 years ago
parent
commit
66e56f800a
2 changed files with 12 additions and 7 deletions
  1. 0 6
      direct/src/gui/DirectDialog.py
  2. 12 1
      direct/src/showbase/GravityWalker.py

+ 0 - 6
direct/src/gui/DirectDialog.py

@@ -301,15 +301,11 @@ class DirectDialog(DirectFrame):
         self.resetFrameSize()
 
     def show(self):
-        """show(self)
-        """
         if self['fadeScreen']:
             base.transitions.fadeScreen(self['fadeScreen'])
         NodePath.show(self)
 
     def hide(self):
-        """hide(self)
-        """
         if self['fadeScreen']:
             base.transitions.noTransitions()
         NodePath.hide(self)
@@ -323,8 +319,6 @@ class DirectDialog(DirectFrame):
         self.configureDialog()
         
     def cleanup(self):
-        """unload(self)
-        """
         # Remove this panel out of the AllDialogs list
         uniqueName = self['dialogName']
         if DirectDialog.AllDialogs.has_key(uniqueName):

+ 12 - 1
direct/src/showbase/GravityWalker.py

@@ -98,6 +98,7 @@ class GravityWalker(DirectObject.DirectObject):
         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
@@ -112,6 +113,17 @@ class GravityWalker(DirectObject.DirectObject):
                             startPos, startPos=endPos,
                             name='platformBack%s' % fakeId,
                             fluid = 1),
+            WaitInterval(0.3),
+            LerpPosInterval(self.platform, duration,
+                            upPos,
+                            name='platformOut%s' % fakeId,
+                            fluid = 1),
+            WaitInterval(0.3),
+            LerpPosInterval(self.platform, duration,
+                            startPos,
+                            name='platformOut%s' % fakeId,
+                            fluid = 1),
+
             name='platformIval%s' % fakeId,
             )
         self.moveIval.loop()
@@ -416,7 +428,6 @@ class GravityWalker(DirectObject.DirectObject):
                               self.__oldPosDelta.pPrintValues())
         velocity = self.__oldPosDelta*(1.0/self.__oldDt)
         self.priorParent = Vec3(velocity)
-        self.priorParent.setZ(0.0) # The lifter handles the z value.
         if __debug__:
             if self.wantDebugIndicator:
                 onScreenDebug.add("priorParent", self.priorParent.pPrintValues())