Skip to content

Commit b6bbcc9

Browse files
committed
Add animation toggle to the sample project
1 parent 3436d7d commit b6bbcc9

File tree

3 files changed

+31
-31
lines changed

3 files changed

+31
-31
lines changed

Sources/Meshin/Meshin.xcodeproj/project.pbxproj

+22-22
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
0ACF11DF2CC3CA11008D8E5C /* Inject in Frameworks */ = {isa = PBXBuildFile; productRef = 0ACF11DE2CC3CA11008D8E5C /* Inject */; };
11-
0ACF11E22CC3CA30008D8E5C /* MeshingKit in Frameworks */ = {isa = PBXBuildFile; productRef = 0ACF11E12CC3CA30008D8E5C /* MeshingKit */; };
10+
0A2DF7D82CC3D03400920005 /* MeshingKit in Frameworks */ = {isa = PBXBuildFile; productRef = 0A2DF7D72CC3D03400920005 /* MeshingKit */; };
11+
0A2DF7DB2CC3D07D00920005 /* Inject in Frameworks */ = {isa = PBXBuildFile; productRef = 0A2DF7DA2CC3D07D00920005 /* Inject */; };
1212
/* End PBXBuildFile section */
1313

1414
/* Begin PBXFileReference section */
@@ -28,8 +28,8 @@
2828
isa = PBXFrameworksBuildPhase;
2929
buildActionMask = 2147483647;
3030
files = (
31-
0ACF11DF2CC3CA11008D8E5C /* Inject in Frameworks */,
32-
0ACF11E22CC3CA30008D8E5C /* MeshingKit in Frameworks */,
31+
0A2DF7D82CC3D03400920005 /* MeshingKit in Frameworks */,
32+
0A2DF7DB2CC3D07D00920005 /* Inject in Frameworks */,
3333
);
3434
runOnlyForDeploymentPostprocessing = 0;
3535
};
@@ -72,8 +72,8 @@
7272
);
7373
name = Meshin;
7474
packageProductDependencies = (
75-
0ACF11DE2CC3CA11008D8E5C /* Inject */,
76-
0ACF11E12CC3CA30008D8E5C /* MeshingKit */,
75+
0A2DF7D72CC3D03400920005 /* MeshingKit */,
76+
0A2DF7DA2CC3D07D00920005 /* Inject */,
7777
);
7878
productName = Meshin;
7979
productReference = 0ACF11BF2CC3C99F008D8E5C /* Meshin.app */;
@@ -104,8 +104,8 @@
104104
mainGroup = 0ACF11B62CC3C99F008D8E5C;
105105
minimizedProjectReferenceProxies = 1;
106106
packageReferences = (
107-
0ACF11DD2CC3CA11008D8E5C /* XCRemoteSwiftPackageReference "Inject" */,
108-
0ACF11E02CC3CA30008D8E5C /* XCRemoteSwiftPackageReference "MeshingKit" */,
107+
0A2DF7D62CC3D03400920005 /* XCRemoteSwiftPackageReference "MeshingKit" */,
108+
0A2DF7D92CC3D07D00920005 /* XCRemoteSwiftPackageReference "Inject" */,
109109
);
110110
preferredProjectObjectVersion = 77;
111111
productRefGroup = 0ACF11C02CC3C99F008D8E5C /* Products */;
@@ -354,34 +354,34 @@
354354
/* End XCConfigurationList section */
355355

