Browse Source

*** empty log message ***

Mark Mine 24 years ago
parent
commit
c201407306
1 changed files with 4 additions and 18 deletions
  1. 4 18
      direct/src/interval/LerpInterval.py

+ 4 - 18
direct/src/interval/LerpInterval.py

@@ -281,28 +281,14 @@ class LerpFunctionInterval(Interval):
         """
         """
         # Note, this is temporary until blend functions get exposed
         # Note, this is temporary until blend functions get exposed
         import LerpBlendHelpers
         import LerpBlendHelpers
-        def easeIn(t):
-            x = t*t
-            return ((3 * x) - (t * x)) * 0.5
-        def easeOut(t):
-            return ((3 * t) - (t * t * t)) * 0.5
-        def easeInOut(t):
-            x = t*t
-            return (3 * x) - (2 * t * x)
-        def noBlend(t):
-            return t
         if (blendType == "easeIn"):
         if (blendType == "easeIn"):
-            #return LerpBlendHelpers.LerpBlendHelpers.easeIn
-            return easeIn
+            return LerpBlendHelpers.LerpBlendHelpers.easeIn
         elif (blendType == "easeOut"):
         elif (blendType == "easeOut"):
-            #return LerpBlendHelpers.LerpBlendHelpers.easeOut
-            return easeOut
+            return LerpBlendHelpers.LerpBlendHelpers.easeOut
         elif (blendType == "easeInOut"):
         elif (blendType == "easeInOut"):
-            #return LerpBlendHelpers.LerpBlendHelpers.easeInOut
-            return easeInOut
+            return LerpBlendHelpers.LerpBlendHelpers.easeInOut
         elif (blendType == "noBlend"):
         elif (blendType == "noBlend"):
-            #return LerpBlendHelpers.LerpBlendHelpers.noBlend
-            return noBlend
+            return LerpBlendHelpers.LerpBlendHelpers.noBlend
         else:
         else:
             raise Exception(
             raise Exception(
 		'Error: LerpInterval.__getBlend: Unknown blend type')
 		'Error: LerpInterval.__getBlend: Unknown blend type')