Skip to content
This repository was archived by the owner on Jun 23, 2023. It is now read-only.

Commit 90cb574

Browse files
authored
Merge pull request #69 from seIncorp/patch-2
Some changes for more easy to read the code.
2 parents 19970ce + 64db782 commit 90cb574

File tree

1 file changed

+17
-15
lines changed

1 file changed

+17
-15
lines changed

src/Easing.js

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const Easing = {
1515

1616
Quadratic: {
1717
In (k) {
18-
return k * k
18+
return Math.pow(k, 2)
1919
},
2020

2121
Out (k) {
@@ -24,7 +24,7 @@ const Easing = {
2424

2525
InOut (k) {
2626
if ((k *= 2) < 1) {
27-
return 0.5 * k * k
27+
return 0.5 * Math.pow(k, 2)
2828
}
2929

3030
return -0.5 * (--k * (k - 2) - 1)
@@ -33,7 +33,7 @@ const Easing = {
3333

3434
Cubic: {
3535
In (k) {
36-
return k * k * k
36+
return Math.pow(k, 3)
3737
},
3838

3939
Out (k) {
@@ -42,7 +42,7 @@ const Easing = {
4242

4343
InOut (k) {
4444
if ((k *= 2) < 1) {
45-
return 0.5 * k * k * k
45+
return 0.5 * Math.pow(k, 3)
4646
}
4747

4848
return 0.5 * ((k -= 2) * k * k + 2)
@@ -51,7 +51,7 @@ const Easing = {
5151

5252
Quartic: {
5353
In (k) {
54-
return k * k * k * k
54+
return Math.pow(k, 4)
5555
},
5656

5757
Out (k) {
@@ -60,7 +60,7 @@ const Easing = {
6060

6161
InOut (k) {
6262
if ((k *= 2) < 1) {
63-
return 0.5 * k * k * k * k
63+
return 0.5 * Math.pow(k, 4)
6464
}
6565

6666
return -0.5 * ((k -= 2) * k * k * k - 2)
@@ -69,7 +69,7 @@ const Easing = {
6969

7070
Quintic: {
7171
In (k) {
72-
return k * k * k * k * k
72+
return Math.pow(k, 5)
7373
},
7474

7575
Out (k) {
@@ -78,7 +78,7 @@ const Easing = {
7878

7979
InOut (k) {
8080
if ((k *= 2) < 1) {
81-
return 0.5 * k * k * k * k * k
81+
return 0.5 * Math.pow(k, 5)
8282
}
8383

8484
return 0.5 * ((k -= 2) * k * k * k * k + 2)
@@ -221,14 +221,16 @@ const Easing = {
221221
},
222222

223223
Out (k) {
224-
if (k < 1 / 2.75) {
225-
return 7.5625 * k * k
226-
} else if (k < 2 / 2.75) {
227-
return 7.5625 * (k -= 1.5 / 2.75) * k + 0.75
228-
} else if (k < 2.5 / 2.75) {
229-
return 7.5625 * (k -= 2.25 / 2.75) * k + 0.9375
224+
let x = 2.75
225+
let y = 7.5625
226+
if (k < 1 / x) {
227+
return y * k * k
228+
} else if (k < 2 / x) {
229+
return y * (k -= 1.5 / x) * k + 0.75
230+
} else if (k < 2.5 / x) {
231+
return y * (k -= 2.25 / x) * k + 0.9375
230232
} else {
231-
return 7.5625 * (k -= 2.625 / 2.75) * k + 0.984375
233+
return y * (k -= 2.625 / x) * k + 0.984375
232234
}
233235
},
234236

0 commit comments

Comments
 (0)