Merge pull request #31 from yuriks/master

Fixed Easing.exponential.easeOut
oddgames · Nov 9, 2011 · 8ab449a · 8ab449a
2 parents 5a03ee7 + 77404ae
commit 8ab449a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Assets/Plugins/UIToolkit/UIAnimation/Easing.cs b/Assets/Plugins/UIToolkit/UIAnimation/Easing.cs
@@ -107,7 +107,7 @@ public static float easeIn( float t )
 
 		public static float easeOut( float t )
 		{
-			return ( Mathf.Pow( 2, -10 * t ) + 1 ) * -1;
+			return 1 - Mathf.Pow( 2, -10 * t );
 		}
 
 
@@ -116,7 +116,7 @@ public static float easeInOut( float t )
 			if( t <= 0.5f )
 				return Exponential.easeIn( t * 2 ) / 2;
 			else
-				return ( Exponential.easeOut( ( t - 0.5f ) * 2.0f ) / 2 ) + 0.5f;
+				return Exponential.easeOut( t * 2 - 1 ) / 2 + 0.5f;
 		}
 	}