356356
/* Begin XCRemoteSwiftPackageReference section */
357-
0ACF11DD2CC3CA11008D8E5C /* XCRemoteSwiftPackageReference "Inject" */ = {
357+
0A2DF7D62CC3D03400920005 /* XCRemoteSwiftPackageReference "MeshingKit" */ = {
358358
isa = XCRemoteSwiftPackageReference;
359-
repositoryURL = "https://github.com/krzysztofzablocki/Inject";
359+
repositoryURL = "https://github.com/rryam/MeshingKit";
360360
requirement = {
361-
kind = upToNextMajorVersion;
362-
minimumVersion = 1.5.2;
361+
branch = main;
362+
kind = branch;
363363
};
364364
};
365-
0ACF11E02CC3CA30008D8E5C /* XCRemoteSwiftPackageReference "MeshingKit" */ = {
365+
0A2DF7D92CC3D07D00920005 /* XCRemoteSwiftPackageReference "Inject" */ = {
366366
isa = XCRemoteSwiftPackageReference;
367-
repositoryURL = "https://github.com/rryam/MeshingKit";
367+
repositoryURL = "https://github.com/krzysztofzablocki/Inject";
368368
requirement = {
369-
branch = main;
370-
kind = branch;
369+
kind = upToNextMajorVersion;
370+
minimumVersion = 1.5.2;
371371
};
372372
};
373373
/* End XCRemoteSwiftPackageReference section */
374374

375375
/* Begin XCSwiftPackageProductDependency section */
376-
0ACF11DE2CC3CA11008D8E5C /* Inject */ = {
376+
0A2DF7D72CC3D03400920005 /* MeshingKit */ = {
377377
isa = XCSwiftPackageProductDependency;
378-
package = 0ACF11DD2CC3CA11008D8E5C /* XCRemoteSwiftPackageReference "Inject" */;
379-
productName = Inject;
378+
package = 0A2DF7D62CC3D03400920005 /* XCRemoteSwiftPackageReference "MeshingKit" */;
379+
productName = MeshingKit;
380380
};
381-
0ACF11E12CC3CA30008D8E5C /* MeshingKit */ = {
381+
0A2DF7DA2CC3D07D00920005 /* Inject */ = {
382382
isa = XCSwiftPackageProductDependency;
383-
package = 0ACF11E02CC3CA30008D8E5C /* XCRemoteSwiftPackageReference "MeshingKit" */;
384-
productName = MeshingKit;
383+
package = 0A2DF7D92CC3D07D00920005 /* XCRemoteSwiftPackageReference "Inject" */;
384+
productName = Inject;
385385
};
386386
/* End XCSwiftPackageProductDependency section */
387387
};

Sources/Meshin/Meshin.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"originHash" : "a3b6befc9c60b97e2d9e9df58d9f700739f562662b7b6cf700c9dde7a7b18e3f",
2+
"originHash" : "a7e1058f960e76d7439d316f8d2baee5b4fec89d6b8fa43279215bc4f594d263",
33
"pins" : [
44
{
55
"identity" : "inject",
@@ -16,7 +16,7 @@
1616
"location" : "https://github.com/rryam/MeshingKit",
1717
"state" : {
1818
"branch" : "main",
19-
"revision" : "bbcac98d173daa9a21beb6d19e9ab25f2acb0cfa"
19+
"revision" : "3436d7d5652803103519897c5914e5a37007575a"
2020
}
2121
}
2222
],

Sources/Meshin/Meshin/GradientSamplesView.swift

+7-7
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,13 @@ struct FullScreenGradientView: View {
6767
var body: some View {
6868
ZStack {
6969
gradientView
70-
7170
VStack {
7271
Spacer()
72+
7373
Toggle("Animate", isOn: $showAnimation)
7474
.padding()
75-
.background(Color.white.opacity(0.7))
76-
.cornerRadius(8)
75+
.background(.ultraThinMaterial, in: .rect)
76+
7777
Button("Close") {
7878
presentationMode.wrappedValue.dismiss()
7979
}
@@ -91,23 +91,23 @@ struct FullScreenGradientView: View {
9191
AnimatedMeshGradientView(
9292
gridSize: 2,
9393
showAnimation: $showAnimation,
94-
positions: size2Template.positions,
94+
positions: size2Template.points,
9595
colors: size2Template.colors,
9696
background: size2Template.background
9797
)
9898
case .size3(let size3Template):
9999
AnimatedMeshGradientView(
100100
gridSize: 3,
101101
showAnimation: $showAnimation,
102-
positions: size3Template.positions,
102+
positions: size3Template.points,
103103
colors: size3Template.colors,
104104
background: size3Template.background
105105
)
106106
case .size4(let size4Template):
107107
AnimatedMeshGradientView(
108108
gridSize: 4,
109109
showAnimation: $showAnimation,
110-
positions: size4Template.positions,
110+
positions: size4Template.points,
111111
colors: size4Template.colors,
112112
background: size4Template.background
113113
)
@@ -119,4 +119,4 @@ struct GradientSamplesView_Previews: PreviewProvider {
119119
static var previews: some View {
120120
GradientSamplesView()
121121
}
122-
}
122+
}

0 commit comments

Comments
 (0)