Skip to content

Commit d7fd3f6

Browse files
poetmountainpoetmountain
committed
Updated to support Swift 3 release
1 parent 7f800c6 commit d7fd3f6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1464
-1461
lines changed

‎CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1+
#### 1.1.0
2+
Support for Swift 3.0.
3+
14
#### 1.0.0
25
Initial release

‎Classes/CATempo.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class CATempo : Tempo {
4747
public override init() {
4848
super.init()
4949
displayLink = CADisplayLink.init(target: self, selector: #selector(update))
50-
displayLink?.addToRunLoop(NSRunLoop.mainRunLoop(), forMode: NSRunLoopCommonModes)
50+
displayLink?.add(to: RunLoop.main, forMode: RunLoopMode(rawValue: RunLoopMode.commonModes.rawValue))
5151
}
5252

5353
deinit {

‎Classes/EasingTypes/EasingBack.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public struct EasingBack {
4242
*/
4343
public static func easeIn(overshoot over: Double=0.1) -> EasingUpdateClosure {
4444

45-
func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
45+
func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
4646
let time = elapsedTime / duration
4747
let overshoot = over * magic100
4848
let easing_value = valueRange * time*time*((overshoot + 1.0)*time - overshoot) + startValue
@@ -60,7 +60,7 @@ public struct EasingBack {
6060
*/
6161
public static func easeOut(overshoot over: Double=0.1) -> EasingUpdateClosure {
6262

63-
func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
63+
func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
6464
let time = elapsedTime / duration - 1
6565
let overshoot = over * magic100
6666
let easing_value = valueRange * (time*time * ((overshoot+1.0) * time + overshoot) + 1.0) + startValue
@@ -78,7 +78,7 @@ public struct EasingBack {
7878
*/
7979
public static func easeInOut(overshoot over: Double=0.1) -> EasingUpdateClosure {
8080

81-
func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
81+
func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
8282
var easing_value = 0.0
8383
var time = elapsedTime / (duration * 0.5)
8484
let overshoot = (over * magic100) * 1.525
@@ -97,4 +97,4 @@ public struct EasingBack {
9797
return easing
9898
}
9999

100-
}
100+
}

‎Classes/EasingTypes/EasingBounce.swift

+7-7
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ public struct EasingBounce {
3636

3737
public static func easeIn() -> EasingUpdateClosure {
3838

39-
func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
39+
func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
4040

4141
let easing_closure = EasingBounce.easeOut()
4242
let time = duration - elapsedTime
43-
let easing_value = valueRange - easing_closure(elapsedTime: time, startValue: 0.0, valueRange: valueRange, duration: duration) + startValue
43+
let easing_value = valueRange - easing_closure(time, 0.0, valueRange, duration) + startValue
4444

4545
return easing_value
4646
}
@@ -50,7 +50,7 @@ public struct EasingBounce {
5050

5151
public static func easeOut() -> EasingUpdateClosure {
5252

53-
func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
53+
func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
5454
var time = elapsedTime / duration
5555
let easing_value: Double
5656
if (time < (1/2.75)) {
@@ -74,14 +74,14 @@ public struct EasingBounce {
7474

7575
public static func easeInOut() -> EasingUpdateClosure {
7676

77-
func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
77+
func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
7878
let easing_value: Double
7979
let easing_closure = EasingBounce.easeOut()
8080

8181
if (elapsedTime < (duration * 0.5)) {
82-
easing_value = easing_closure(elapsedTime: (elapsedTime*2), startValue: 0, valueRange: valueRange, duration: duration) * 0.5 + startValue;
82+
easing_value = easing_closure((elapsedTime*2), 0, valueRange, duration) * 0.5 + startValue;
8383
} else {
84-
easing_value = easing_closure(elapsedTime: (elapsedTime*2-duration), startValue: 0, valueRange: valueRange, duration: duration) * 0.5 + (valueRange*0.5) + startValue;
84+
easing_value = easing_closure((elapsedTime*2-duration), 0, valueRange, duration) * 0.5 + (valueRange*0.5) + startValue;
8585
}
8686

8787

@@ -91,4 +91,4 @@ public struct EasingBounce {
9191
return easing
9292
}
9393

94-
}
94+
}

‎Classes/EasingTypes/EasingCircular.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public struct EasingCircular {
3333

3434
public static func easeIn() -> EasingUpdateClosure {
3535

36-
func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
36+
func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
3737
let time = elapsedTime / duration
3838
let easing_value = -valueRange * (sqrt(1 - time*time) - 1) + startValue
3939

@@ -45,7 +45,7 @@ public struct EasingCircular {
4545

4646
public static func easeOut() -> EasingUpdateClosure {
4747

48-
func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
48+
func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
4949
var time = elapsedTime / duration
5050
time -= 1
5151
let easing_value = valueRange * sqrt(1 - time*time) + startValue
@@ -58,7 +58,7 @@ public struct EasingCircular {
5858

5959
public static func easeInOut() -> EasingUpdateClosure {
6060

61-
func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
61+
func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
6262
var easing_value = 0.0
6363
var time = elapsedTime / (duration * 0.5)
6464

@@ -76,4 +76,4 @@ public struct EasingCircular {
7676
return easing
7777
}
7878

79-
}
79+
}

‎Classes/EasingTypes/EasingCubic.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public struct EasingCubic {
3333

3434
public static func easeIn() -> EasingUpdateClosure {
3535

36-
func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
36+
func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
3737
let time = elapsedTime / duration
3838
let easing_value = valueRange * (time*time*time) + startValue
3939

@@ -45,7 +45,7 @@ public struct EasingCubic {
4545

4646
public static func easeOut() -> EasingUpdateClosure {
4747

48-
func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
48+
func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
4949
var time = elapsedTime / duration
5050
time -= 1
5151
let easing_value = valueRange * (time*time*time + 1) + startValue
@@ -58,7 +58,7 @@ public struct EasingCubic {
5858

5959
public static func easeInOut() -> EasingUpdateClosure {
6060

61-
func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
61+
func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
6262
var time = elapsedTime / (duration * 0.5)
6363
var easing_value = 0.0
6464
if (time < 1) {
@@ -75,4 +75,4 @@ public struct EasingCubic {
7575
return easing
7676
}
7777

78-
}
78+
}

‎Classes/EasingTypes/EasingElastic.swift

+6-5
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public struct EasingElastic {
3535

3636
public static func easeIn() -> EasingUpdateClosure {
3737

38-
func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
38+
func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
3939
var time = elapsedTime
4040
var easing_value = 0.0
4141

@@ -63,7 +63,7 @@ public struct EasingElastic {
6363

6464
public static func easeOut() -> EasingUpdateClosure {
6565

66-
func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
66+
func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
6767
var time = elapsedTime
6868
var easing_value = 0.0
6969
if (time ≈≈ 0.0) {
@@ -89,7 +89,7 @@ public struct EasingElastic {
8989

9090
public static func easeInOut() -> EasingUpdateClosure {
9191

92-
func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
92+
func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
9393
var time = elapsedTime
9494
var easing_value = 0.0
9595

@@ -111,7 +111,8 @@ public struct EasingElastic {
111111
} else {
112112

113113
time -= 1
114-
easing_value = amplitude*pow(2, -10*time) * sin( (time*duration-overshoot) * M_PI2/period ) * 0.5 + valueRange + startValue
114+
easing_value = amplitude*pow(2, -10*time) * sin( (time*duration-overshoot) * M_PI2/period ) * 0.5
115+
easing_value += valueRange + startValue
115116
}
116117
}
117118

@@ -122,4 +123,4 @@ public struct EasingElastic {
122123
return easing
123124
}
124125

125-
}
126+
}

‎Classes/EasingTypes/EasingExpo.swift

+10-6
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public struct EasingExpo {
3333

3434
public static func easeIn() -> EasingUpdateClosure {
3535

36-
func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
36+
func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
3737
let easing_value = (elapsedTime == 0) ? startValue : valueRange * pow(2, 10 * (elapsedTime/duration - 1)) + startValue
3838

3939
return easing_value
@@ -44,9 +44,13 @@ public struct EasingExpo {
4444

4545
public static func easeOut() -> EasingUpdateClosure {
4646

47-
func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
48-
let easing_value = (elapsedTime == duration) ? startValue+valueRange : valueRange * (-pow(2, -10 * elapsedTime/duration) + 1) + startValue
49-
47+
func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
48+
var easing_value = 0.0
49+
if (elapsedTime == duration) {
50+
easing_value = startValue+valueRange
51+
} else {
52+
easing_value = valueRange * (-pow(2, -10 * elapsedTime/duration) + 1) + startValue
53+
}
5054
return easing_value
5155
}
5256

@@ -55,7 +59,7 @@ public struct EasingExpo {
5559

5660
public static func easeInOut() -> EasingUpdateClosure {
5761

58-
func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
62+
func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
5963
var easing_value = 0.0
6064
var time = elapsedTime
6165

@@ -83,4 +87,4 @@ public struct EasingExpo {
8387
return easing
8488
}
8589

86-
}
90+
}

‎Classes/EasingTypes/EasingLinear.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public struct EasingLinear {
3333

3434
public static func easeNone() -> EasingUpdateClosure {
3535

36-
func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
36+
func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
3737
let easing_value = valueRange * (elapsedTime / duration) + startValue
3838

3939
return easing_value

‎Classes/EasingTypes/EasingQuadratic.swift

+5-5
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public struct EasingQuadratic {
3333

3434
public static func easeIn() -> EasingUpdateClosure {
3535

36-
func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
36+
func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
3737
let easing_value = valueRange * (elapsedTime*elapsedTime) / (duration*duration) + startValue
3838

3939
return easing_value
@@ -44,8 +44,8 @@ public struct EasingQuadratic {
4444

4545
public static func easeOut() -> EasingUpdateClosure {
4646

47-
func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
48-
let easing_value = -valueRange * (elapsedTime*elapsedTime) / (duration*duration) + 2*valueRange*elapsedTime/duration + startValue
47+
func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
48+
let easing_value = -valueRange * ((elapsedTime*elapsedTime) / (duration*duration)) + (2*valueRange * (elapsedTime/duration)) + startValue
4949

5050
return easing_value
5151
}
@@ -55,7 +55,7 @@ public struct EasingQuadratic {
5555

5656
public static func easeInOut() -> EasingUpdateClosure {
5757

58-
func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
58+
func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
5959
let easing_value: Double
6060
if (elapsedTime < duration*0.5) {
6161
easing_value = 2*valueRange * (elapsedTime*elapsedTime) / (duration*duration) + startValue
@@ -70,4 +70,4 @@ public struct EasingQuadratic {
7070
return easing
7171
}
7272

73-
}
73+
}

‎Classes/EasingTypes/EasingQuartic.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public struct EasingQuartic {
3333

3434
public static func easeIn() -> EasingUpdateClosure {
3535

36-
func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
36+
func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
3737
let time = elapsedTime / duration
3838
let easing_value = valueRange * (time*time*time*time) + startValue
3939

@@ -45,7 +45,7 @@ public struct EasingQuartic {
4545

4646
public static func easeOut() -> EasingUpdateClosure {
4747

48-
func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
48+
func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
4949
var time = elapsedTime / duration
5050
time -= 1
5151
let easing_value = -valueRange * (time*time*time*time - 1) + startValue
@@ -58,7 +58,7 @@ public struct EasingQuartic {
5858

5959
public static func easeInOut() -> EasingUpdateClosure {
6060

61-
func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
61+
func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
6262
var time = elapsedTime / (duration * 0.5)
6363

6464
var easing_value = 0.0

‎Classes/EasingTypes/EasingQuintic.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public struct EasingQuintic {
3333

3434
public static func easeIn() -> EasingUpdateClosure {
3535

36-
func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
36+
func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
3737
let time = elapsedTime / duration
3838
let easing_value = valueRange * (time*time*time*time*time) + startValue
3939

@@ -45,7 +45,7 @@ public struct EasingQuintic {
4545

4646
public static func easeOut() -> EasingUpdateClosure {
4747

48-
func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
48+
func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
4949
var time = elapsedTime / duration
5050
time -= 1
5151
let easing_value = valueRange * (time*time*time*time*time + 1) + startValue
@@ -58,7 +58,7 @@ public struct EasingQuintic {
5858

5959
public static func easeInOut() -> EasingUpdateClosure {
6060

61-
func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
61+
func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
6262
var time = elapsedTime / (duration * 0.5)
6363

6464
var easing_value = 0.0
@@ -76,4 +76,4 @@ public struct EasingQuintic {
7676
return easing
7777
}
7878

79-
}
79+
}

‎Classes/EasingTypes/EasingSine.swift

+6-5
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public struct EasingSine {
3333

3434
public static func easeIn() -> EasingUpdateClosure {
3535

36-
func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
36+
func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
3737
let easing_value = -valueRange * cos((elapsedTime / duration) * M_PI_2) + valueRange + startValue
3838

3939
return easing_value
@@ -44,7 +44,7 @@ public struct EasingSine {
4444

4545
public static func easeOut() -> EasingUpdateClosure {
4646

47-
func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
47+
func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
4848
let easing_value = valueRange * sin((elapsedTime / duration) * M_PI_2) + startValue
4949

5050
return easing_value
@@ -55,13 +55,14 @@ public struct EasingSine {
5555

5656
public static func easeInOut() -> EasingUpdateClosure {
5757

58-
func easing (elapsedTime: NSTimeInterval, startValue: Double, valueRange: Double, duration: NSTimeInterval) -> Double {
59-
let easing_value = (-valueRange * 0.5) * (cos(M_PI * (elapsedTime / duration)) - 1) + startValue
58+
func easing (_ elapsedTime: TimeInterval, startValue: Double, valueRange: Double, duration: TimeInterval) -> Double {
59+
var easing_value = (-valueRange * 0.5) * (cos(M_PI * (elapsedTime / duration)) - 1)
60+
easing_value += startValue
6061

6162
return easing_value
6263
}
6364

6465
return easing
6566
}
6667

67-
}
68+
}

0 commit comments

Comments
 (0)