Skip to content

Commit 4adfe62

Browse files
committed
Update piecewiseLinear demo
1 parent 83c0d8d commit 4adfe62

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

Demo/Demo/EasingDemo.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ struct EasingDemoItem {
1111
static let allItems = [
1212
EasingDemoItem(name: "linear", easing: .linear),
1313
EasingDemoItem(
14-
name: "piecewiseLinear(0, 1@0.6, 0)",
14+
name: "piecewiseLinear(0, 0.25@0.75, 1)", // linear(0, 0.25 75%, 1)
1515
easing: .piecewiseLinear([
16-
PiecewiseLinearStop(0, at: 0),
17-
PiecewiseLinearStop(1, at: 0.6),
18-
PiecewiseLinearStop(0, at: 1),
16+
PiecewiseLinearStop(0), // implicit 0%
17+
PiecewiseLinearStop(0.25, at: 0.75), // 75%
18+
PiecewiseLinearStop(1) // implicit 100%
1919
])
2020
),
2121
EasingDemoItem(
4.45 KB
Loading
Binary file not shown.

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,14 @@ view.transform = startTransform.interpolate(to: endTransform,
8585

8686
### Piecewise linear (CSS `linear()` style)
8787

88+
CSS `linear(0, 0.25 75%, 1)` translates to:
89+
8890
```swift
8991
let easing = Easing.piecewiseLinear([
90-
PiecewiseLinearStop(0), // x defaults to 0
91-
PiecewiseLinearStop(1, at: 0.6), // explicit stop position
92-
PiecewiseLinearStop(0) // x defaults to 1
92+
PiecewiseLinearStop(0), // x defaults to 0
93+
PiecewiseLinearStop(0.25, at: 0.75), // explicit stop position
94+
PiecewiseLinearStop(1) // x defaults to 1
9395
])
94-
95-
let value = easing.calculate(0.75)
9696
```
9797

9898
### Spring
@@ -111,10 +111,10 @@ let customSpring = Easing.spring(
111111

112112
## Reference
113113

114-
| Easing | Curve |
114+
| Easing | |
115115
| :---------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------: |
116116
| `.linear` | <img src="Demo/Ref/ReferenceImages_64/DemoTests.EasingDemoTests/test_linear@3x.png" width="100"/> |
117-
| `.piecewiseLinear(0, 1@0.6, 0)` | <img src="Demo/Ref/ReferenceImages_64/DemoTests.EasingDemoTests/test_piecewiseLinear_0__1_0_6__0_@3x.png" width="100"/> |
117+
| `.piecewiseLinear(0, 0.25@0.75, 1)` | <img src="Demo/Ref/ReferenceImages_64/DemoTests.EasingDemoTests/test_piecewiseLinear_0__0_25_0_75__1_@3x.png" width="100"/> |
118118
| `.piecewiseLinear(spring)` | <img src="Demo/Ref/ReferenceImages_64/DemoTests.EasingDemoTests/test_piecewiseLinear_spring_@3x.png" width="100"/> |
119119
| `.spring(.swiftUISpring)` | <img src="Demo/Ref/ReferenceImages_64/DemoTests.EasingDemoTests/test_spring__swiftUISpring_@3x.png" width="100"/> |
120120
| `.spring(.swiftUIInteractiveSpring)` | <img src="Demo/Ref/ReferenceImages_64/DemoTests.EasingDemoTests/test_spring__swiftUIInteractiveSpring_@3x.png" width="100"/> |

0 commit comments

Comments
 (0)