added ability to toggle standard deltaTime and unscaledDeltaTime

Amitkapadi · Dec 26, 2014 · 73c7072 · 73c7072
1 parent 3832dcc
commit 73c7072
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 10 deletions.
diff --git a/Assets/TransitionKit/TransitionKit.cs b/Assets/TransitionKit/TransitionKit.cs
@@ -40,6 +40,20 @@ public class TransitionKit : MonoBehaviour
 		/// </summary>
 		public Material material;
 
+		/// <summary>
+		/// sets whether TransitionKit will use unscaledDeltaTime or standard deltaTime
+		/// </summary>
+		public bool useUnscaledDeltaTime = false;
+
+		/// <summary>
+		/// helper property for use by all TransitionKitDelegates so they use the proper deltaTime
+		/// </summary>
+		/// <value>The delta time.</value>
+		public float deltaTime
+		{
+			get { return useUnscaledDeltaTime ? Time.unscaledDeltaTime : Time.deltaTime; }
+		}
+
 
 		/// <summary>
 		/// holds the instance while we are transitioning
@@ -246,7 +260,7 @@ public IEnumerator tickProgressPropertyInMaterial( float duration, bool reverseD
 			var elapsed = 0f;
 			while( elapsed < duration )
 			{
-				elapsed += Time.deltaTime;
+				elapsed += deltaTime;
 				var step = Mathf.Lerp( start, end, Mathf.Pow( elapsed / duration, 2f ) );
 				material.SetFloat( "_Progress", step );
 

diff --git a/Assets/TransitionKit/transitions/BlurTransition.cs b/Assets/TransitionKit/transitions/BlurTransition.cs
@@ -43,7 +43,7 @@ public IEnumerator onScreenObscured( TransitionKit transitionKit )
 			var elapsed = 0f;
 			while( elapsed < duration )
 			{
-				elapsed += Time.deltaTime;
+				elapsed += transitionKit.deltaTime;
 				var step = Mathf.Pow( elapsed / duration, 2f );
 				var blurAmount = Mathf.Lerp( blurMin, blurMax, step );
 

diff --git a/Assets/TransitionKit/transitions/PixelateTransition.cs b/Assets/TransitionKit/transitions/PixelateTransition.cs
@@ -59,7 +59,7 @@ public IEnumerator onScreenObscured( TransitionKit transitionKit )
 			var elapsed = 0f;
 			while( elapsed < duration )
 			{
-				elapsed += Time.deltaTime;
+				elapsed += transitionKit.deltaTime;
 				var step = Mathf.Pow( elapsed / duration, 2f );
 				transitionKit.material.SetFloat( "_CellSize", Mathf.Lerp( startValue, endValue, step ) );
 
@@ -90,22 +90,22 @@ public IEnumerator onScreenObscured( TransitionKit transitionKit )
 					break;
 			}
 
-			yield return transitionKit.StartCoroutine( animateScale( transitionKit.transform, duration * 0.5f, desiredScale ) );
+			yield return transitionKit.StartCoroutine( animateScale( transitionKit, duration * 0.5f, desiredScale ) );
 		}
 
 		#endregion
 
 
-		public IEnumerator animateScale( Transform transform, float duration, Vector3 desiredScale )
+		public IEnumerator animateScale( TransitionKit transitionKit, float duration, Vector3 desiredScale )
 		{
-			var originalScale = transform.localScale;
+			var originalScale = transitionKit.transform.localScale;
 
 			var elapsed = 0f;
 			while( elapsed < duration )
 			{
-				elapsed += Time.deltaTime;
+				elapsed += transitionKit.deltaTime;
 				var step = Mathf.Pow( elapsed / duration, 2f );
-				transform.localScale = Vector3.Lerp( originalScale, desiredScale, step );
+				transitionKit.transform.localScale = Vector3.Lerp( originalScale, desiredScale, step );
 
 				yield return null;
 			}

diff --git a/Assets/TransitionKit/transitions/TriangleSlicesTransition.cs b/Assets/TransitionKit/transitions/TriangleSlicesTransition.cs
@@ -142,7 +142,7 @@ public IEnumerator onScreenObscured( TransitionKit transitionKit )
 
 			while( elapsed < duration )
 			{
-				elapsed += Time.deltaTime;
+				elapsed += transitionKit.deltaTime;
 				var step = Mathf.Pow( elapsed / duration, 2f );
 				var offset = Mathf.Lerp( 0, transitionDistance, step );
 

diff --git a/Assets/TransitionKit/transitions/VerticalSlicesTransition.cs b/Assets/TransitionKit/transitions/VerticalSlicesTransition.cs
@@ -135,7 +135,7 @@ public IEnumerator onScreenObscured( TransitionKit transitionKit )
 
 			while( elapsed < duration )
 			{
-				elapsed += Time.deltaTime;
+				elapsed += transitionKit.deltaTime;
 				var step = Mathf.Pow( elapsed / duration, 2f );
 				var offset = Mathf.Lerp( 0, transitionDistance, step );