Updated to support Swift 3 release

poetmountain · Sep 15, 2016 · d7fd3f6 · d7fd3f6
1 parent 7f800c6
commit d7fd3f6
Show file tree

Hide file tree

Showing 51 changed files with 1,464 additions and 1,461 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,2 +1,5 @@
+#### 1.1.0
+Support for Swift 3.0.
+
 #### 1.0.0
 Initial release
diff --git a/Classes/CATempo.swift b/Classes/CATempo.swift
@@ -47,7 +47,7 @@ public class CATempo : Tempo {
     public override init() {
         super.init()
         displayLink = CADisplayLink.init(target: self, selector: #selector(update))
-        displayLink?.addToRunLoop(NSRunLoop.mainRunLoop(), forMode: NSRunLoopCommonModes)
+        displayLink?.add(to: RunLoop.main, forMode: RunLoopMode(rawValue: RunLoopMode.commonModes.rawValue))
     }
 
     deinit {

diff --git a/Classes/EasingTypes/EasingBack.swift b/Classes/EasingTypes/EasingBack.swift
@@ -42,7 +42,7 @@ public struct EasingBack {
      */
     public static func easeIn(overshoot over: Double=0.1) -> EasingUpdateClosure {
 
-        func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
+        func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
             let time = elapsedTime / duration
             let overshoot = over * magic100
             let easing_value = valueRange * time*time*((overshoot + 1.0)*time - overshoot) + startValue
@@ -60,7 +60,7 @@ public struct EasingBack {
      */
     public static func easeOut(overshoot over: Double=0.1) -> EasingUpdateClosure {
 
-        func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
+        func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
             let time = elapsedTime / duration - 1
             let overshoot = over * magic100
             let easing_value = valueRange * (time*time * ((overshoot+1.0) * time + overshoot) + 1.0) + startValue
@@ -78,7 +78,7 @@ public struct EasingBack {
      */
     public static func easeInOut(overshoot over: Double=0.1) -> EasingUpdateClosure {
 
-        func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
+        func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
             var easing_value = 0.0
             var time = elapsedTime / (duration * 0.5)
             let overshoot = (over * magic100) * 1.525
@@ -97,4 +97,4 @@ public struct EasingBack {
         return easing
     }
 
-}
+}
diff --git a/Classes/EasingTypes/EasingBounce.swift b/Classes/EasingTypes/EasingBounce.swift
@@ -36,11 +36,11 @@ public struct EasingBounce {
 
     public static func easeIn() -> EasingUpdateClosure {
 
-        func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
+        func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
 
             let easing_closure = EasingBounce.easeOut()
             let time = duration - elapsedTime
-            let easing_value = valueRange - easing_closure(elapsedTime: time, startValue: 0.0, valueRange: valueRange, duration: duration) + startValue
+            let easing_value = valueRange - easing_closure(time, 0.0, valueRange, duration) + startValue
 
             return easing_value
         }
@@ -50,7 +50,7 @@ public struct EasingBounce {
 
     public static func easeOut() -> EasingUpdateClosure {
 
-        func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
+        func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
             var time = elapsedTime / duration
             let easing_value: Double
             if (time < (1/2.75)) {
@@ -74,14 +74,14 @@ public struct EasingBounce {
 
     public static func easeInOut() -> EasingUpdateClosure {
 
-        func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
+        func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
             let easing_value: Double
             let easing_closure = EasingBounce.easeOut()
 
             if (elapsedTime < (duration * 0.5)) {
-                easing_value = easing_closure(elapsedTime: (elapsedTime*2), startValue: 0, valueRange: valueRange, duration: duration) * 0.5 + startValue;
+                easing_value = easing_closure((elapsedTime*2), 0, valueRange, duration) * 0.5 + startValue;
             } else {
-                easing_value = easing_closure(elapsedTime: (elapsedTime*2-duration), startValue: 0, valueRange: valueRange, duration: duration) * 0.5 + (valueRange*0.5) + startValue;
+                easing_value = easing_closure((elapsedTime*2-duration), 0, valueRange, duration) * 0.5 + (valueRange*0.5) + startValue;
             }
 
 
@@ -91,4 +91,4 @@ public struct EasingBounce {
         return easing
     }
 
-}
+}
diff --git a/Classes/EasingTypes/EasingCircular.swift b/Classes/EasingTypes/EasingCircular.swift
@@ -33,7 +33,7 @@ public struct EasingCircular {
 
     public static func easeIn() -> EasingUpdateClosure {
 
-        func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
+        func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
             let time = elapsedTime / duration
             let easing_value = -valueRange * (sqrt(1 - time*time) - 1) + startValue
 
@@ -45,7 +45,7 @@ public struct EasingCircular {
 
     public static func easeOut() -> EasingUpdateClosure {
 
-        func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
+        func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
             var time = elapsedTime / duration
             time -= 1
             let easing_value = valueRange * sqrt(1 - time*time) + startValue
@@ -58,7 +58,7 @@ public struct EasingCircular {
 
     public static func easeInOut() -> EasingUpdateClosure {
 
-        func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
+        func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
             var easing_value = 0.0
             var time = elapsedTime / (duration * 0.5)
 
@@ -76,4 +76,4 @@ public struct EasingCircular {
         return easing
     }
 
-}
+}
diff --git a/Classes/EasingTypes/EasingCubic.swift b/Classes/EasingTypes/EasingCubic.swift
@@ -33,7 +33,7 @@ public struct EasingCubic {
 
     public static func easeIn() -> EasingUpdateClosure {
 
-        func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
+        func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
             let time = elapsedTime / duration
             let easing_value = valueRange * (time*time*time) + startValue
 
@@ -45,7 +45,7 @@ public struct EasingCubic {
 
     public static func easeOut() -> EasingUpdateClosure {
 
-        func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
+        func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
             var time = elapsedTime / duration
             time -= 1
             let easing_value = valueRange * (time*time*time + 1) + startValue
@@ -58,7 +58,7 @@ public struct EasingCubic {
 
     public static func easeInOut() -> EasingUpdateClosure {
 
-        func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
+        func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
             var time = elapsedTime / (duration * 0.5)
             var easing_value = 0.0
             if (time < 1) {
@@ -75,4 +75,4 @@ public struct EasingCubic {
         return easing
     }
 
-}
+}
diff --git a/Classes/EasingTypes/EasingElastic.swift b/Classes/EasingTypes/EasingElastic.swift
@@ -35,7 +35,7 @@ public struct EasingElastic {
 
     public static func easeIn() -> EasingUpdateClosure {
 
-        func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
+        func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
             var time = elapsedTime
             var easing_value = 0.0
 
@@ -63,7 +63,7 @@ public struct EasingElastic {
 
     public static func easeOut() -> EasingUpdateClosure {
 
-        func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
+        func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
             var time = elapsedTime
             var easing_value = 0.0
             if (time ≈≈ 0.0) {
@@ -89,7 +89,7 @@ public struct EasingElastic {
 
     public static func easeInOut() -> EasingUpdateClosure {
 
-        func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
+        func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
             var time = elapsedTime
             var easing_value = 0.0
 
@@ -111,7 +111,8 @@ public struct EasingElastic {
                 } else {
 
                     time -= 1
-                    easing_value = amplitude*pow(2, -10*time) * sin( (time*duration-overshoot) * M_PI2/period ) * 0.5 + valueRange + startValue
+                    easing_value = amplitude*pow(2, -10*time) * sin( (time*duration-overshoot) * M_PI2/period ) * 0.5
+                    easing_value += valueRange + startValue
                 }
             }
 
@@ -122,4 +123,4 @@ public struct EasingElastic {
         return easing
     }
 
-}
+}
diff --git a/Classes/EasingTypes/EasingExpo.swift b/Classes/EasingTypes/EasingExpo.swift
@@ -33,7 +33,7 @@ public struct EasingExpo {
 
     public static func easeIn() -> EasingUpdateClosure {
 
-        func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
+        func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
             let easing_value = (elapsedTime == 0) ? startValue : valueRange * pow(2, 10 * (elapsedTime/duration - 1)) + startValue
 
             return easing_value
@@ -44,9 +44,13 @@ public struct EasingExpo {
 
     public static func easeOut() -> EasingUpdateClosure {
 
-        func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
-            let easing_value = (elapsedTime == duration) ? startValue+valueRange : valueRange * (-pow(2, -10 * elapsedTime/duration) + 1) + startValue
-
+        func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
+            var easing_value = 0.0
+            if (elapsedTime == duration) {
+                easing_value = startValue+valueRange
+            } else {
+                easing_value = valueRange * (-pow(2, -10 * elapsedTime/duration) + 1) + startValue
+            }
             return easing_value
         }
 
@@ -55,7 +59,7 @@ public struct EasingExpo {
 
     public static func easeInOut() -> EasingUpdateClosure {
 
-        func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
+        func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
             var easing_value = 0.0
             var time = elapsedTime
 
@@ -83,4 +87,4 @@ public struct EasingExpo {
         return easing
     }
 
-}
+}
diff --git a/Classes/EasingTypes/EasingLinear.swift b/Classes/EasingTypes/EasingLinear.swift
@@ -33,7 +33,7 @@ public struct EasingLinear {
 
     public static func easeNone() -> EasingUpdateClosure {
 
-        func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
+        func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
             let easing_value = valueRange * (elapsedTime / duration) + startValue
 
             return easing_value

diff --git a/Classes/EasingTypes/EasingQuadratic.swift b/Classes/EasingTypes/EasingQuadratic.swift
@@ -33,7 +33,7 @@ public struct EasingQuadratic {
 
     public static func easeIn() -> EasingUpdateClosure {
 
-        func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
+        func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
             let easing_value = valueRange * (elapsedTime*elapsedTime) / (duration*duration) + startValue
 
             return easing_value
@@ -44,8 +44,8 @@ public struct EasingQuadratic {
 
     public static func easeOut() -> EasingUpdateClosure {
 
-        func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
-            let easing_value = -valueRange * (elapsedTime*elapsedTime) / (duration*duration) + 2*valueRange*elapsedTime/duration + startValue
+        func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
+            let easing_value = -valueRange * ((elapsedTime*elapsedTime) / (duration*duration)) + (2*valueRange * (elapsedTime/duration)) + startValue
 
             return easing_value
         }
@@ -55,7 +55,7 @@ public struct EasingQuadratic {
 
     public static func easeInOut() -> EasingUpdateClosure {
 
-        func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
+        func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
             let easing_value: Double
             if (elapsedTime < duration*0.5) {
                 easing_value = 2*valueRange * (elapsedTime*elapsedTime) / (duration*duration) + startValue
@@ -70,4 +70,4 @@ public struct EasingQuadratic {
         return easing
     }
 
-}
+}
diff --git a/Classes/EasingTypes/EasingQuartic.swift b/Classes/EasingTypes/EasingQuartic.swift
@@ -33,7 +33,7 @@ public struct EasingQuartic {
 
     public static func easeIn() -> EasingUpdateClosure {
 
-        func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
+        func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
             let time = elapsedTime / duration
             let easing_value = valueRange * (time*time*time*time) + startValue
 
@@ -45,7 +45,7 @@ public struct EasingQuartic {
 
     public static func easeOut() -> EasingUpdateClosure {
 
-        func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
+        func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
             var time = elapsedTime / duration
             time -= 1
             let easing_value = -valueRange * (time*time*time*time - 1) + startValue
@@ -58,7 +58,7 @@ public struct EasingQuartic {
 
     public static func easeInOut() -> EasingUpdateClosure {
 
-        func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
+        func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
             var time = elapsedTime / (duration * 0.5)
 
             var easing_value = 0.0

diff --git a/Classes/EasingTypes/EasingQuintic.swift b/Classes/EasingTypes/EasingQuintic.swift
@@ -33,7 +33,7 @@ public struct EasingQuintic {
 
     public static func easeIn() -> EasingUpdateClosure {
 
-        func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
+        func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
             let time = elapsedTime / duration
             let easing_value = valueRange * (time*time*time*time*time) + startValue
 
@@ -45,7 +45,7 @@ public struct EasingQuintic {
 
     public static func easeOut() -> EasingUpdateClosure {
 
-        func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
+        func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
             var time = elapsedTime / duration
             time -= 1
             let easing_value = valueRange * (time*time*time*time*time + 1) + startValue
@@ -58,7 +58,7 @@ public struct EasingQuintic {
 
     public static func easeInOut() -> EasingUpdateClosure {
 
-        func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
+        func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
             var time = elapsedTime / (duration * 0.5)
 
             var easing_value = 0.0
@@ -76,4 +76,4 @@ public struct EasingQuintic {
         return easing
     }
 
-}
+}
diff --git a/Classes/EasingTypes/EasingSine.swift b/Classes/EasingTypes/EasingSine.swift
@@ -33,7 +33,7 @@ public struct EasingSine {
 
     public static func easeIn() -> EasingUpdateClosure {
 
-        func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
+        func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
             let easing_value = -valueRange * cos((elapsedTime / duration) * M_PI_2) + valueRange + startValue
 
             return easing_value
@@ -44,7 +44,7 @@ public struct EasingSine {
 
     public static func easeOut() -> EasingUpdateClosure {
 
-        func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
+        func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
             let easing_value = valueRange * sin((elapsedTime / duration) * M_PI_2) + startValue
 
             return easing_value
@@ -55,13 +55,14 @@ public struct EasingSine {
 
     public static func easeInOut() -> EasingUpdateClosure {
 
-        func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
-            let easing_value = (-valueRange * 0.5) * (cos(M_PI * (elapsedTime / duration)) - 1) + startValue
+        func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
+            var easing_value = (-valueRange * 0.5) * (cos(M_PI * (elapsedTime / duration)) - 1)
+            easing_value += startValue
 
             return easing_value
         }
 
         return easing
     }
 
-}
+}