git.iko.soy/metal-metaballs
on master help sign in
Merge branch 'dev'
b88fbfcVinicius Vendramini
PixelImage.xcodeproj/project.pbxproj+48−189
compare with master
unifiedsplit
@@ -24,38 +24,13 @@
24 24ED21CD1C6C2397009C40FC /* MetaballDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24ED21CC1C6C2397009C40FC /* MetaballDataSource.swift */; };
24 24ED21CD1C6C2397009C40FC /* MetaballDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24ED21CC1C6C2397009C40FC /* MetaballDataSource.swift */; };
25 24FC38341C7F931E0085C04A /* Metaball.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24FC38331C7F931E0085C04A /* Metaball.swift */; };
25 24FC38341C7F931E0085C04A /* Metaball.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24FC38331C7F931E0085C04A /* Metaball.swift */; };
26 24FC38361C7F9ABE0085C04A /* Dispatch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24FC38351C7F9ABE0085C04A /* Dispatch.swift */; };
26 24FC38361C7F9ABE0085C04A /* Dispatch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24FC38351C7F9ABE0085C04A /* Dispatch.swift */; };
27− 24FFA86B1C6BA038005ACD60 /* ApproximationOperator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24FFA84C1C6BA038005ACD60 /* ApproximationOperator.swift */; };
28− 24FFA86C1C6BA038005ACD60 /* Collections.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24FFA84D1C6BA038005ACD60 /* Collections.swift */; };
29− 24FFA86D1C6BA038005ACD60 /* ComparatorChains.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24FFA84E1C6BA038005ACD60 /* ComparatorChains.swift */; };
30− 24FFA86E1C6BA038005ACD60 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24FFA84F1C6BA038005ACD60 /* Dictionary.swift */; };
31− 24FFA86F1C6BA038005ACD60 /* NSNumber.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24FFA8511C6BA038005ACD60 /* NSNumber.swift */; };
32 24FFA8701C6BA038005ACD60 /* Numeric.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24FFA8521C6BA038005ACD60 /* Numeric.swift */; };
27 24FFA8701C6BA038005ACD60 /* Numeric.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24FFA8521C6BA038005ACD60 /* Numeric.swift */; };
33 24FFA8711C6BA038005ACD60 /* PowerOperator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24FFA8531C6BA038005ACD60 /* PowerOperator.swift */; };
28 24FFA8711C6BA038005ACD60 /* PowerOperator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24FFA8531C6BA038005ACD60 /* PowerOperator.swift */; };
34− 24FFA8721C6BA038005ACD60 /* Sequence.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24FFA8541C6BA038005ACD60 /* Sequence.swift */; };
35− 24FFA8731C6BA038005ACD60 /* Memoize.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24FFA8561C6BA038005ACD60 /* Memoize.swift */; };
36− 24FFA8741C6BA038005ACD60 /* SignOperator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24FFA8571C6BA038005ACD60 /* SignOperator.swift */; };
37− 24FFA8751C6BA038005ACD60 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24FFA8581C6BA038005ACD60 /* String.swift */; };
38− 24FFA8761C6BA038005ACD60 /* Categorise.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24FFA85A1C6BA038005ACD60 /* Categorise.swift */; };
39− 24FFA8771C6BA038005ACD60 /* ChunkWindowSplit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24FFA85B1C6BA038005ACD60 /* ChunkWindowSplit.swift */; };
40− 24FFA8781C6BA038005ACD60 /* Combinations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24FFA85C1C6BA038005ACD60 /* Combinations.swift */; };
41− 24FFA8791C6BA038005ACD60 /* Cycle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24FFA85D1C6BA038005ACD60 /* Cycle.swift */; };
42− 24FFA87A1C6BA038005ACD60 /* Enumerate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24FFA85E1C6BA038005ACD60 /* Enumerate.swift */; };
43− 24FFA87B1C6BA038005ACD60 /* Finding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24FFA85F1C6BA038005ACD60 /* Finding.swift */; };
44− 24FFA87C1C6BA038005ACD60 /* FlatMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24FFA8601C6BA038005ACD60 /* FlatMap.swift */; };
45− 24FFA87D1C6BA038005ACD60 /* Hopping.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24FFA8611C6BA038005ACD60 /* Hopping.swift */; };
46− 24FFA87E1C6BA038005ACD60 /* Interpose.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24FFA8621C6BA038005ACD60 /* Interpose.swift */; };
47− 24FFA87F1C6BA038005ACD60 /* Iterate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24FFA8631C6BA038005ACD60 /* Iterate.swift */; };
48− 24FFA8801C6BA038005ACD60 /* NestedSequences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24FFA8641C6BA038005ACD60 /* NestedSequences.swift */; };
49− 24FFA8811C6BA038005ACD60 /* Permutations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24FFA8651C6BA038005ACD60 /* Permutations.swift */; };
50− 24FFA8821C6BA038005ACD60 /* ScanReduce.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24FFA8661C6BA038005ACD60 /* ScanReduce.swift */; };
51− 24FFA8831C6BA038005ACD60 /* Slicing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24FFA8671C6BA038005ACD60 /* Slicing.swift */; };
52− 24FFA8841C6BA038005ACD60 /* TakeDrop.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24FFA8681C6BA038005ACD60 /* TakeDrop.swift */; };
53− 24FFA8851C6BA038005ACD60 /* Zip.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24FFA8691C6BA038005ACD60 /* Zip.swift */; };
54− 24FFA8861C6BA038005ACD60 /* TestCommons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24FFA86A1C6BA038005ACD60 /* TestCommons.swift */; };
55− 2BF7957B6518CA68241BB2CE /* Pods_PixelImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C55F9558B3B267413C3A07A6 /* Pods_PixelImage.framework */; };
29+ 400CECBA73C835B415805169 /* Pods_PixelImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 93D10DBF530542A19EEF699A /* Pods_PixelImage.framework */; };
56/* End PBXBuildFile section */
30/* End PBXBuildFile section */
57
31
58/* Begin PBXFileReference section */
32/* Begin PBXFileReference section */
33+ 0C9CE70F7D2C2896912B7B14 /* Pods-PixelImage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PixelImage.release.xcconfig"; path = "Pods/Target Support Files/Pods-PixelImage/Pods-PixelImage.release.xcconfig"; sourceTree = "<group>"; };
59 242686841C63B72A00D62456 /* PixelImage.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PixelImage.app; sourceTree = BUILT_PRODUCTS_DIR; };
34 242686841C63B72A00D62456 /* PixelImage.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PixelImage.app; sourceTree = BUILT_PRODUCTS_DIR; };
60 242686871C63B72A00D62456 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
35 242686871C63B72A00D62456 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
61 242686891C63B72A00D62456 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
36 242686891C63B72A00D62456 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
@@ -75,37 +50,10 @@
75 24ED21CC1C6C2397009C40FC /* MetaballDataSource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MetaballDataSource.swift; sourceTree = "<group>"; };
50 24ED21CC1C6C2397009C40FC /* MetaballDataSource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MetaballDataSource.swift; sourceTree = "<group>"; };
76 24FC38331C7F931E0085C04A /* Metaball.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Metaball.swift; sourceTree = "<group>"; };
51 24FC38331C7F931E0085C04A /* Metaball.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Metaball.swift; sourceTree = "<group>"; };
77 24FC38351C7F9ABE0085C04A /* Dispatch.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dispatch.swift; sourceTree = "<group>"; };
52 24FC38351C7F9ABE0085C04A /* Dispatch.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dispatch.swift; sourceTree = "<group>"; };
78− 24FFA84C1C6BA038005ACD60 /* ApproximationOperator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ApproximationOperator.swift; sourceTree = "<group>"; };
79− 24FFA84D1C6BA038005ACD60 /* Collections.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Collections.swift; sourceTree = "<group>"; };
80− 24FFA84E1C6BA038005ACD60 /* ComparatorChains.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ComparatorChains.swift; sourceTree = "<group>"; };
81− 24FFA84F1C6BA038005ACD60 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = "<group>"; };
82− 24FFA8511C6BA038005ACD60 /* NSNumber.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSNumber.swift; sourceTree = "<group>"; };
83− 24FFA8521C6BA038005ACD60 /* Numeric.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Numeric.swift; sourceTree = "<group>"; };
53+ 24FFA8521C6BA038005ACD60 /* Numeric.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Numeric.swift; path = SwiftSugar/Numeric.swift; sourceTree = "<group>"; };
84− 24FFA8531C6BA038005ACD60 /* PowerOperator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PowerOperator.swift; sourceTree = "<group>"; };
54+ 24FFA8531C6BA038005ACD60 /* PowerOperator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = PowerOperator.swift; path = SwiftSugar/PowerOperator.swift; sourceTree = "<group>"; };
85− 24FFA8541C6BA038005ACD60 /* Sequence.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Sequence.swift; sourceTree = "<group>"; };
86− 24FFA8561C6BA038005ACD60 /* Memoize.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Memoize.swift; sourceTree = "<group>"; };
87− 24FFA8571C6BA038005ACD60 /* SignOperator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SignOperator.swift; sourceTree = "<group>"; };
88− 24FFA8581C6BA038005ACD60 /* String.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = "<group>"; };
89− 24FFA85A1C6BA038005ACD60 /* Categorise.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Categorise.swift; sourceTree = "<group>"; };
90− 24FFA85B1C6BA038005ACD60 /* ChunkWindowSplit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChunkWindowSplit.swift; sourceTree = "<group>"; };
91− 24FFA85C1C6BA038005ACD60 /* Combinations.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Combinations.swift; sourceTree = "<group>"; };
92− 24FFA85D1C6BA038005ACD60 /* Cycle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Cycle.swift; sourceTree = "<group>"; };
93− 24FFA85E1C6BA038005ACD60 /* Enumerate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Enumerate.swift; sourceTree = "<group>"; };
94− 24FFA85F1C6BA038005ACD60 /* Finding.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Finding.swift; sourceTree = "<group>"; };
95− 24FFA8601C6BA038005ACD60 /* FlatMap.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FlatMap.swift; sourceTree = "<group>"; };
96− 24FFA8611C6BA038005ACD60 /* Hopping.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Hopping.swift; sourceTree = "<group>"; };
97− 24FFA8621C6BA038005ACD60 /* Interpose.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Interpose.swift; sourceTree = "<group>"; };
98− 24FFA8631C6BA038005ACD60 /* Iterate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Iterate.swift; sourceTree = "<group>"; };
99− 24FFA8641C6BA038005ACD60 /* NestedSequences.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NestedSequences.swift; sourceTree = "<group>"; };
100− 24FFA8651C6BA038005ACD60 /* Permutations.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Permutations.swift; sourceTree = "<group>"; };
101− 24FFA8661C6BA038005ACD60 /* ScanReduce.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScanReduce.swift; sourceTree = "<group>"; };
102− 24FFA8671C6BA038005ACD60 /* Slicing.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Slicing.swift; sourceTree = "<group>"; };
103− 24FFA8681C6BA038005ACD60 /* TakeDrop.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TakeDrop.swift; sourceTree = "<group>"; };
104− 24FFA8691C6BA038005ACD60 /* Zip.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Zip.swift; sourceTree = "<group>"; };
105− 24FFA86A1C6BA038005ACD60 /* TestCommons.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestCommons.swift; sourceTree = "<group>"; };
106− B1A755EFC03DA2A172C2B82F /* Pods-PixelImage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PixelImage.debug.xcconfig"; path = "Pods/Target Support Files/Pods-PixelImage/Pods-PixelImage.debug.xcconfig"; sourceTree = "<group>"; };
55+ 6659D12A5984961F335BDF69 /* Pods-PixelImage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PixelImage.debug.xcconfig"; path = "Pods/Target Support Files/Pods-PixelImage/Pods-PixelImage.debug.xcconfig"; sourceTree = "<group>"; };
107− C419D37C90A6BE8B5139806A /* Pods-PixelImage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PixelImage.release.xcconfig"; path = "Pods/Target Support Files/Pods-PixelImage/Pods-PixelImage.release.xcconfig"; sourceTree = "<group>"; };
108− C55F9558B3B267413C3A07A6 /* Pods_PixelImage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PixelImage.framework; sourceTree = BUILT_PRODUCTS_DIR; };
56+ 93D10DBF530542A19EEF699A /* Pods_PixelImage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PixelImage.framework; sourceTree = BUILT_PRODUCTS_DIR; };
109/* End PBXFileReference section */
57/* End PBXFileReference section */
110
58
111/* Begin PBXFrameworksBuildPhase section */
59/* Begin PBXFrameworksBuildPhase section */
@@ -115,13 +63,22 @@
115 files = (
63 files = (
116 24E1E7E41C67D39300ECF1C4 /* MetalKit.framework in Frameworks */,
64 24E1E7E41C67D39300ECF1C4 /* MetalKit.framework in Frameworks */,
117 24E1E7E21C67D37F00ECF1C4 /* Metal.framework in Frameworks */,
65 24E1E7E21C67D37F00ECF1C4 /* Metal.framework in Frameworks */,
118− 2BF7957B6518CA68241BB2CE /* Pods_PixelImage.framework in Frameworks */,
66+ 400CECBA73C835B415805169 /* Pods_PixelImage.framework in Frameworks */,
119 );
67 );
120 runOnlyForDeploymentPostprocessing = 0;
68 runOnlyForDeploymentPostprocessing = 0;
121 };
69 };
122/* End PBXFrameworksBuildPhase section */
70/* End PBXFrameworksBuildPhase section */
123
71
124/* Begin PBXGroup section */
72/* Begin PBXGroup section */
73+ 0C205AE1A1A55E89EFAEE593 /* Pods */ = {
74+ isa = PBXGroup;
75+ children = (
76+ 6659D12A5984961F335BDF69 /* Pods-PixelImage.debug.xcconfig */,
77+ 0C9CE70F7D2C2896912B7B14 /* Pods-PixelImage.release.xcconfig */,
78+ );
79+ name = Pods;
80+ sourceTree = "<group>";
81+ };
125 2426867B1C63B72A00D62456 = {
82 2426867B1C63B72A00D62456 = {
126 isa = PBXGroup;
83 isa = PBXGroup;
127 children = (
84 children = (
@@ -129,8 +86,8 @@
129 24E1E7E11C67D37F00ECF1C4 /* Metal.framework */,
86 24E1E7E11C67D37F00ECF1C4 /* Metal.framework */,
130 242686861C63B72A00D62456 /* PixelImage */,
87 242686861C63B72A00D62456 /* PixelImage */,
131 242686851C63B72A00D62456 /* Products */,
88 242686851C63B72A00D62456 /* Products */,
132− F1933B48ED44BA9FCD7A4A1F /* Pods */,
89+ 0C205AE1A1A55E89EFAEE593 /* Pods */,
133− 588576572D7A188031904848 /* Frameworks */,
90+ 8C02F866C2C0C9A954BB9375 /* Frameworks */,
134 );
91 );
135 sourceTree = "<group>";
92 sourceTree = "<group>";
136 };
93 };
@@ -145,7 +102,9 @@
145 242686861C63B72A00D62456 /* PixelImage */ = {
102 242686861C63B72A00D62456 /* PixelImage */ = {
146 isa = PBXGroup;
103 isa = PBXGroup;
147 children = (
104 children = (
148− 24FFA84B1C6BA038005ACD60 /* SwiftSugar */,
105+ 2461651A1C6DA4F400A913C8 /* Interpolation.swift */,
106+ 24FFA8521C6BA038005ACD60 /* Numeric.swift */,
107+ 24FFA8531C6BA038005ACD60 /* PowerOperator.swift */,
149 242686871C63B72A00D62456 /* AppDelegate.swift */,
108 242686871C63B72A00D62456 /* AppDelegate.swift */,
150 24FC38351C7F9ABE0085C04A /* Dispatch.swift */,
109 24FC38351C7F9ABE0085C04A /* Dispatch.swift */,
151 24E1E7D61C67C8B200ECF1C4 /* UIKit.swift */,
110 24E1E7D61C67C8B200ECF1C4 /* UIKit.swift */,
@@ -153,10 +112,10 @@
153 24FC38331C7F931E0085C04A /* Metaball.swift */,
112 24FC38331C7F931E0085C04A /* Metaball.swift */,
154 24E1E7EE1C67D74300ECF1C4 /* Metal.swift */,
113 24E1E7EE1C67D74300ECF1C4 /* Metal.swift */,
155 249CF84B1C6D113C008B0C78 /* Matrix.swift */,
114 249CF84B1C6D113C008B0C78 /* Matrix.swift */,
156− 242686891C63B72A00D62456 /* ViewController.swift */,
157 24ED21CC1C6C2397009C40FC /* MetaballDataSource.swift */,
115 24ED21CC1C6C2397009C40FC /* MetaballDataSource.swift */,
158 24E1E7EA1C67D70300ECF1C4 /* MetalMetaballRenderer.swift */,
116 24E1E7EA1C67D70300ECF1C4 /* MetalMetaballRenderer.swift */,
159 24E1E7EF1C67D74300ECF1C4 /* shaders.metal */,
117 24E1E7EF1C67D74300ECF1C4 /* shaders.metal */,
118+ 242686891C63B72A00D62456 /* ViewController.swift */,
160 2426868B1C63B72A00D62456 /* Main.storyboard */,
119 2426868B1C63B72A00D62456 /* Main.storyboard */,
161 2426868E1C63B72A00D62456 /* Assets.xcassets */,
120 2426868E1C63B72A00D62456 /* Assets.xcassets */,
162 242686901C63B72A00D62456 /* LaunchScreen.storyboard */,
121 242686901C63B72A00D62456 /* LaunchScreen.storyboard */,
@@ -165,83 +124,14 @@
165 path = PixelImage;
124 path = PixelImage;
166 sourceTree = "<group>";
125 sourceTree = "<group>";
167 };
126 };
168− 24FFA84B1C6BA038005ACD60 /* SwiftSugar */ = {
127+ 8C02F866C2C0C9A954BB9375 /* Frameworks */ = {
169 isa = PBXGroup;
128 isa = PBXGroup;
170 children = (
129 children = (
171− 24FFA84C1C6BA038005ACD60 /* ApproximationOperator.swift */,
172− 2461651A1C6DA4F400A913C8 /* Interpolation.swift */,
173− 24FFA84D1C6BA038005ACD60 /* Collections.swift */,
174− 24FFA84E1C6BA038005ACD60 /* ComparatorChains.swift */,
175− 24FFA84F1C6BA038005ACD60 /* Dictionary.swift */,
176− 24FFA8501C6BA038005ACD60 /* Foundation */,
177− 24FFA8521C6BA038005ACD60 /* Numeric.swift */,
178− 24FFA8531C6BA038005ACD60 /* PowerOperator.swift */,
179− 24FFA8541C6BA038005ACD60 /* Sequence.swift */,
180− 24FFA8551C6BA038005ACD60 /* Sequences */,
181− 24FFA8571C6BA038005ACD60 /* SignOperator.swift */,
182− 24FFA8581C6BA038005ACD60 /* String.swift */,
183− 24FFA8591C6BA038005ACD60 /* SwiftSequences */,
184− 24FFA86A1C6BA038005ACD60 /* TestCommons.swift */,
185− );
186− path = SwiftSugar;
187− sourceTree = "<group>";
188− };
189− 24FFA8501C6BA038005ACD60 /* Foundation */ = {
190− isa = PBXGroup;
191− children = (
192− 24FFA8511C6BA038005ACD60 /* NSNumber.swift */,
193− );
194− path = Foundation;
195− sourceTree = "<group>";
196− };
197− 24FFA8551C6BA038005ACD60 /* Sequences */ = {
198− isa = PBXGroup;
199− children = (
200− 24FFA8561C6BA038005ACD60 /* Memoize.swift */,
201− );
202− path = Sequences;
203− sourceTree = "<group>";
204− };
205− 24FFA8591C6BA038005ACD60 /* SwiftSequences */ = {
206− isa = PBXGroup;
207− children = (
208− 24FFA85A1C6BA038005ACD60 /* Categorise.swift */,
209− 24FFA85B1C6BA038005ACD60 /* ChunkWindowSplit.swift */,
210− 24FFA85C1C6BA038005ACD60 /* Combinations.swift */,
211− 24FFA85D1C6BA038005ACD60 /* Cycle.swift */,
212− 24FFA85E1C6BA038005ACD60 /* Enumerate.swift */,
213− 24FFA85F1C6BA038005ACD60 /* Finding.swift */,
214− 24FFA8601C6BA038005ACD60 /* FlatMap.swift */,
215− 24FFA8611C6BA038005ACD60 /* Hopping.swift */,
216− 24FFA8621C6BA038005ACD60 /* Interpose.swift */,
217− 24FFA8631C6BA038005ACD60 /* Iterate.swift */,
218− 24FFA8641C6BA038005ACD60 /* NestedSequences.swift */,
219− 24FFA8651C6BA038005ACD60 /* Permutations.swift */,
220− 24FFA8661C6BA038005ACD60 /* ScanReduce.swift */,
221− 24FFA8671C6BA038005ACD60 /* Slicing.swift */,
222− 24FFA8681C6BA038005ACD60 /* TakeDrop.swift */,
223− 24FFA8691C6BA038005ACD60 /* Zip.swift */,
224− );
225− path = SwiftSequences;
226− sourceTree = "<group>";
227− };
228− 588576572D7A188031904848 /* Frameworks */ = {
229− isa = PBXGroup;
230− children = (
231− C55F9558B3B267413C3A07A6 /* Pods_PixelImage.framework */,
130+ 93D10DBF530542A19EEF699A /* Pods_PixelImage.framework */,
232 );
131 );
233 name = Frameworks;
132 name = Frameworks;
234 sourceTree = "<group>";
133 sourceTree = "<group>";
235 };
134 };
236− F1933B48ED44BA9FCD7A4A1F /* Pods */ = {
237− isa = PBXGroup;
238− children = (
239− B1A755EFC03DA2A172C2B82F /* Pods-PixelImage.debug.xcconfig */,
240− C419D37C90A6BE8B5139806A /* Pods-PixelImage.release.xcconfig */,
241− );
242− name = Pods;
243− sourceTree = "<group>";
244− };
245/* End PBXGroup section */
135/* End PBXGroup section */
246
136
247/* Begin PBXNativeTarget section */
137/* Begin PBXNativeTarget section */
@@ -249,13 +139,12 @@
249 isa = PBXNativeTarget;
139 isa = PBXNativeTarget;
250 buildConfigurationList = 242686961C63B72A00D62456 /* Build configuration list for PBXNativeTarget "PixelImage" */;
140 buildConfigurationList = 242686961C63B72A00D62456 /* Build configuration list for PBXNativeTarget "PixelImage" */;
251 buildPhases = (
141 buildPhases = (
252− EF55C7246917A184756D93D8 /* Check Pods Manifest.lock */,
142+ 041D2472535A642E23154A31 /* [CP] Check Pods Manifest.lock */,
253 242686801C63B72A00D62456 /* Sources */,
143 242686801C63B72A00D62456 /* Sources */,
254 242686811C63B72A00D62456 /* Frameworks */,
144 242686811C63B72A00D62456 /* Frameworks */,
255 242686821C63B72A00D62456 /* Resources */,
145 242686821C63B72A00D62456 /* Resources */,
256− C7A2DF67265A9D17DEFBD193 /* Embed Pods Frameworks */,
146+ 3CA888DC160972BAEB74EC52 /* [CP] Embed Pods Frameworks */,
257− FADC01F75BFAC01F0260D1C9 /* Copy Pods Resources */,
147+ 47F9F13E3CB75C7B4B0136A5 /* [CP] Copy Pods Resources */,
258− DD0396CE594E3EAC8D18CC6C /* Tailor */,
259 );
148 );
260 buildRules = (
149 buildRules = (
261 );
150 );
@@ -273,12 +162,13 @@
273 isa = PBXProject;
162 isa = PBXProject;
274 attributes = {
163 attributes = {
275 LastSwiftUpdateCheck = 0720;
164 LastSwiftUpdateCheck = 0720;
276− LastUpgradeCheck = 0720;
165+ LastUpgradeCheck = 0830;
277 ORGANIZATIONNAME = "Vinicius Vendramini";
166 ORGANIZATIONNAME = "Vinicius Vendramini";
278 TargetAttributes = {
167 TargetAttributes = {
279 242686831C63B72A00D62456 = {
168 242686831C63B72A00D62456 = {
280 CreatedOnToolsVersion = 7.2;
169 CreatedOnToolsVersion = 7.2;
281 DevelopmentTeam = HHT774898M;
170 DevelopmentTeam = HHT774898M;
171+ LastSwiftMigration = 0830;
282 };
172 };
283 };
173 };
284 };
174 };
@@ -314,58 +204,44 @@
314/* End PBXResourcesBuildPhase section */
204/* End PBXResourcesBuildPhase section */
315
205
316/* Begin PBXShellScriptBuildPhase section */
206/* Begin PBXShellScriptBuildPhase section */
317− C7A2DF67265A9D17DEFBD193 /* Embed Pods Frameworks */ = {
207+ 041D2472535A642E23154A31 /* [CP] Check Pods Manifest.lock */ = {
318 isa = PBXShellScriptBuildPhase;
208 isa = PBXShellScriptBuildPhase;
319 buildActionMask = 2147483647;
209 buildActionMask = 2147483647;
320 files = (
210 files = (
321 );
211 );
322 inputPaths = (
212 inputPaths = (
323 );
213 );
324− name = "Embed Pods Frameworks";
214+ name = "[CP] Check Pods Manifest.lock";
325 outputPaths = (
215 outputPaths = (
326 );
216 );
327 runOnlyForDeploymentPostprocessing = 0;
217 runOnlyForDeploymentPostprocessing = 0;
328 shellPath = /bin/sh;
218 shellPath = /bin/sh;
329− shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PixelImage/Pods-PixelImage-frameworks.sh\"\n";
219+ shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
330 showEnvVarsInLog = 0;
220 showEnvVarsInLog = 0;
331 };
221 };
332− DD0396CE594E3EAC8D18CC6C /* Tailor */ = {
222+ 3CA888DC160972BAEB74EC52 /* [CP] Embed Pods Frameworks */ = {
333 isa = PBXShellScriptBuildPhase;
223 isa = PBXShellScriptBuildPhase;
334 buildActionMask = 2147483647;
224 buildActionMask = 2147483647;
335 files = (
225 files = (
336 );
226 );
337 inputPaths = (
227 inputPaths = (
338 );
228 );
339− name = Tailor;
229+ name = "[CP] Embed Pods Frameworks";
340 outputPaths = (
230 outputPaths = (
341 );
231 );
342 runOnlyForDeploymentPostprocessing = 0;
232 runOnlyForDeploymentPostprocessing = 0;
343 shellPath = /bin/sh;
233 shellPath = /bin/sh;
344− shellScript = "if hash tailor 2>/dev/null; then\n tailor --except=function-whitespace,leading-whitespace,constant-k-prefix --max-severity error\nelse\n echo \"warning: Please install Tailor from https://tailor.sh\"\nfi";
234+ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PixelImage/Pods-PixelImage-frameworks.sh\"\n";
345− };
346− EF55C7246917A184756D93D8 /* Check Pods Manifest.lock */ = {
347− isa = PBXShellScriptBuildPhase;
348− buildActionMask = 2147483647;
349− files = (
350− );
351− inputPaths = (
352− );
353− name = "Check Pods Manifest.lock";
354− outputPaths = (
355− );
356− runOnlyForDeploymentPostprocessing = 0;
357− shellPath = /bin/sh;
358− shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
359 showEnvVarsInLog = 0;
235 showEnvVarsInLog = 0;
360 };
236 };
361− FADC01F75BFAC01F0260D1C9 /* Copy Pods Resources */ = {
237+ 47F9F13E3CB75C7B4B0136A5 /* [CP] Copy Pods Resources */ = {
362 isa = PBXShellScriptBuildPhase;
238 isa = PBXShellScriptBuildPhase;
363 buildActionMask = 2147483647;
239 buildActionMask = 2147483647;
364 files = (
240 files = (
365 );
241 );
366 inputPaths = (
242 inputPaths = (
367 );
243 );
368− name = "Copy Pods Resources";
244+ name = "[CP] Copy Pods Resources";
369 outputPaths = (
245 outputPaths = (
370 );
246 );
371 runOnlyForDeploymentPostprocessing = 0;
247 runOnlyForDeploymentPostprocessing = 0;
@@ -380,46 +256,20 @@
380 isa = PBXSourcesBuildPhase;
256 isa = PBXSourcesBuildPhase;
381 buildActionMask = 2147483647;
257 buildActionMask = 2147483647;
382 files = (
258 files = (
383− 24FFA87B1C6BA038005ACD60 /* Finding.swift in Sources */,
384− 24FFA8751C6BA038005ACD60 /* String.swift in Sources */,
385− 24FFA8781C6BA038005ACD60 /* Combinations.swift in Sources */,
386− 24FFA87E1C6BA038005ACD60 /* Interpose.swift in Sources */,
387 2426868A1C63B72A00D62456 /* ViewController.swift in Sources */,
259 2426868A1C63B72A00D62456 /* ViewController.swift in Sources */,
388− 24FFA8841C6BA038005ACD60 /* TakeDrop.swift in Sources */,
389− 24FFA8771C6BA038005ACD60 /* ChunkWindowSplit.swift in Sources */,
390− 24FFA86F1C6BA038005ACD60 /* NSNumber.swift in Sources */,
391 2461651B1C6DA4F400A913C8 /* Interpolation.swift in Sources */,
260 2461651B1C6DA4F400A913C8 /* Interpolation.swift in Sources */,
392 24FC38341C7F931E0085C04A /* Metaball.swift in Sources */,
261 24FC38341C7F931E0085C04A /* Metaball.swift in Sources */,
393− 24FFA8861C6BA038005ACD60 /* TestCommons.swift in Sources */,
394− 24FFA8741C6BA038005ACD60 /* SignOperator.swift in Sources */,
395− 24FFA8821C6BA038005ACD60 /* ScanReduce.swift in Sources */,
396 24ED21CD1C6C2397009C40FC /* MetaballDataSource.swift in Sources */,
262 24ED21CD1C6C2397009C40FC /* MetaballDataSource.swift in Sources */,
397− 24FFA8831C6BA038005ACD60 /* Slicing.swift in Sources */,
398− 24FFA8721C6BA038005ACD60 /* Sequence.swift in Sources */,
399− 24FFA87F1C6BA038005ACD60 /* Iterate.swift in Sources */,
400 24FC38361C7F9ABE0085C04A /* Dispatch.swift in Sources */,
263 24FC38361C7F9ABE0085C04A /* Dispatch.swift in Sources */,
401− 24FFA8761C6BA038005ACD60 /* Categorise.swift in Sources */,
402− 24FFA86D1C6BA038005ACD60 /* ComparatorChains.swift in Sources */,
403 24FFA8711C6BA038005ACD60 /* PowerOperator.swift in Sources */,
264 24FFA8711C6BA038005ACD60 /* PowerOperator.swift in Sources */,
404 24E1E7D71C67C8B200ECF1C4 /* UIKit.swift in Sources */,
265 24E1E7D71C67C8B200ECF1C4 /* UIKit.swift in Sources */,
405− 24FFA8851C6BA038005ACD60 /* Zip.swift in Sources */,
406 249CF84C1C6D113C008B0C78 /* Matrix.swift in Sources */,
266 249CF84C1C6D113C008B0C78 /* Matrix.swift in Sources */,
407− 24FFA8791C6BA038005ACD60 /* Cycle.swift in Sources */,
408 24E1E7F11C67D74300ECF1C4 /* shaders.metal in Sources */,
267 24E1E7F11C67D74300ECF1C4 /* shaders.metal in Sources */,
409− 24FFA86E1C6BA038005ACD60 /* Dictionary.swift in Sources */,
410− 24FFA87D1C6BA038005ACD60 /* Hopping.swift in Sources */,
411 24E1E7EB1C67D70300ECF1C4 /* MetalMetaballRenderer.swift in Sources */,
268 24E1E7EB1C67D70300ECF1C4 /* MetalMetaballRenderer.swift in Sources */,
412 246B0F831C70635D00A71D05 /* UIColor.swift in Sources */,
269 246B0F831C70635D00A71D05 /* UIColor.swift in Sources */,
413− 24FFA87A1C6BA038005ACD60 /* Enumerate.swift in Sources */,
414 242686881C63B72A00D62456 /* AppDelegate.swift in Sources */,
270 242686881C63B72A00D62456 /* AppDelegate.swift in Sources */,
415 24E1E7F01C67D74300ECF1C4 /* Metal.swift in Sources */,
271 24E1E7F01C67D74300ECF1C4 /* Metal.swift in Sources */,
416− 24FFA87C1C6BA038005ACD60 /* FlatMap.swift in Sources */,
417 24FFA8701C6BA038005ACD60 /* Numeric.swift in Sources */,
272 24FFA8701C6BA038005ACD60 /* Numeric.swift in Sources */,
418− 24FFA8811C6BA038005ACD60 /* Permutations.swift in Sources */,
419− 24FFA86B1C6BA038005ACD60 /* ApproximationOperator.swift in Sources */,
420− 24FFA8801C6BA038005ACD60 /* NestedSequences.swift in Sources */,
421− 24FFA8731C6BA038005ACD60 /* Memoize.swift in Sources */,
422− 24FFA86C1C6BA038005ACD60 /* Collections.swift in Sources */,
423 );
273 );
424 runOnlyForDeploymentPostprocessing = 0;
274 runOnlyForDeploymentPostprocessing = 0;
425 };
275 };
@@ -458,8 +308,10 @@
458 CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
308 CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
459 CLANG_WARN_EMPTY_BODY = YES;
309 CLANG_WARN_EMPTY_BODY = YES;
460 CLANG_WARN_ENUM_CONVERSION = YES;
310 CLANG_WARN_ENUM_CONVERSION = YES;
311+ CLANG_WARN_INFINITE_RECURSION = YES;
461 CLANG_WARN_INT_CONVERSION = YES;
312 CLANG_WARN_INT_CONVERSION = YES;
462 CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
313 CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
314+ CLANG_WARN_SUSPICIOUS_MOVE = YES;
463 CLANG_WARN_UNREACHABLE_CODE = YES;
315 CLANG_WARN_UNREACHABLE_CODE = YES;
464 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
316 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
465 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
317 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -503,8 +355,10 @@
503 CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
355 CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
504 CLANG_WARN_EMPTY_BODY = YES;
356 CLANG_WARN_EMPTY_BODY = YES;
505 CLANG_WARN_ENUM_CONVERSION = YES;
357 CLANG_WARN_ENUM_CONVERSION = YES;
358+ CLANG_WARN_INFINITE_RECURSION = YES;
506 CLANG_WARN_INT_CONVERSION = YES;
359 CLANG_WARN_INT_CONVERSION = YES;
507 CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
360 CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
361+ CLANG_WARN_SUSPICIOUS_MOVE = YES;
508 CLANG_WARN_UNREACHABLE_CODE = YES;
362 CLANG_WARN_UNREACHABLE_CODE = YES;
509 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
363 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
510 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
364 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -523,6 +377,7 @@
523 IPHONEOS_DEPLOYMENT_TARGET = 9.2;
377 IPHONEOS_DEPLOYMENT_TARGET = 9.2;
524 MTL_ENABLE_DEBUG_INFO = NO;
378 MTL_ENABLE_DEBUG_INFO = NO;
525 SDKROOT = iphoneos;
379 SDKROOT = iphoneos;
380+ SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
526 TARGETED_DEVICE_FAMILY = "1,2";
381 TARGETED_DEVICE_FAMILY = "1,2";
527 VALIDATE_PRODUCT = YES;
382 VALIDATE_PRODUCT = YES;
528 };
383 };
@@ -530,25 +385,29 @@
530 };
385 };
531 242686971C63B72A00D62456 /* Debug */ = {
386 242686971C63B72A00D62456 /* Debug */ = {
532 isa = XCBuildConfiguration;
387 isa = XCBuildConfiguration;
533− baseConfigurationReference = B1A755EFC03DA2A172C2B82F /* Pods-PixelImage.debug.xcconfig */;
388+ baseConfigurationReference = 6659D12A5984961F335BDF69 /* Pods-PixelImage.debug.xcconfig */;
534 buildSettings = {
389 buildSettings = {
535 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
390 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
391+ DEVELOPMENT_TEAM = HHT774898M;
536 INFOPLIST_FILE = PixelImage/Info.plist;
392 INFOPLIST_FILE = PixelImage/Info.plist;
537 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
393 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
538 PRODUCT_BUNDLE_IDENTIFIER = vinivendra.PixelImage;
394 PRODUCT_BUNDLE_IDENTIFIER = vinivendra.PixelImage;
539 PRODUCT_NAME = "$(TARGET_NAME)";
395 PRODUCT_NAME = "$(TARGET_NAME)";
396+ SWIFT_VERSION = 3.0;
540 };
397 };
541 name = Debug;
398 name = Debug;
542 };
399 };
543 242686981C63B72A00D62456 /* Release */ = {
400 242686981C63B72A00D62456 /* Release */ = {
544 isa = XCBuildConfiguration;
401 isa = XCBuildConfiguration;
545− baseConfigurationReference = C419D37C90A6BE8B5139806A /* Pods-PixelImage.release.xcconfig */;
402+ baseConfigurationReference = 0C9CE70F7D2C2896912B7B14 /* Pods-PixelImage.release.xcconfig */;
546 buildSettings = {
403 buildSettings = {
547 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
404 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
405+ DEVELOPMENT_TEAM = HHT774898M;
548 INFOPLIST_FILE = PixelImage/Info.plist;
406 INFOPLIST_FILE = PixelImage/Info.plist;
549 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
407 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
550 PRODUCT_BUNDLE_IDENTIFIER = vinivendra.PixelImage;
408 PRODUCT_BUNDLE_IDENTIFIER = vinivendra.PixelImage;
551 PRODUCT_NAME = "$(TARGET_NAME)";
409 PRODUCT_NAME = "$(TARGET_NAME)";
410+ SWIFT_VERSION = 3.0;
552 };
411 };
553 name = Release;
412 name = Release;
554 };
413 };
PixelImage.xcodeproj/xcuserdata/vini.xcuserdatad/xcschemes/PixelImage.xcscheme+1−1
@@ -1,6 +1,6 @@
1<?xml version="1.0" encoding="UTF-8"?>
1<?xml version="1.0" encoding="UTF-8"?>
2<Scheme
2<Scheme
3− LastUpgradeVersion = "0720"
3+ LastUpgradeVersion = "0830"
4 version = "1.3">
4 version = "1.3">
5 <BuildAction
5 <BuildAction
6 parallelizeBuildables = "YES"
6 parallelizeBuildables = "YES"
PixelImage/AppDelegate.swift+6−6
@@ -13,30 +13,30 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
13
13
14 var window: UIWindow?
14 var window: UIWindow?
15
15
16− func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
16+ func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
17 // Override point for customization after application launch.
17 // Override point for customization after application launch.
18 return true
18 return true
19 }
19 }
20
20
21− func applicationWillResignActive(application: UIApplication) {
21+ func applicationWillResignActive(_ application: UIApplication) {
22 // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
22 // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
23 // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
23 // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
24 }
24 }
25
25
26− func applicationDidEnterBackground(application: UIApplication) {
26+ func applicationDidEnterBackground(_ application: UIApplication) {
27 // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
27 // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
28 // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
28 // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
29 }
29 }
30
30
31− func applicationWillEnterForeground(application: UIApplication) {
31+ func applicationWillEnterForeground(_ application: UIApplication) {
32 // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
32 // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
33 }
33 }
34
34
35− func applicationDidBecomeActive(application: UIApplication) {
35+ func applicationDidBecomeActive(_ application: UIApplication) {
36 // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
36 // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
37 }
37 }
38
38
39− func applicationWillTerminate(application: UIApplication) {
39+ func applicationWillTerminate(_ application: UIApplication) {
40 // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
40 // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
41 }
41 }
42}
42}
PixelImage/Dispatch.swift+6−2
@@ -1,6 +1,10 @@
1
1
2import Dispatch
2import Dispatch
3
3
4−func delay(duration: Float = 1, block: () -> ()) {
4+func delay(_ duration: Float = 1, block: @escaping () -> ()) {
5− dispatch_after(dispatch_time(DISPATCH_TIME_NOW, Int64(duration * Float(NSEC_PER_SEC))), dispatch_get_main_queue(), block)
5+ DispatchQueue.main.asyncAfter(
6+ deadline: DispatchTime.now() +
7+ Double(duration * Float(NSEC_PER_SEC)) /
8+ Double(NSEC_PER_SEC),
9+ execute: block)
6}
10}
PixelImage/Interpolation.swift+8−18
@@ -1,23 +1,23 @@
1
1
2import Darwin
2import Darwin
3
3
4−func interpolateCubeEaseIn<T: Numeric>(linear: T) -> T {
4+func interpolateCubeEaseIn<T: Numeric>(_ linear: T) -> T {
5 return linear ^ 3
5 return linear ^ 3
6}
6}
7
7
8−func interpolateSquareEaseIn<T: Numeric>(linear: T) -> T {
8+func interpolateSquareEaseIn<T: Numeric>(_ linear: T) -> T {
9 return linear ^ 2
9 return linear ^ 2
10}
10}
11
11
12−func interpolateSquareEaseOut<T: Numeric>(linear: T) -> T {
12+func interpolateSquareEaseOut<T: Numeric>(_ linear: T) -> T {
13 return 1 - (1 - linear) * (1 - linear)
13 return 1 - (1 - linear) * (1 - linear)
14}
14}
15
15
16−func interpolateSmooth<T: Numeric>(linear: T) -> T {
16+func interpolateSmooth<T: Numeric>(_ linear: T) -> T {
17 return ((linear) * (linear) * (linear) * ((linear) * ((linear) * 6 - 15) + 10))
17 return ((linear) * (linear) * (linear) * ((linear) * ((linear) * 6 - 15) + 10))
18}
18}
19
19
20−func createStringKeyframes(bounces: Int = 2, elasticity: Double = 1.1, bounceSpeed: Double) -> [(time: Double, position: Double)] {
20+func createStringKeyframes(_ bounces: Int = 2, elasticity: Double = 1.1, bounceSpeed: Double) -> [(time: Double, position: Double)] {
21 // Setup keyframes
21 // Setup keyframes
22 var keyFrames: [(time: Double, position: Double)] = [(1, 1)]
22 var keyFrames: [(time: Double, position: Double)] = [(1, 1)]
23
23
@@ -28,14 +28,9 @@ func createStringKeyframes(bounces: Int = 2, elasticity: Double = 1.1, bounceSpe
28 var bounceReach = overreach / (2 ^ Double(bounces - 1))
28 var bounceReach = overreach / (2 ^ Double(bounces - 1))
29 var currentBouncePosition: Double = 1.0 + bounceDirection * bounceReach
29 var currentBouncePosition: Double = 1.0 + bounceDirection * bounceReach
30
30
31− print(currentBounceTime)
32− print(bounceDirection)
33− print(bounceReach)
34− print(currentBouncePosition)
35−
36 keyFrames.append((1.0 - currentBounceTime, currentBouncePosition))
31 keyFrames.append((1.0 - currentBounceTime, currentBouncePosition))
37
32
38− for i in (1..<bounces).reverse() {
33+ for i in (1..<bounces).reversed() {
39 currentBounceTime += overreach / (bounceSpeed ^ Double(i + 1))
34 currentBounceTime += overreach / (bounceSpeed ^ Double(i + 1))
40 currentBounceTime += overreach / (bounceSpeed ^ Double(i))
35 currentBounceTime += overreach / (bounceSpeed ^ Double(i))
41 bounceDirection = Double((i % 2) * 2 - 1)
36 bounceDirection = Double((i % 2) * 2 - 1)
@@ -43,24 +38,19 @@ func createStringKeyframes(bounces: Int = 2, elasticity: Double = 1.1, bounceSpe
43 currentBouncePosition = 1.0 + bounceDirection * bounceReach
38 currentBouncePosition = 1.0 + bounceDirection * bounceReach
44
39
45 keyFrames.append((1.0 - currentBounceTime, currentBouncePosition))
40 keyFrames.append((1.0 - currentBounceTime, currentBouncePosition))
46−
47− print(currentBounceTime)
48− print(bounceDirection)
49− print(bounceReach)
50− print(currentBouncePosition)
51 }
41 }
52
42
53 keyFrames.append((0, 0))
43 keyFrames.append((0, 0))
54
44
55 var reversed = [(time: Double, position: Double)]()
45 var reversed = [(time: Double, position: Double)]()
56− for keyFrame in keyFrames.reverse() {
46+ for keyFrame in keyFrames.reversed() {
57 reversed.append(keyFrame)
47 reversed.append(keyFrame)
58 }
48 }
59
49
60 return reversed
50 return reversed
61}
51}
62
52
63−func interpolateSpring<T: Numeric>(linear: T, bounces: Int = 2, elasticity: Double = 1.1, bounceSpeed: Double = 1.0) -> T {
53+func interpolateSpring<T: Numeric>(_ linear: T, bounces: Int = 2, elasticity: Double = 1.1, bounceSpeed: Double = 1.0) -> T {
64 let keyFrames: [(time: Double, position: Double)]
54 let keyFrames: [(time: Double, position: Double)]
65 keyFrames = createStringKeyframes(bounces, elasticity: elasticity, bounceSpeed: bounceSpeed)
55 keyFrames = createStringKeyframes(bounces, elasticity: elasticity, bounceSpeed: bounceSpeed)
66
56
PixelImage/Matrix.swift+8−8
@@ -17,12 +17,12 @@ class Graph<T> {
17 self.adjacencyMatrix = Matrix(size: size)
17 self.adjacencyMatrix = Matrix(size: size)
18 }
18 }
19
19
20− func addEdge(i: Int, _ j: Int) {
20+ func addEdge(_ i: Int, _ j: Int) {
21 adjacencyMatrix.set(i, j)
21 adjacencyMatrix.set(i, j)
22 adjacencyMatrix.set(j, i)
22 adjacencyMatrix.set(j, i)
23 }
23 }
24
24
25− func removeEdge(i: Int, _ j: Int) {
25+ func removeEdge(_ i: Int, _ j: Int) {
26 adjacencyMatrix.reset(i, j)
26 adjacencyMatrix.reset(i, j)
27 adjacencyMatrix.reset(j, i)
27 adjacencyMatrix.reset(j, i)
28 }
28 }
@@ -35,30 +35,30 @@ struct Matrix: CustomStringConvertible {
35 let size: Int
35 let size: Int
36
36
37 init(size: Int) {
37 init(size: Int) {
38− buffer = [Float](count: size * size, repeatedValue: 0.0)
38+ buffer = [Float](repeating: 0.0, count: size * size)
39 self.size = size
39 self.size = size
40 }
40 }
41
41
42− func get(i: Int, j: Int) -> Float {
42+ func get(_ i: Int, j: Int) -> Float {
43 return buffer[index(i, j)]
43 return buffer[index(i, j)]
44 }
44 }
45
45
46− mutating func set(i: Int, _ j: Int, value: Float = 1.0) {
46+ mutating func set(_ i: Int, _ j: Int, value: Float = 1.0) {
47 buffer[index(i, j)] = value
47 buffer[index(i, j)] = value
48 }
48 }
49
49
50− mutating func reset(i: Int, _ j: Int) {
50+ mutating func reset(_ i: Int, _ j: Int) {
51 buffer[index(i, j)] = 0.0
51 buffer[index(i, j)] = 0.0
52 }
52 }
53
53
54− private func index(i: Int, _ j: Int) -> Int {
54+ fileprivate func index(_ i: Int, _ j: Int) -> Int {
55 return j * size + i
55 return j * size + i
56 }
56 }
57
57
58 var description: String {
58 var description: String {
59 get {
59 get {
60 var result = ""
60 var result = ""
61− for (index, value) in buffer.enumerate() {
61+ for (index, value) in buffer.enumerated() {
62 result = result + "\(value)"
62 result = result + "\(value)"
63 if index % size == size - 1 {
63 if index % size == size - 1 {
64 result = result + "\n"
64 result = result + "\n"
PixelImage/Metaball.swift+15−8
@@ -5,7 +5,8 @@ class Metaball: UIView {
5
5
6 var color: UIColor
6 var color: UIColor
7
7
8− init(position: CGPoint, color: UIColor = UIColor(randomFlatColorOfShadeStyle: .Light)) {
8+ init(position: CGPoint,
9+ color: UIColor = UIColor(randomFlatColorOf: .light)) {
9 self.color = color
10 self.color = color
10 super.init(frame: CGRect.zero)
11 super.init(frame: CGRect.zero)
11
12
@@ -14,23 +15,25 @@ class Metaball: UIView {
14 }
15 }
15
16
16 required init?(coder aDecoder: NSCoder) {
17 required init?(coder aDecoder: NSCoder) {
17− self.color = UIColor(randomFlatColorOfShadeStyle: .Light)
18+ self.color = UIColor(randomFlatColorOf: .light)
18 super.init(coder: aDecoder)
19 super.init(coder: aDecoder)
19 }
20 }
20}
21}
21
22
22class EdgeAnimationParameters {
23class EdgeAnimationParameters {
23− let startDate: NSDate
24+ let startDate: Date
24 let duration: Float
25 let duration: Float
25 let fadeIn: Bool
26 let fadeIn: Bool
26 let i: Int
27 let i: Int
27 let j: Int
28 let j: Int
28
29
29− func unpack() -> (startDate: NSDate, duration: Float, fadeIn: Bool, i: Int, j: Int) {
30+ func unpack() -> (startDate: Date, duration: Float, fadeIn: Bool,
31+ i: Int, j: Int)
32+ {
30 return (startDate, duration, fadeIn, i, j)
33 return (startDate, duration, fadeIn, i, j)
31 }
34 }
32
35
33− init(startDate: NSDate, duration: Float, fadeIn: Bool, i: Int, j: Int) {
36+ init(startDate: Date, duration: Float, fadeIn: Bool, i: Int, j: Int) {
34 self.startDate = startDate
37 self.startDate = startDate
35 self.duration = duration
38 self.duration = duration
36 self.fadeIn = fadeIn
39 self.fadeIn = fadeIn
@@ -40,17 +43,21 @@ class EdgeAnimationParameters {
40}
43}
41
44
42class VertexAnimationParameters {
45class VertexAnimationParameters {
43− let startDate: NSDate
46+ let startDate: Date
44 let duration: Float
47 let duration: Float
45 let origin: CGPoint
48 let origin: CGPoint
46 let destination: CGPoint
49 let destination: CGPoint
47 let metaball: Metaball
50 let metaball: Metaball
48
51
49− func unpack() -> (startDate: NSDate, duration: Float, origin: CGPoint, destination: CGPoint, metaball: Metaball) {
52+ func unpack() -> (startDate: Date, duration: Float, origin: CGPoint,
53+ destination: CGPoint, metaball: Metaball)
54+ {
50 return (startDate, duration, origin, destination, metaball)
55 return (startDate, duration, origin, destination, metaball)
51 }
56 }
52
57
53− init(startDate: NSDate, duration: Float, origin: CGPoint, destination: CGPoint, metaball: Metaball) {
58+ init(startDate: Date, duration: Float, origin: CGPoint,
59+ destination: CGPoint, metaball: Metaball)
60+ {
54 self.startDate = startDate
61 self.startDate = startDate
55 self.duration = duration
62 self.duration = duration
56 self.origin = origin
63 self.origin = origin
PixelImage/Metal.swift+3−3
@@ -9,13 +9,13 @@ class MTLContext {
9 init(device: MTLDevice = MTLCreateSystemDefaultDevice()!) {
9 init(device: MTLDevice = MTLCreateSystemDefaultDevice()!) {
10 self.device = device
10 self.device = device
11 self.library = device.newDefaultLibrary()!
11 self.library = device.newDefaultLibrary()!
12− self.commandQueue = device.newCommandQueue()
12+ self.commandQueue = device.makeCommandQueue()
13 }
13 }
14}
14}
15
15
16class MTLComputeContext {
16class MTLComputeContext {
17 var texture: MTLTexture
17 var texture: MTLTexture
18− var imageBuffer: UnsafeMutablePointer<Void>
18+ var imageBuffer: UnsafeMutableRawPointer
19
19
20 init(size: CGSize, texture: MTLTexture) {
20 init(size: CGSize, texture: MTLTexture) {
21 let width = Int(size.width)
21 let width = Int(size.width)
@@ -26,7 +26,7 @@ class MTLComputeContext {
26 self.texture = texture
26 self.texture = texture
27 }
27 }
28
28
29− func updateToSize(size: CGSize, texture: MTLTexture) {
29+ func updateToSize(_ size: CGSize, texture: MTLTexture) {
30 free(imageBuffer)
30 free(imageBuffer)
31
31
32 let width = Int(size.width)
32 let width = Int(size.width)
PixelImage/MetalMetaballRenderer.swift+88−56
@@ -14,18 +14,18 @@ import ChameleonFramework
14
14
15 let dataSource: MetaballDataSource
15 let dataSource: MetaballDataSource
16
16
17− let semaphore = dispatch_semaphore_create(2)
17+ let semaphore = DispatchSemaphore(value: 2)
18
18
19 enum RendererState {
19 enum RendererState {
20− case Idle
20+ case idle
21− case Running
21+ case running
22− case Ending
22+ case ending
23 }
23 }
24
24
25− var state: RendererState = .Idle {
25+ var state: RendererState = .idle {
26 willSet {
26 willSet {
27− if state == .Idle {
27+ if state == .idle {
28− if newValue == .Running {
28+ if newValue == .running {
29 updateTargetView()
29 updateTargetView()
30 }
30 }
31 }
31 }
@@ -39,32 +39,40 @@ import ChameleonFramework
39
39
40 let width = Int(frame.width)
40 let width = Int(frame.width)
41 let height = Int(frame.height)
41 let height = Int(frame.height)
42− let textureDescriptor = MTLTextureDescriptor.texture2DDescriptorWithPixelFormat(.BGRA8Unorm, width: width, height: height, mipmapped: false)
42+ let textureDescriptor =
43−
43+ MTLTextureDescriptor.texture2DDescriptor(
44+ pixelFormat: .bgra8Unorm,
45+ width: width,
46+ height: height,
47+ mipmapped: false)
48+
49+ let texture1 =
44− let texture1 = context.device.newTextureWithDescriptor(textureDescriptor)
50+ context.device.makeTexture(descriptor: textureDescriptor)
45− activeComputeContext = MTLComputeContext(size: targetView.size, texture: texture1)
51+ activeComputeContext = MTLComputeContext(size: targetView.size,
52+ texture: texture1)
53+ let texture2 =
46− let texture2 = context.device.newTextureWithDescriptor(textureDescriptor)
54+ context.device.makeTexture(descriptor: textureDescriptor)
47− idleComputeContext = MTLComputeContext(size: targetView.size, texture: texture2)
55+ idleComputeContext = MTLComputeContext(size: targetView.size,
56+ texture: texture2)
48 }
57 }
49
58
50 internal func updateTargetView() {
59 internal func updateTargetView() {
60+ let timeout = DispatchTime.now() + Double(1000000000) / Double(NSEC_PER_SEC)
61+ _ = semaphore.wait(timeout: timeout)
51
62
52− let timeout = dispatch_time(DISPATCH_TIME_NOW, 1000000000)
53− dispatch_semaphore_wait(semaphore, timeout)
54−
55− state = .Ending
63+ state = .ending
56−
57− let userInteractiveQueue = dispatch_get_global_queue(Int(QOS_CLASS_USER_INTERACTIVE.rawValue), 0)
58− dispatch_async(userInteractiveQueue) { () -> Void in
59
64
65+ let userInteractiveQueue =
66+ DispatchQueue.global(qos: DispatchQoS.QoSClass.userInteractive)
67+ userInteractiveQueue.async { () -> Void in
60 let computeContext = self.activeComputeContext
68 let computeContext = self.activeComputeContext
61 swap(&self.activeComputeContext, &self.idleComputeContext)
69 swap(&self.activeComputeContext, &self.idleComputeContext)
62
70
63 // Render graphics to metal texture
71 // Render graphics to metal texture
64 self.renderToContext(computeContext)
72 self.renderToContext(computeContext)
65
73
66− if self.state != .Running {
74+ if self.state != .running {
67− self.state = .Idle
75+ self.state = .idle
68 } else {
76 } else {
69 self.updateTargetView()
77 self.updateTargetView()
70 }
78 }
@@ -72,16 +80,16 @@ import ChameleonFramework
72 // Transform metal texture into image
80 // Transform metal texture into image
73 let uiimage = self.createImageFromContext(computeContext)
81 let uiimage = self.createImageFromContext(computeContext)
74
82
75− dispatch_semaphore_signal(self.semaphore)
83+ self.semaphore.signal()
76
84
77− dispatch_async(dispatch_get_main_queue()) { () -> Void in
85+ DispatchQueue.main.async { () -> Void in
78 // Send image to view
86 // Send image to view
79 self.targetView.image = uiimage
87 self.targetView.image = uiimage
80 }
88 }
81 }
89 }
82 }
90 }
83
91
84− internal func renderToContext(computeContext: MTLComputeContext) {
92+ internal func renderToContext(_ computeContext: MTLComputeContext) {
85 let width = Int(targetView.width)
93 let width = Int(targetView.width)
86 let height = Int(targetView.height)
94 let height = Int(targetView.height)
87
95
@@ -89,23 +97,27 @@ import ChameleonFramework
89 let pipeline: MTLComputePipelineState
97 let pipeline: MTLComputePipelineState
90 do {
98 do {
91 // Get long-lived objects
99 // Get long-lived objects
100+ kernelFunction =
92− kernelFunction = context.library.newFunctionWithName("drawMetaballs")
101+ context.library.makeFunction(name: "drawMetaballs")
93− pipeline = try context.device.newComputePipelineStateWithFunction(kernelFunction!)
102+ pipeline = try context.device.makeComputePipelineState(
103+ function: kernelFunction!)
94
104
95 // Configure info for computing
105 // Configure info for computing
96 let threadGroupCounts = MTLSizeMake(8, 8, 1)
106 let threadGroupCounts = MTLSizeMake(8, 8, 1)
97− let threadGroups = MTLSizeMake(width / threadGroupCounts.width, height / threadGroupCounts.height, 1)
107+ let threadGroups = MTLSizeMake(width / threadGroupCounts.width,
108+ height / threadGroupCounts.height,
109+ 1)
98
110
99 // Send commands to metal and render
111 // Send commands to metal and render
100− let commandBuffer = context.commandQueue.commandBuffer()
112+ let commandBuffer = context.commandQueue.makeCommandBuffer()
101
113
102− let commandEncoder = commandBuffer.computeCommandEncoder()
114+ let commandEncoder = commandBuffer.makeComputeCommandEncoder()
103 commandEncoder.setComputePipelineState(pipeline)
115 commandEncoder.setComputePipelineState(pipeline)
104− commandEncoder.setTexture(computeContext.texture, atIndex: 0)
116+ commandEncoder.setTexture(computeContext.texture, at: 0)
105 let metaballInfoBuffer = metaballBuffer()
117 let metaballInfoBuffer = metaballBuffer()
106− commandEncoder.setBuffer(metaballInfoBuffer, offset: 0, atIndex: 0)
118+ commandEncoder.setBuffer(metaballInfoBuffer, offset: 0, at: 0)
107 let edgesBuffer = metaballEdgesBuffer()
119 let edgesBuffer = metaballEdgesBuffer()
108− commandEncoder.setBuffer(edgesBuffer, offset: 0, atIndex: 1)
120+ commandEncoder.setBuffer(edgesBuffer, offset: 0, at: 1)
109 commandEncoder.dispatchThreadgroups(threadGroups,
121 commandEncoder.dispatchThreadgroups(threadGroups,
110 threadsPerThreadgroup: threadGroupCounts)
122 threadsPerThreadgroup: threadGroupCounts)
111 commandEncoder.endEncoding()
123 commandEncoder.endEncoding()
@@ -117,37 +129,50 @@ import ChameleonFramework
117 }
129 }
118 }
130 }
119
131
120− internal func createImageFromContext(computeContext: MTLComputeContext) -> UIImage {
132+ internal func createImageFromContext(_ computeContext: MTLComputeContext)
133+ -> UIImage
134+ {
121 let texture = computeContext.texture
135 let texture = computeContext.texture
122
136
123 // Get image info
137 // Get image info
124− let imageSize = CGSizeMake(CGFloat(texture.width), CGFloat(texture.height))
138+ let imageSize = CGSize(width: CGFloat(texture.width),
139+ height: CGFloat(texture.height))
125 let width = Int(imageSize.width)
140 let width = Int(imageSize.width)
126 let height = Int(imageSize.height)
141 let height = Int(imageSize.height)
127 let imageByteCount = width * height * 4
142 let imageByteCount = width * height * 4
128 let bytesPerRow = width * 4
143 let bytesPerRow = width * 4
129 let region = MTLRegionMake2D(0, 0, width, height)
144 let region = MTLRegionMake2D(0, 0, width, height)
130
145
131− // Allocate the buffer if needed
132− if computeContext.imageBuffer == nil {
133− computeContext.imageBuffer = malloc(imageByteCount)
134− }
135−
136 // Transfer texture info into image buffer
146 // Transfer texture info into image buffer
137− texture.getBytes(computeContext.imageBuffer, bytesPerRow: bytesPerRow, fromRegion: region, mipmapLevel: 0)
147+ texture.getBytes(computeContext.imageBuffer,
148+ bytesPerRow: bytesPerRow,
149+ from: region,
150+ mipmapLevel: 0)
138
151
139 // Get info for UIImage
152 // Get info for UIImage
153+ let provider = CGDataProvider(dataInfo: nil,
140− let provider = CGDataProviderCreateWithData(nil, computeContext.imageBuffer, imageByteCount, nil)
154+ data: computeContext.imageBuffer,
155+ size: imageByteCount) {
156+ (_, _, _) in }
141− let bitsPerComponent = 8
157+ let bitsPerComponent = 8
142 let bitsperPixel = 32
158 let bitsperPixel = 32
143 let colorSpaceRef = CGColorSpaceCreateDeviceRGB()
159 let colorSpaceRef = CGColorSpaceCreateDeviceRGB()
144− let bitmapInfoRaw = CGImageAlphaInfo.PremultipliedLast.rawValue | CGBitmapInfo.ByteOrder32Big.rawValue
160+ let bitmapInfoRaw = CGImageAlphaInfo.premultipliedLast.rawValue |
161+ CGBitmapInfo.byteOrder32Big.rawValue
145 let bitmapInfo = CGBitmapInfo(rawValue: bitmapInfoRaw)
162 let bitmapInfo = CGBitmapInfo(rawValue: bitmapInfoRaw)
146− let renderingIntent = CGColorRenderingIntent.RenderingIntentDefault
163+ let renderingIntent = CGColorRenderingIntent.defaultIntent
147
164
148 // Create UIImage from image buffer
165 // Create UIImage from image buffer
149− let imageRef = CGImageCreate(width, height, bitsPerComponent, bitsperPixel, bytesPerRow, colorSpaceRef, bitmapInfo, provider, nil, false, renderingIntent)
166+ let imageRef = CGImage(width: width, height: height,
167+ bitsPerComponent: bitsPerComponent,
168+ bitsPerPixel: bitsperPixel,
169+ bytesPerRow: bytesPerRow,
170+ space: colorSpaceRef,
171+ bitmapInfo: bitmapInfo,
172+ provider: provider!,
173+ decode: nil, shouldInterpolate: false,
174+ intent: renderingIntent)
150− let image = UIImage(CGImage: imageRef!, scale: 0.0, orientation: .Up)
175+ let image = UIImage(cgImage: imageRef!, scale: 0.0, orientation: .up)
151
176
152 return image
177 return image
153 }
178 }
@@ -155,9 +180,11 @@ import ChameleonFramework
155 internal func metaballEdgesBuffer() -> MTLBuffer {
180 internal func metaballEdgesBuffer() -> MTLBuffer {
156 let floats = dataSource.metaballGraph.adjacencyMatrix.buffer
181 let floats = dataSource.metaballGraph.adjacencyMatrix.buffer
157
182
158− let bufferLength = floats.count * sizeof(Float)
183+ let bufferLength = floats.count * MemoryLayout<Float>.size
159 let device = context.device
184 let device = context.device
160− let buffer = device.newBufferWithBytes(floats, length: bufferLength, options: .StorageModeShared)
185+ let buffer = device.makeBuffer(bytes: floats,
186+ length: bufferLength,
187+ options: MTLResourceOptions())
161
188
162 return buffer
189 return buffer
163 }
190 }
@@ -166,16 +193,19 @@ import ChameleonFramework
166 // Create Float array for buffer
193 // Create Float array for buffer
167 // Exclude metaballs far from the view's bounds
194 // Exclude metaballs far from the view's bounds
168 let border: CGFloat = 100
195 let border: CGFloat = 100
169− let metaballs = self.dataSource.metaballs
196+ let metaballs = self.dataSource.metaballs!
170
197
171− var floats = [Float](count: 5, repeatedValue: 0)
198+ var floats = [Float](repeating: 0, count: 5)
172 floats = metaballs.reduce(floats) {
199 floats = metaballs.reduce(floats) {
173− (var array, metaball) -> [Float] in
200+ (array, metaball) -> [Float] in
201+ var array = array
174
202
175 let x = CGFloat(metaball.midX)
203 let x = CGFloat(metaball.midX)
176 let y = CGFloat(metaball.midY)
204 let y = CGFloat(metaball.midY)
205+ if -border < x,
177− if -border < x ≤ targetView.width + border &&
206+ x < targetView.width + border,
207+ -border < y,
178− -border < y ≤ targetView.height + border {
208+ y < targetView.height + border {
179 array.append(Float(x))
209 array.append(Float(x))
180 array.append(Float(y))
210 array.append(Float(y))
181
211
@@ -192,9 +222,11 @@ import ChameleonFramework
192 floats[0] = Float(floats.count) / 5
222 floats[0] = Float(floats.count) / 5
193
223
194 // Create buffer
224 // Create buffer
195− let bufferLength = floats.count * sizeof(Float)
225+ let bufferLength = floats.count * MemoryLayout<Float>.size
196 let device = context.device
226 let device = context.device
197− let buffer = device.newBufferWithBytes(floats, length: bufferLength, options: .StorageModeShared)
227+ let buffer = device.makeBuffer(bytes: floats,
228+ length: bufferLength,
229+ options: MTLResourceOptions())
198
230
199 return buffer
231 return buffer
200 }
232 }
PixelImage/SwiftSugar/ApproximationOperator.swiftdeleted−12
@@ -1,12 +0,0 @@
1−import Darwin
2−
3−infix operator ==~ { associativity right precedence 130 }
4−
5−func ==~ (left: DoubleValuable, right: DoubleValuable) -> Bool {
6− let leftDouble = left.toDouble
7− let rightDouble = right.toDouble
8− let epsilon = abs(leftDouble/10000)
9−
10− return (leftDouble <= rightDouble + epsilon) &&
11− (leftDouble >= rightDouble - epsilon)
12−}
PixelImage/SwiftSugar/Collections.swiftdeleted−6
@@ -1,6 +0,0 @@
1−func iterate<C, R>(collection: C, block: (String?, Any) -> R) {
2− let mirror = Mirror(reflecting: collection)
3− for child in mirror.children {
4− block(child.0, child.1)
5− }
6−}
PixelImage/SwiftSugar/ComparatorChains.swiftdeleted−57
@@ -1,57 +0,0 @@
1−let doubleMax: Double = 1E+37
2−let doubleMin: Double = -1E+37
3−let floatMax: Float = 1E+37
4−let floatMin: Float = -1E+37
5−let int32Max: Int = 0x7fffffff
6−let int32Min: Int = -0x7fffffff - 1
7−
8−infix operator ≤ { associativity right precedence 131 }
9−
10−func ≤ <T: Numeric>
11− (left: T, right: T) -> T {
12−
13− if left < right {
14− return left
15− } else {
16− return -0x7fffffff
17− }
18−}
19−
20−//
21−infix operator ≤= { associativity right precedence 131 }
22−
23−func ≤= <T: Numeric>
24− (left: T, right: T) -> T {
25−
26− if left <= right {
27− return left
28− } else {
29− return -0x7fffffff
30− }
31−}
32−
33−//
34−infix operator ≥ { associativity right precedence 131 }
35−
36−func ≥ <T: Numeric>
37− (left: T, right: T) -> T {
38−
39− if left > right {
40− return left
41− } else {
42− return 0x7fffffff
43− }
44−}
45−
46−//
47−infix operator ≥= { associativity right precedence 131 }
48−
49−func ≥= <T: Numeric>
50− (left: T, right: T) -> T {
51−
52− if left >= right {
53− return left
54− } else {
55− return 0x7fffffff
56− }
57−}
PixelImage/SwiftSugar/Dictionary.swiftdeleted−12
@@ -1,12 +0,0 @@
1−extension Dictionary {
2− subscript(keys: [Key]) -> [Value] {
3− get {
4− return keys.unwrappedMap { self[$0] }
5− }
6− set (values) {
7− for (key, value) in zip(keys, values) {
8− self[key] = value
9− }
10− }
11− }
12−}
PixelImage/SwiftSugar/Foundation/NSNumber.swiftdeleted−14
@@ -1,14 +0,0 @@
1−import Foundation
2−
3−extension NSNumber: DoubleValuable {
4− var toDouble: Double {
5− get {
6− return self.doubleValue
7− }
8− }
9−
10− static func fromDouble(double: Double) -> Self {
11− return self.init(double: double)
12− }
13−
14−}
PixelImage/SwiftSugar/Numeric.swift+7−18
@@ -1,23 +1,23 @@
1protocol DoubleValuable {
1protocol DoubleValuable {
2 var toDouble: Double { get }
2 var toDouble: Double { get }
3
3
4− static func fromDouble(double: Double) -> Self
4+ static func fromDouble(_ double: Double) -> Self
5}
5}
6
6
7postfix operator ++ { }
7postfix operator ++ { }
8
8
9protocol Incrementable {
9protocol Incrementable {
10− postfix func ++ (inout _: Self) -> Self
10+ postfix func ++ (_: inout Self) -> Self
11}
11}
12
12
13protocol Numeric: DoubleValuable, Incrementable, Comparable,
13protocol Numeric: DoubleValuable, Incrementable, Comparable,
14− IntegerLiteralConvertible {
14+ ExpressibleByIntegerLiteral {
15
15
16 @warn_unused_result func / (lhs: Self, rhs: Self) -> Self
16 @warn_unused_result func / (lhs: Self, rhs: Self) -> Self
17 @warn_unused_result func - (lhs: Self, rhs: Self) -> Self
17 @warn_unused_result func - (lhs: Self, rhs: Self) -> Self
18 @warn_unused_result func + (lhs: Self, rhs: Self) -> Self
18 @warn_unused_result func + (lhs: Self, rhs: Self) -> Self
19 @warn_unused_result func * (lhs: Self, rhs: Self) -> Self
19 @warn_unused_result func * (lhs: Self, rhs: Self) -> Self
20− postfix func ++ (inout _: Self) -> Self
20+ postfix func ++ (_: inout Self) -> Self
21}
21}
22
22
23protocol FastNumeric: Numeric {}
23protocol FastNumeric: Numeric {}
@@ -29,7 +29,7 @@ extension Double: FastNumeric {
29 }
29 }
30 }
30 }
31
31
32− static func fromDouble(double: Double) -> Double {
32+ static func fromDouble(_ double: Double) -> Double {
33 return double
33 return double
34 }
34 }
35
35
@@ -42,7 +42,7 @@ extension Float: FastNumeric {
42 }
42 }
43 }
43 }
44
44
45− static func fromDouble(double: Double) -> Float {
45+ static func fromDouble(_ double: Double) -> Float {
46 return Float(double)
46 return Float(double)
47 }
47 }
48
48
@@ -55,19 +55,8 @@ extension Int: FastNumeric {
55 }
55 }
56 }
56 }
57
57
58− static func fromDouble(double: Double) -> Int {
58+ static func fromDouble(_ double: Double) -> Int {
59 return Int(double)
59 return Int(double)
60 }
60 }
61
61
62}
62}
63−
64−//
65−extension Int {
66−
67− func times(@noescape block: () throws -> ()) rethrows {
68− for _ in 1...self {
69− try block()
70− }
71− }
72−
73−}
PixelImage/SwiftSugar/PowerOperator.swift+7−1
@@ -1,6 +1,12 @@
1import Darwin
1import Darwin
2
2
3+precedencegroup PowerPrecedence {
4+ higherThan: MultiplicationPrecedence
3−infix operator ^ { associativity right precedence 131 }
5+ associativity: right
6+}
7+
8+//
9+infix operator ^: PowerPrecedence
4
10
5func ^ <T: DoubleValuable>(left: T, right: T) -> T {
11func ^ <T: DoubleValuable>(left: T, right: T) -> T {
6 return T.fromDouble(pow(left.toDouble, right.toDouble))
12 return T.fromDouble(pow(left.toDouble, right.toDouble))
PixelImage/SwiftSugar/Sequence.swiftdeleted−16
@@ -1,16 +0,0 @@
1−extension SequenceType {
2− func unwrappedMap<T>
3− (@noescape transform: (Self.Generator.Element) throws -> T?) rethrows
4− -> [T] {
5− return try self.reduce( [T]() ) {
6− (var accumulator: [T], element: Self.Generator.Element) -> [T] in
7−
8− let transformed = try transform(element)
9− if let unwrapped = transformed {
10− accumulator.append(unwrapped)
11− }
12−
13− return accumulator
14− }
15− }
16−}
PixelImage/SwiftSugar/Sequences/Memoize.swiftdeleted−167
@@ -1,167 +0,0 @@
1−protocol MemoizedSequence: LazySequenceType {
2− typealias IndexType: Hashable
3− typealias ReturnType
4−
5− init(first: IndexType,
6− incrementer: ((inout IndexType) -> Void),
7− memoizedFunction: (IndexType -> ReturnType))
8−}
9−
10−struct HashMemoizedSequence<IndexType: Hashable, ReturnType>:
11− MemoizedSequence {
12−
13− let memoizedFunction: (IndexType -> ReturnType)
14− let increment: ((inout IndexType) -> Void)
15− let firstIndex: IndexType
16−
17− var index: IndexType
18−
19− init(first: IndexType,
20− incrementer: ((inout IndexType) -> Void),
21− memoizedFunction: (IndexType -> ReturnType)) {
22−
23− self.firstIndex = first
24−
25− self.index = first
26− self.increment = incrementer
27− self.memoizedFunction = memoizedFunction
28− }
29−
30− init(first: IndexType,
31− incrementer: ((inout IndexType) -> Void),
32− closure: ((IndexType -> ReturnType, IndexType) -> ReturnType)) {
33− let memoizedFunction = memoize(closure)
34−
35− self.init(first: first, incrementer: incrementer,
36− memoizedFunction: memoizedFunction)
37− }
38−
39− init(first: IndexType,
40− incrementer: ((inout IndexType) -> Void),
41− function: (IndexType -> ReturnType)) {
42−
43− let memoizedFunction = memoize(function)
44−
45− self.init(first: first, incrementer: incrementer,
46− memoizedFunction: memoizedFunction)
47− }
48−}
49−
50−extension HashMemoizedSequence: GeneratorType {
51−
52− mutating func next() -> ReturnType? {
53− let result = memoizedFunction(index)
54− increment(&index)
55− return result
56− }
57−
58−}
59−
60−extension HashMemoizedSequence: LazySequenceType {
61−
62− func generate() -> HashMemoizedSequence {
63− return self
64− }
65−
66−}
67−
68−extension HashMemoizedSequence where ReturnType: Comparable {
69−
70− @warn_unused_result
71− func contains(element: ReturnType) -> Bool {
72− var index = firstIndex
73−
74− while true {
75− let value = memoizedFunction(index)
76−
77− if value == element {
78− return true
79− } else if value > element {
80− return false
81− }
82−
83− increment(&index)
84− }
85− }
86−
87−}
88−
89−extension HashMemoizedSequence where IndexType: Incrementable {
90− init(first: IndexType,
91− closure: ((IndexType -> ReturnType, IndexType) -> ReturnType)) {
92− self.firstIndex = first
93− self.index = first
94− self.increment = { (inout index: IndexType) in
95− index++
96− }
97− self.memoizedFunction = memoize(closure)
98− }
99−
100− init(first: IndexType,
101− function: (IndexType -> ReturnType)) {
102− self.firstIndex = first
103− self.index = first
104− self.increment = { (inout index: IndexType) in
105− index++
106− }
107− self.memoizedFunction = memoize(function)
108− }
109−}
110−
111−extension HashMemoizedSequence where IndexType: Incrementable,
112−IndexType: IntegerLiteralConvertible {
113− init(_ closure: ((IndexType -> ReturnType, IndexType) -> ReturnType)) {
114− self.firstIndex = 1
115− self.index = 1
116− self.increment = { (inout index: IndexType) in
117− index++
118− }
119− self.memoizedFunction = memoize(closure)
120− }
121−
122− init(_ function: (IndexType -> ReturnType)) {
123− self.firstIndex = 1
124− self.index = 1
125− self.increment = { (inout index: IndexType) in
126− index++
127− }
128− self.memoizedFunction = memoize(function)
129− }
130−}
131−
132−func memoize<H: Hashable, R>(closure: ((H -> R, H) -> R)) -> (H -> R) {
133−
134− var table = [H: R]()
135−
136− var auxiliaryFunction: (H -> R)!
137− auxiliaryFunction = { index in
138− if let result = table[index] {
139− return result
140− }
141−
142− let result = closure(auxiliaryFunction, index)
143− table[index] = result
144−
145− return result
146− }
147−
148− return auxiliaryFunction
149−}
150−
151−func memoize<H: Hashable, R>(function: (H -> R)) -> (H -> R) {
152−
153− var table = [H: R]()
154−
155− let result: (H -> R) = { index in
156− if let result = table[index] {
157− return result
158− }
159−
160− let result = function(index)
161− table[index] = result
162−
163− return result
164− }
165−
166− return result
167−}
PixelImage/SwiftSugar/SignOperator.swiftdeleted−12
@@ -1,12 +0,0 @@
1−prefix operator ± { }
2−
3−prefix func ± <T: Numeric>(number: T) -> T {
4−
5− if number > 0 {
6− return 1
7− } else if number == 0 {
8− return 0
9− } else {
10− return -1
11− }
12−}
PixelImage/SwiftSugar/String.swiftdeleted−12
@@ -1,12 +0,0 @@
1−extension String: DoubleValuable {
2− var toDouble: Double {
3− get {
4− return Double(self) ?? Double(0)
5− }
6− }
7−
8− static func fromDouble(double: Double) -> String {
9− return "\(double)"
10− }
11−
12−}
PixelImage/SwiftSugar/SwiftSequences/Categorise.swiftdeleted−211
@@ -1,211 +0,0 @@
1−// MARK: - Eager
2−
3−// MARK: Categorise
4−
5−public extension SequenceType {
6−
7− /**
8− Categorises elements of `self` into a dictionary, with the keys
9− given by `keyFunc`
10− ```swift
11− struct Person : CustomStringConvertible {
12− let name: String
13− let age : Int
14− init(_ name: String, _ age: Int) {
15− self.name = name
16− self.age = age
17− }
18− var description: String { return name }
19− }
20−
21− let people = [
22− Person("Jo", 20),
23− Person("An", 20),
24− Person("Cthulu", 4000)
25− ]
26−
27− people.categorise { p in p.age }
28−
29− //[20: [Jo, An], 4000: [Cthulu]]
30− ```
31− */
32− @warn_unused_result
33− func categorise<U : Hashable>(@noescape keyFunc: Generator.Element throws -> U)
34− rethrows -> [U:[Generator.Element]] {
35− var dict: [U:[Generator.Element]] = [:]
36− for el in self {
37− let key = try keyFunc(el)
38− if case nil = dict[key]?.append(el) { dict[key] = [el] }
39− }
40− return dict
41− }
42−}
43−
44−public extension SequenceType where Generator.Element : Hashable {
45−
46− // MARK: Frequencies
47−
48− /**
49− Returns a dictionary where the keys are the elements of self, and
50− the values are their respective frequencies
51− ```swift
52− [0, 3, 0, 1, 1, 3, 2, 3, 1, 0].freqs()
53− // [2: 1, 0: 3, 3: 3, 1: 3]
54− ```
55− */
56− @warn_unused_result
57− func freqs() -> [Generator.Element:Int] {
58− var freqs: [Generator.Element:Int] = [:]
59− for el in self { freqs[el] = freqs[el]?.successor() ?? 1 }
60− return freqs
61− }
62−
63− // MARK: Uniques
64−
65− /**
66− Returns an array of the elements of `self`, in order, with
67− duplicates removed
68− ```swift
69− [3, 1, 2, 3, 2, 1, 1, 2, 3, 3].uniques()
70− // [3, 1, 2]
71− ```
72− */
73− @warn_unused_result
74− public func uniques() -> [Generator.Element] {
75− var prevs: Set<Generator.Element> = []
76− var uniqs: [Generator.Element] = []
77− for el in self where !prevs.contains(el) {
78− prevs.insert(el)
79− uniqs.append(el)
80− }
81− return uniqs
82− }
83−
84− /// Returns the element which occurs most frequently in `self`
85− @warn_unused_result
86− public func mostFrequent() -> Generator.Element? {
87− var g = generate()
88− guard let b = g.next() else { return nil }
89− var be = b
90− var bn = 1
91− var freqs: [Generator.Element:Int] = [:]
92− for e in self {
93− let n = (freqs[e] ?? 0) + 1
94− if n > bn { (be,bn) = (e,n) }
95− freqs[e] = n
96− }
97− return be
98− }
99−}
100−
101−// MARK: - Lazy
102−
103−// MARK: Uniques
104−/// :nodoc:
105−public struct UniquesGen<G : GeneratorType where G.Element : Hashable> : GeneratorType {
106−
107− private var prevs: Set<G.Element>
108− private var g: G
109− /// :nodoc:
110− public mutating func next() -> G.Element? {
111− while let next = g.next() {
112− if !prevs.contains(next) {
113− prevs.insert(next)
114− return next
115− }
116− }
117− return nil
118− }
119−}
120−/// :nodoc:
121−public struct UniquesSeq<
122− S : SequenceType where
123− S.Generator.Element : Hashable
124− > : LazySequenceType {
125− private let seq: S
126− /// :nodoc:
127− public func generate() -> UniquesGen<S.Generator> {
128− return UniquesGen(prevs: [], g: seq.generate())
129− }
130−}
131−
132−public extension LazySequenceType where Generator.Element : Hashable {
133−
134− /// returns a `LazySequence` of the elements of `self`, in order, with
135− /// duplicates removed
136− @warn_unused_result
137− func uniques() -> UniquesSeq<Self> {
138− return UniquesSeq(seq: self)
139− }
140−}
141−
142−// MARK: Grouping
143−
144−/// :nodoc:
145−
146−public struct GroupByGen<G : GeneratorType> : GeneratorType {
147−
148− private var genr: G
149− private var last: G.Element?
150− private let isEq: (G.Element, G.Element) -> Bool
151− /// :nodoc:
152− mutating public func next() -> [G.Element]? {
153− guard let head = last else { return nil }
154− var group = [head]
155− last = nil
156− while let next = genr.next() {
157− guard isEq(group.last!, next) else {
158− last = next
159− return group
160− }
161− group.append(next)
162− }
163− return group
164− }
165− private init(g : G, isEquivalent: (G.Element, G.Element) -> Bool) {
166− genr = g
167− last = genr.next()
168− isEq = isEquivalent
169− }
170−}
171−
172−/// :nodoc:
173−
174−public struct GroupBySeq<S : SequenceType> : LazySequenceType {
175− private let seq: S
176− private let isEquivalent: (S.Generator.Element, S.Generator.Element) -> Bool
177− /// :nodoc:
178− public func generate() -> GroupByGen<S.Generator> {
179− return GroupByGen(g: seq.generate(), isEquivalent: isEquivalent)
180− }
181−}
182−
183−public extension LazySequenceType where Generator.Element : Equatable {
184−
185− /// Returns a lazy sequence of self, chunked into arrays of adjacent equal values
186− /// ```swift
187− /// [1, 2, 2, 3, 1, 1, 3, 4, 2].lazy.group()
188− ///
189− /// [1], [2, 2], [3], [1, 1], [3], [4], [2]
190− /// ```
191− @warn_unused_result
192− func group() -> GroupBySeq<Self> {
193− return GroupBySeq(seq: self, isEquivalent: ==)
194− }
195−}
196−
197−public extension LazySequenceType {
198−
199− /// Returns a lazy sequence of self, chunked into arrays of adjacent equal values
200− /// - Parameter isEquivalent: a function that returns true if its two parameters are equal
201− /// ```swift
202− /// [1, 3, 5, 20, 22, 18, 6, 7].lazy.groupBy { (a,b) in abs(a - b) < 5 }
203− ///
204− /// [1, 3, 5], [20, 22, 18], [6, 7]
205− /// ```
206− @warn_unused_result
207− func group(isEquivalent: (Generator.Element, Generator.Element) -> Bool)
208− -> GroupBySeq<Self> {
209− return GroupBySeq(seq: self, isEquivalent: isEquivalent)
210− }
211−}
PixelImage/SwiftSugar/SwiftSequences/ChunkWindowSplit.swiftdeleted−146
@@ -1,146 +0,0 @@
1−// MARK: - Eager
2−
3−// MARK: Chunk
4−
5−public extension CollectionType {
6−
7− /// Returns an array of arrays of n non-overlapping elements of self
8− /// - Parameter n: The size of the chunk
9− /// - Precondition: `n > 0`
10− /// - SeeAlso: `func window(n: Int) -> [[Self.Generator.Element]]`
11− /// ```swift
12− /// [1, 2, 3, 4, 5].chunk(2)
13− ///
14− /// [[1, 2], [3, 4], [5]]
15− /// ```
16− @warn_unused_result
17− public func chunk(n: Index.Distance) -> [SubSequence] {
18− var res: [SubSequence] = []
19− var i = startIndex
20− var j: Index
21− while i != endIndex {
22− j = i.advancedBy(n, limit: endIndex)
23− res.append(self[i..<j])
24− i = j
25− }
26− return res
27− }
28−}
29−
30−// MARK: Window
31−
32−public extension CollectionType {
33−
34− /// Returns an array of arrays of n overlapping elements of self
35− /// - Parameter n: The size of the window
36− /// - SeeAlso: `func chunk(n: Int) -> [[Self.Generator.Element]]`
37− /// ```swift
38− /// [1, 2, 3, 4].window(2)
39− ///
40− /// [[1, 2], [2, 3], [3, 4]]
41− /// ```
42− @warn_unused_result
43− func window(n: Index.Distance) -> [SubSequence] {
44− var ret: [SubSequence] = []
45− ret.reserveCapacity(underestimateCount() - numericCast(n))
46− var i = startIndex
47− var j = i.advancedBy(n, limit: endIndex)
48− while true {
49− ret.append(self[i..<j])
50− i = i.successor()
51− if j == endIndex { return ret }
52− j = j.successor()
53− }
54− }
55−}
56−
57−// MARK: - Lazy
58−
59−// MARK: Chunk
60−/// :nodoc:
61−public struct ChunkGen<C: CollectionType> : GeneratorType {
62−
63− private var c: C
64− private let n: C.Index.Distance
65− private var i: C.Index
66−
67− public mutating func next() -> C.SubSequence? {
68− if i == c.endIndex { return nil }
69− let j = i.advancedBy(n, limit: c.endIndex)
70− defer { i = j }
71− return c[i..<j]
72− }
73−}
74−/// :nodoc:
75−public struct ChunkSeq<C: CollectionType> : LazySequenceType {
76−
77− private let c: C
78− private let n: C.Index.Distance
79− /// :nodoc:
80− public func generate() -> ChunkGen<C> {
81− return ChunkGen(c: c, n: n, i: c.startIndex)
82− }
83−}
84−
85−public extension LazyCollectionType {
86−
87− /// Returns lazily-generated arrays of n non-overlapping elements of self
88− /// - Parameter n: The size of the chunk
89− /// - SeeAlso: `func window(n: Int) -> WindowSeq<Self>`
90− /// ```swift
91− /// lazy([1, 2, 3, 4, 5]).chunk(2)
92− ///
93− /// [1, 2], [3, 4], [5]
94− /// ```
95− @warn_unused_result
96− func chunk(n: Index.Distance) -> ChunkSeq<Self> {
97− return ChunkSeq(c: self, n: n)
98− }
99−}
100−
101−// MARK: Window
102−/// :nodoc:
103−public struct WindowGen<C: CollectionType> : GeneratorType {
104−
105− private let c: C
106− private var i, j: C.Index
107− private var s: Bool
108− /// :nodoc:
109− mutating public func next() -> C.SubSequence? {
110− if s { return nil }
111− if j == c.endIndex {
112− s = true
113− return c[i..<j]
114− }
115− defer { (i,j) = (i.successor(),j.successor()) }
116− return c[i..<j]
117− }
118−}
119−
120−/// :nodoc:
121−
122−public struct WindowSeq<C: CollectionType> : LazySequenceType {
123−
124− private let c: C
125− private let n: C.Index.Distance
126− /// :nodoc:
127− public func generate() -> WindowGen<C> {
128− return WindowGen(c: c, i: c.startIndex, j: c.startIndex.advancedBy(n, limit: c.endIndex), s: false)
129− }
130−}
131−
132−public extension LazyCollectionType {
133−
134− /// Returns lazily-generated arrays of n overlapping elements of self
135− /// - Parameter n: The size of the window
136− /// - SeeAlso: `func chunk(n: Int) -> ChunkSeq<Self>`
137− /// ```swift
138− /// lazy([1, 2, 3, 4]).window(2)
139− ///
140− /// [1, 2], [2, 3], [3, 4]
141− /// ```
142− @warn_unused_result
143− func window(n: Index.Distance) -> WindowSeq<Self> {
144− return WindowSeq(c: self, n: n)
145− }
146−}
PixelImage/SwiftSugar/SwiftSequences/Combinations.swiftdeleted−114
@@ -1,114 +0,0 @@
1−/// :nodoc:
2−public struct ComboGen<SubElement> : GeneratorType {
3−
4− private let coll: [SubElement]
5− private var curr: [SubElement]
6− private var inds: [Int]
7− /// :nodoc:
8− mutating public func next() -> [SubElement]? {
9− for (max, curInd) in zip(coll.indices.reverse(), inds.indices.reverse())
10− where max != inds[curInd] {
11− curr[curInd] = coll[++inds[curInd]]
12− for j in inds.indices.suffixFrom(curInd+1) {
13− inds[j] = inds[j-1].successor()
14− curr[j] = coll[inds[j]]
15− }
16− return curr
17− }
18− return nil
19− }
20−}
21−/// :nodoc:
22−public struct ComboSeq<Element> : LazySequenceType {
23−
24− private let start: [Element]
25− private let col : [Element]
26− private let inds : [Int]
27− /// :nodoc:
28− public func generate() -> ComboGen<Element> {
29− return ComboGen<Element>(coll: col, curr: start, inds: inds)
30− }
31−
32− internal init(n: Int, col: [Element]) {
33− self.col = col
34− start = Array(col.prefixUpTo(n))
35− var inds = Array(col.indices.prefixUpTo(n))
36− if !inds.isEmpty { --inds[n.predecessor()] }
37− self.inds = inds
38− }
39−}
40−/// :nodoc:
41−public struct ComboRepGen<Element> : GeneratorType {
42−
43− private let coll: [Element]
44− private var curr: [Element]
45− private var inds: [Int]
46− private let max : Int
47− /// :nodoc:
48− mutating public func next() -> [Element]? {
49− for curInd in inds.indices.reverse() where max != inds[curInd] {
50− curr[curInd] = coll[++inds[curInd]]
51− for j in (curInd+1)..<inds.count {
52− inds[j] = inds[j-1]
53− curr[j] = coll[inds[j]]
54− }
55− return curr
56− }
57− return nil
58− }
59−}
60−/// :nodoc:
61−public struct ComboRepSeq<Element> : LazySequenceType {
62−
63− private let start: [Element]
64− private let inds : [Int]
65− private let col : [Element]
66− private let max : Int
67− /// :nodoc:
68− public func generate() -> ComboRepGen<Element> {
69− return ComboRepGen(coll: col, curr: start, inds: inds, max: max)
70− }
71−
72− internal init(n: Int, col: [Element]) {
73− self.col = col
74− start = col.first.map { x in Array(count: n, repeatedValue: x) } ?? []
75− var inds = Array(count: n, repeatedValue: col.startIndex)
76− if !inds.isEmpty { --inds[n-1] }
77− self.inds = inds
78− max = col.endIndex.predecessor()
79− }
80−}
81−
82−
83−extension SequenceType {
84− /**
85− Returns the combinations without repetition of length `n` of `self`
86− */
87− @warn_unused_result
88− public func combos(n: Int = 2) -> [[Generator.Element]] {
89− return Array(ComboSeq(n: n, col: Array(self)))
90− }
91− /**
92− Returns the combinations with repetition of length `n` of `self`
93− */
94− @warn_unused_result
95− public func combosWithRep(n: Int) -> [[Generator.Element]] {
96− return Array(ComboRepSeq(n: n, col: Array(self)))
97− }
98− /**
99− Returns the combinations without repetition of length `n` of `self`, generated lazily
100− and on-demand
101− */
102− @warn_unused_result
103− public func lazyCombos(n: Int) -> ComboSeq<Generator.Element> {
104− return ComboSeq(n: n, col: Array(self))
105− }
106− /**
107− Returns the combinations with repetition of length `n` of `self`, generated lazily and
108− on-demand
109− */
110− @warn_unused_result
111− public func lazyCombosWithRep(n: Int) -> ComboRepSeq<Generator.Element> {
112− return ComboRepSeq(n: n, col: Array(self))
113− }
114−}
PixelImage/SwiftSugar/SwiftSequences/Cycle.swiftdeleted−86
@@ -1,86 +0,0 @@
1−// MARK: - Eager
2−
3−// MARK: Cycle n
4−
5−public extension CollectionType {
6−
7− /// Returns an array of n cycles of self.
8− /// ```swift
9− /// [1, 2, 3].cycle(2)
10− ///
11− /// [1, 2, 3, 1, 2, 3]
12− /// ```
13− @warn_unused_result
14− func cycle(n: Int) -> [Generator.Element] {
15− var cycled: [Generator.Element] = []
16− cycled.reserveCapacity(underestimateCount() * n)
17− for _ in 0..<n {
18− cycled.appendContentsOf(self)
19− }
20− return cycled
21− }
22−}
23−
24−// MARK: - Lazy
25−
26−// MARK: Cycle n
27−/// :nodoc:
28−public struct CycleNGen<C: CollectionType> : GeneratorType, LazySequenceType {
29−
30− private let inner: C
31− private var innerGen: C.Generator
32− private var n: Int
33− /// :nodoc:
34− public mutating func next() -> C.Generator.Element? {
35− while true {
36− if let next = innerGen.next() { return next }
37− n -= 1
38− if n > 0 { innerGen = inner.generate() }
39− else { return nil }
40− }
41− }
42−}
43−
44−public extension LazySequenceType where Self : CollectionType {
45−
46− /// Returns a generator of n cycles of self.
47− /// ```swift
48− /// [1, 2, 3].lazy.cycle(2)
49− ///
50− /// 1, 2, 3, 1, 2, 3
51− /// ```
52− @warn_unused_result
53− func cycle(n: Int) -> CycleNGen<Self> {
54− return CycleNGen(inner: self, innerGen: generate(), n: n)
55− }
56−}
57−
58−// MARK: Cycle infinite
59−/// :nodoc:
60−public struct CycleGen<C: CollectionType> : GeneratorType, LazySequenceType {
61−
62− private let inner: C
63− private var innerGen: C.Generator
64− /// :nodoc:
65− public mutating func next() -> C.Generator.Element? {
66− for ;;innerGen = inner.generate() {
67− if let next = innerGen.next() {
68− return next
69− }
70− }
71− }
72−}
73−
74−public extension CollectionType {
75−
76− /// Returns an infinite generator of cycles of self.
77− /// ```swift
78− /// [1, 2, 3].cycle()
79− ///
80− /// 1, 2, 3, 1, 2, 3, 1...
81− /// ```
82− @warn_unused_result
83− func cycle() -> CycleGen<Self> {
84− return CycleGen(inner: self, innerGen: generate())
85− }
86−}
PixelImage/SwiftSugar/SwiftSequences/Enumerate.swiftdeleted−33
@@ -1,33 +0,0 @@
1−/// :nodoc:
2−public struct SpecEnumerateGen<Base : CollectionType> : GeneratorType {
3−
4− private let base: Base
5− private var i: Base.Index
6− /// :nodoc:
7− public mutating func next() -> (Base.Index, Base.Generator.Element)? {
8− return i == base.endIndex ? nil : (i, base[i++])
9− }
10−}
11−/// :nodoc:
12−public struct SpecEnumerateSeq<Base : CollectionType> : SequenceType {
13−
14− private let col: Base
15− /// :nodoc:
16− public func generate() -> SpecEnumerateGen<Base> {
17− return SpecEnumerateGen(base: col, i: col.startIndex)
18− }
19−}
20−
21−public extension CollectionType {
22−
23− /// Returns a lazy generator of tuples `(i, e)` where `i` is successive indices of self,
24− /// and `e` is the respective elements. Effectively the same as `.enumerate()`, but the
25− /// indices returned are `Self.Index`s, rather than `Int`s
26− /// - SeeAlso: `enumerate()`
27− @warn_unused_result
28− func specEnumerate() -> SpecEnumerateSeq<Self> {
29− return SpecEnumerateSeq(col: self)
30− }
31−}
32−
33−
PixelImage/SwiftSugar/SwiftSequences/Finding.swiftdeleted−80
@@ -1,80 +0,0 @@
1−prefix operator ! {}
2−public prefix func !<A>(f: A -> Bool) -> A -> Bool {
3− return { x in !f(x) }
4−}
5−
6−public extension SequenceType {
7−
8− /// Returns the first element in self that satisfies a predicate, or nil if it doesn't
9− /// exist
10− @warn_unused_result
11− func first(@noescape thatSatisfies: Generator.Element throws -> Bool) rethrows -> Generator.Element? {
12− for el in self where try thatSatisfies(el) { return el }
13− return nil
14− }
15−
16− /// Returns the number of elements in `self` that satisfy `predicate`
17− @warn_unused_result
18− func count(@noescape predicate: Generator.Element throws -> Bool) rethrows -> Int {
19− var i = 0
20− for el in self where try predicate(el) { i += 1 }
21− return i
22− }
23−
24− /// Returns true iff every element in `self` satisfies `predicate`
25− @warn_unused_result
26− func all(@noescape predicate: Generator.Element throws -> Bool) rethrows -> Bool {
27− for x in self { guard try predicate(x) else { return false } }
28− return true
29− }
30−}
31−
32−public extension CollectionType where Index : BidirectionalIndexType {
33−
34−
35− /// Returns the last element in self that satisfies a predicate, or nil if it doesn't
36− /// exist
37− @warn_unused_result
38− func last(@noescape predicate: Generator.Element throws -> Bool) rethrows -> Generator.Element? {
39− for el in reverse() {
40− if try predicate(el) {
41− return el
42− }
43− }
44− return nil
45− }
46−
47− /**
48− Returns the index of the final element in `self` which satisfies
49− `isElement`, or `nil` if it doesn't exist.
50− */
51− @warn_unused_result
52− func lastIndexOf(@noescape isElement: Generator.Element throws -> Bool) rethrows -> Index? {
53− for i in indices.reverse() where try isElement(self[i]) {
54− return i
55− }
56− return nil
57− }
58−}
59−
60−extension CollectionType {
61− /**
62− Returns the indices of elements of `self` that satisfy the predicate `isElement`
63− */
64− @warn_unused_result
65− func indicesOf(@noescape isElement: Generator.Element throws -> Bool) rethrows -> [Index] {
66− return try indices.filter { i in try isElement(self[i]) }
67− }
68−}
69−
70−public extension SequenceType {
71− @warn_unused_result
72− func partition(@noescape predicate: Generator.Element throws -> Bool) rethrows -> ([Generator.Element], [Generator.Element]) {
73− var t,f: [Generator.Element]
74− (t,f) = ([],[])
75− for e in self {
76− if try predicate(e) { t.append(e) } else { f.append(e) }
77− }
78− return (t,f)
79− }
80−}
PixelImage/SwiftSugar/SwiftSequences/FlatMap.swiftdeleted−23
@@ -1,23 +0,0 @@
1−extension LazySequenceType {
2−
3− @warn_unused_result
4− public func flatMap<T>(transform: Elements.Generator.Element -> T?)
5− -> LazyMapSequence<LazyFilterSequence<LazyMapSequence<Elements, T?>>, T> {
6− return self
7− .map(transform)
8− .filter { opt in opt != nil }
9− .map { notNil in notNil! }
10− }
11−}
12−
13−extension LazyCollectionType {
14−
15− @warn_unused_result
16− public func flatMap<T>(transform: Elements.Generator.Element -> T?)
17− -> LazyMapCollection<LazyFilterCollection<LazyMapCollection<Elements, T?>>, T> {
18− return self
19− .map(transform)
20− .filter { opt in opt != nil }
21− .map { notNil in notNil! }
22− }
23−}
PixelImage/SwiftSugar/SwiftSequences/Hopping.swiftdeleted−78
@@ -1,78 +0,0 @@
1−public struct RandomAccessHopCollection<
2− Base: CollectionType where
3− Base.Index : RandomAccessIndexType,
4− Base.Index.Distance : ForwardIndexType
5− >: CollectionType {
6−
7− private let base: Base
8− private let by : Base.Index.Stride
9− private let fac : Base.Index.Distance
10−
11− public let startIndex: Base.Index.Distance
12− public let endIndex: Base.Index.Distance
13−
14− public typealias SubSequence = RandomAccessHopCollection<Base>
15−
16− public subscript(i: Base.Index.Distance) -> Base.Generator.Element {
17− return base[base.startIndex.advancedBy(fac * i)]
18− }
19−
20− public func generate() -> IndexingGenerator<RandomAccessHopCollection<Base>> {
21− return IndexingGenerator(self)
22− }
23−
24− private init(_ b: Base, _ by: Base.Index.Stride) {
25− base = b
26− self.by = by
27− fac = base.startIndex.distanceTo(base.startIndex.advancedBy(by))
28− if base.isEmpty { endIndex = 0 }
29− else { endIndex = (base.startIndex.distanceTo(base.endIndex.predecessor()) / fac).successor() }
30− startIndex = 0
31− }
32−
33− private init(_ b: Base, _ by: Base.Index.Stride, from: Base.Index.Distance, to: Base.Index.Distance) {
34− base = b
35− self.by = by
36− fac = base.startIndex.distanceTo(base.startIndex.advancedBy(by))
37− startIndex = from
38− endIndex = to
39− }
40−
41− public subscript(r: Range<Base.Index.Distance>) -> RandomAccessHopCollection<Base> {
42− return RandomAccessHopCollection(base, by, from: r.startIndex, to: r.endIndex)
43− }
44−}
45−
46−extension CollectionType where Index: RandomAccessIndexType, Index.Distance: ForwardIndexType {
47− public subscript(by by: Index.Stride) -> RandomAccessHopCollection<Self> {
48− return RandomAccessHopCollection(self, by)
49− }
50−}
51−
52−extension RandomAccessHopCollection: CustomStringConvertible, CustomDebugStringConvertible {
53− public var debugDescription: String {
54− return Array(self).debugDescription
55− }
56− public var description: String {
57− return String(Array(self))
58− }
59−}
60−
61−public extension CollectionType where
62− SubSequence: CollectionType,
63− Index == SubSequence.Index,
64− SubSequence.Index: RandomAccessIndexType,
65− SubSequence.Index.Distance: ForwardIndexType {
66− subscript(r: Range<Index>, by by: Index.Stride) -> RandomAccessHopCollection<SubSequence> {
67− return self[r][by: by]
68− }
69− subscript(r: OpenEndedRange<Index>, by by: Index.Stride) -> RandomAccessHopCollection<SubSequence> {
70− return suffixFrom(r.val)[by: by]
71− }
72− subscript(r: OpenStartedRangeTo<Index>, by by: Index.Stride) -> RandomAccessHopCollection<SubSequence> {
73− return prefixUpTo(r.val)[by: by]
74− }
75− subscript(r: OpenStartedRangeThrough<Index>, by by: Index.Stride) -> RandomAccessHopCollection<SubSequence> {
76− return prefixThrough(r.val)[by: by]
77− }
78−}
PixelImage/SwiftSugar/SwiftSequences/Interpose.swiftdeleted−366
@@ -1,366 +0,0 @@
1−// MARK: - Eager
2−
3−// MARK: Interpose with single element
4−
5−public extension SequenceType {
6−
7− /// Returns an array that alternates between successive elements of self and element
8− /// ```swift
9− /// [1, 2, 3].interpose(10)
10− ///
11− /// [1, 10, 2, 10, 3]
12− /// ```
13− @warn_unused_result
14− func interpose(element: Generator.Element) -> [Generator.Element] {
15− var g = generate()
16−
17− return g.next().map {
18− var ret = [$0]
19− while let next = g.next() {
20− ret.append(element)
21− ret.append(next)
22− }
23− return ret
24− } ?? []
25− }
26−
27− /// Returns an array that alternates between n successive elements of self and element
28− /// ```swift
29− /// [1, 2, 3, 4, 5].interpose(10, n: 2)
30− ///
31− /// [1, 2, 10, 3, 4, 10, 5]
32− /// ```
33− @warn_unused_result
34− func interpose(element: Generator.Element, n: Int) -> [Generator.Element] {
35−
36− var ret: [Generator.Element] = []
37− var g = generate()
38− var i = n + 1
39−
40− while let next = g.next() {
41− if --i == 0 {
42− ret.append(element)
43− i = n
44− }
45− ret.append(next)
46− }
47− return ret
48− }
49−}
50−
51−// MARK: Interpose with collection
52−
53−public extension SequenceType {
54−
55− /// Returns an array that alternates between successive elements of self and elements of
56− /// a colletion
57− /// ```swift
58− /// [1, 2, 3].interpose([10, 20])
59− ///
60− /// [1, 10, 20, 2, 10, 20, 3]
61− /// ```
62− @warn_unused_result
63− func interpose<C : CollectionType where C.Generator.Element == Generator.Element>
64− (col: C) -> [Generator.Element] {
65− var g = generate()
66− return g.next().map {
67− var ret = [$0]
68− while let next = g.next() {
69− ret.appendContentsOf(col)
70− ret.append(next)
71− }
72− return ret
73− } ?? []
74− }
75−
76− /// Returns an array that alternates between n successive elements of self and elements
77− /// of a colletion
78− /// ```swift
79− /// [1, 2, 3, 4, 5].interpose([10, 20], n: 2)
80− ///
81− /// [1, 2, 10, 20, 3, 4, 10, 20, 5]
82− /// ```
83−
84− func interpose<C : CollectionType where C.Generator.Element == Generator.Element>
85− (col: C, n: Int) -> [Generator.Element] {
86− var g = generate()
87− return g.next().map {
88− var i = n
89− var ret = [$0]
90− while let next = g.next() {
91− if --i == 0 {
92− ret.appendContentsOf(col)
93− i = n
94− }
95− ret.append(next)
96− }
97− return ret
98− } ?? []
99− }
100−}
101−
102−// MARK: Interdigitate
103−
104−/// Returns an array of two sequences interdigitated
105−/// ```swift
106−/// interdig([1, 2, 3], [10, 20, 30])
107−///
108−/// [1, 10, 2, 20, 3, 30]
109−/// ```
110−@warn_unused_result
111−public func interdig<
112− S0 : SequenceType, S1 : SequenceType where
113− S0.Generator.Element == S1.Generator.Element
114− >(s0: S0, _ s1: S1) -> [S0.Generator.Element] {
115−
116− var ret: [S0.Generator.Element] = []
117−
118− var (g0, g1) = (s0.generate(), s1.generate())
119−
120− while let e0 = g0.next(), e1 = g1.next() {
121− ret.append(e0)
122− ret.append(e1)
123− }
124−
125− return ret
126−}
127−
128−/// Returns an array of two sequences interdigitated, with the respective length of each
129−/// interdigitation specified
130−/// - Parameter s0Len: The length of the first sequence's interdigitations
131−/// - Parameter s1Len: The length of the second sequence's interdigitations
132−/// ```swift
133−/// interdig([1, 2, 3, 4, 5], [10, 20, 30, 40, 50, 60], s0Len: 2, s1Len: 3)
134−///
135−/// [1, 2, 10, 20, 30, 3, 4, 40, 50, 60, 5]
136−/// ```
137−@warn_unused_result
138−public func interdig<
139− S0 : SequenceType, S1 : SequenceType where
140− S0.Generator.Element == S1.Generator.Element
141− >(s0: S0, _ s1: S1, s0Len: Int, s1Len: Int) -> [S0.Generator.Element] {
142−
143− var ret: [S0.Generator.Element] = []
144−
145− var (g0, g1) = (s0.generate(), s1.generate())
146−
147− for ;; {
148− for _ in 0..<s0Len {
149− if let next = g0.next() {
150− ret.append(next)
151− } else {
152− return ret
153− }
154− }
155− for _ in 0..<s1Len {
156− if let next = g1.next() {
157− ret.append(next)
158− } else {
159− return ret
160− }
161− }
162− }
163−}
164−
165−// MARK: - Lazy
166−
167−// MARK: Interpose with single element
168−/// :nodoc:
169−public struct InterposeElGen<G : GeneratorType> : GeneratorType {
170−
171− private let n: Int
172− private var count: Int
173− private var g: G
174− private let element: G.Element
175− /// :nodoc:
176− public mutating func next() -> G.Element? {
177− return --count < 0 ? {count = n; return element}() : g.next()
178− }
179−}
180−/// :nodoc:
181−public struct InterposeElSeq<S : SequenceType> : LazySequenceType {
182−
183− private let element: InterposeElGen<S.Generator>.Element
184− private let n: Int
185− private let seq: S
186− /// :nodoc:
187− public func generate() -> InterposeElGen<S.Generator> {
188− return InterposeElGen(n: n, count: n, g: seq.generate(), element: element)
189− }
190−}
191−
192−public extension LazySequenceType {
193−
194− /// Returns a lazy sequence that alternates between successive elements of self and an
195− /// element
196− /// ```swift
197− /// [1, 2, 3].lazy.interpose(10)
198− ///
199− /// 1, 10, 2, 10, 3, 10
200− /// ```
201− @warn_unused_result
202− func interpose(element: Generator.Element) -> InterposeElSeq<Self> {
203− return InterposeElSeq(element: element, n: 1, seq: self)
204− }
205−
206− /// Returns a lazy sequence that alternates between n successive elements of self and an
207− /// element
208− /// ```swift
209− /// [1, 2, 3, 4, 5].lazy.interpose(10, n: 2)
210− ///
211− /// 1, 2, 10, 3, 4, 10, 5
212− /// ```
213− @warn_unused_result
214− func interpose(element: Generator.Element, n: Int) -> InterposeElSeq<Self> {
215− return InterposeElSeq(element: element, n: n, seq: self)
216− }
217−}
218−
219−// MARK: Interpose with collection
220−/// :nodoc:
221−public struct InterposeColGen<
222− G : GeneratorType,
223− C: CollectionType where
224− G.Element == C.Generator.Element
225− > : GeneratorType {
226−
227− private let col: C
228− private var g: G
229− private let n: Int
230− private var count: Int
231− private var colG: C.Generator
232− /// :nodoc:
233− public mutating func next() -> G.Element? {
234− return --count <= 0 ? {
235− colG.next() ?? {
236− count = n
237− colG = col.generate()
238− return g.next()
239− }()}() : g.next()
240− }
241−}
242−/// :nodoc:
243−public struct InterposeColSeq<
244− S : SequenceType,
245− C: CollectionType where
246− S.Generator.Element == C.Generator.Element
247− > : LazySequenceType {
248−
249− private let col: C
250− private let n: Int
251− private let seq: S
252− /// :nodoc:
253− public func generate() -> InterposeColGen<S.Generator, C> {
254− return InterposeColGen(col: col, g: seq.generate(), n: n, count: n + 1, colG: col.generate())
255− }
256−}
257−
258−public extension LazySequenceType {
259−
260− /// Returns a lazy sequence that alternates between successive elements of self and
261− /// elements of a colletion
262− /// ```swift
263− /// [1, 2, 3].lazy.interpose([10, 20])
264− ///
265− /// 1, 10, 20, 2, 10, 20, 3, 10, 20
266− /// ```
267− @warn_unused_result
268− func interpose<
269− C: CollectionType where
270− C.Generator.Element == Generator.Element
271− >(elements: C) -> InterposeColSeq<Self, C> {
272− return InterposeColSeq(col: elements, n: 1, seq: self)
273− }
274−
275− /// Returns a lazy sequence that alternates between n successive elements of self and
276− /// elements of a colletion
277− /// ```swift
278− /// [1, 2, 3, 4, 5].lazy.interpose([10, 20], n: 2)
279− ///
280− /// 1, 2, 10, 20, 3, 4, 10, 20, 5
281− /// ```
282− @warn_unused_result
283− func interpose<
284− C: CollectionType where
285− C.Generator.Element == Generator.Element
286− >(elements: C, n: Int) -> InterposeColSeq<Self, C> {
287− return InterposeColSeq(col: elements, n: n, seq: self)
288− }
289−}
290−
291−// MARK: Interdigitate
292−/// :nodoc:
293−public struct InterDigGen<
294− G0 : GeneratorType,
295− G1 : GeneratorType where
296− G0.Element == G1.Element
297− > : GeneratorType {
298−
299− private var g0: G0
300− private var g1: G1
301−
302− private let aN: Int
303− private let bN: Int
304−
305− private var count: Int
306− /// :nodoc:
307− public mutating func next() -> G0.Element? {
308− for (--count;;count = aN) {
309− if count >= bN { return count < 0 ? g1.next() : g0.next() }
310− }
311− }
312−}
313−/// :nodoc:
314−public struct InterDigSeq<
315− S0 : LazySequenceType,
316− S1 : LazySequenceType where
317− S0.Generator.Element == S1.Generator.Element
318− > : LazySequenceType {
319−
320− private let s0: S0
321− private let s1: S1
322−
323− private let aN: Int
324− private let bN: Int
325− /// :nodoc:
326− public func generate() -> InterDigGen<S0.Generator, S1.Generator> {
327− return InterDigGen(
328− g0: s0.generate(),
329− g1: s1.generate(),
330− aN: aN - 1,
331− bN: -bN,
332− count: aN
333− )
334− }
335−}
336−
337−/// Returns a lazy sequence of two sequences interdigitated
338−/// ```swift
339−/// interdig([1, 2, 3].lazy, [10, 20, 30].lazy)
340−///
341−/// 1, 10, 2, 20, 3, 30
342−/// ```
343−@warn_unused_result
344−public func interdig<
345− S0 : LazySequenceType, S1 : LazySequenceType where
346− S0.Generator.Element == S1.Generator.Element
347− >(s0: S0, _ s1: S1) -> InterDigSeq<S0, S1> {
348− return InterDigSeq(s0: s0, s1: s1, aN: 1, bN: 1)
349−}
350−
351−/// Returns a lazy sequence of two sequences interdigitated, with the respective length of
352−/// each interdigitation specified
353−/// - Parameter s0Len: The length of the first sequence's interdigitations
354−/// - Parameter s1Len: The length of the second sequence's interdigitations
355−/// ```swift
356−/// interdig([1, 2, 3, 4, 5].lazy, [10, 20, 30, 40, 50, 60].lazy, s0Len: 2, s1Len: 3)
357−///
358−/// 1, 2, 10, 20, 30, 3, 4, 40, 50, 60, 5
359−/// ```
360−@warn_unused_result
361−public func interdig<
362− S0 : SequenceType, S1 : SequenceType where
363− S0.Generator.Element == S1.Generator.Element
364− >(s0: S0, _ s1: S1, s0Len: Int, s1Len: Int = 1) -> InterDigSeq<S0, S1> {
365− return InterDigSeq(s0: s0, s1: s1, aN: s0Len, bN: s1Len)
366−}
PixelImage/SwiftSugar/SwiftSequences/Iterate.swiftdeleted−34
@@ -1,34 +0,0 @@
1−public struct IterateGenerator<Element>: GeneratorType {
2− private var x: Element
3− private let f: Element -> Element
4− public mutating func next() -> Element? {
5− defer { x = f(x) }
6− return x
7− }
8−}
9−
10−public struct IterateSequence<Element>: SequenceType {
11− private let x: Element
12− private let f: Element -> Element
13− public func generate() -> IterateGenerator<Element> {
14− return IterateGenerator(x: x, f: f)
15− }
16−}
17−
18−public struct IterateEndGenerator<Element>: GeneratorType {
19− private var x: Element?
20− private var f: Element -> Element?
21− public mutating func next() -> Element? {
22− guard let y = x else { return nil }
23− defer { x = f(y) }
24− return y
25− }
26−}
27−
28−public struct IterateEndSequence<Element>: SequenceType {
29− private let x: Element
30− private let f: Element -> Element?
31− public func generate() -> IterateEndGenerator<Element> {
32− return IterateEndGenerator(x: x, f: f)
33− }
34−}
PixelImage/SwiftSugar/SwiftSequences/NestedSequences.swiftdeleted−229
@@ -1,229 +0,0 @@
1−// MARK: - Eager
2−
3−// MARK: Cartesian Product
4−
5−private extension GeneratorType where Element : CollectionType {
6− mutating private func product() -> [[Element.Generator.Element]] {
7− guard let x = next() else { return [[]] }
8− let xs = product()
9− return x.flatMap { h in xs.map { [h] + $0 } }
10− }
11−}
12−
13−public extension SequenceType where Generator.Element : SequenceType, Generator.Element : CollectionType {
14−
15− /// Returns a cartesian product of self
16− /// ```swift
17− /// [[1, 2], [3, 4]].product()
18− /// [[1, 3], [1, 4], [2, 3], [2, 4]]
19− /// ```
20− @warn_unused_result
21− public func product() -> [[Generator.Element.Generator.Element]] {
22− var g = generate()
23− return g.product()
24− }
25−}
26−
27−public extension SequenceType where Generator.Element : SequenceType {
28−
29− /// Returns a cartesian product of self
30− /// ```swift
31− /// [[1, 2], [3, 4]].product()
32− /// [[1, 3], [1, 4], [2, 3], [2, 4]]
33− /// ```
34− @warn_unused_result
35− public func product() -> [[Generator.Element.Generator.Element]] {
36− return map(Array.init).product()
37− }
38−}
39−
40−/// Cartesian product
41−/// ```swift
42−/// product([1, 2], [3, 4])
43−/// [[1, 3], [1, 4], [2, 3], [2, 4]]
44−/// ```
45−@warn_unused_result
46−public func product<C : CollectionType>(cols: C...) -> [[C.Generator.Element]] {
47− return cols.product()
48−}
49−
50−/// Cartesian product
51−/// ```swift
52−/// product([1, 2], [3, 4])
53−/// [[1, 3], [1, 4], [2, 3], [2, 4]]
54−/// ```
55−
56−public func product<S : SequenceType>(cols: S...) -> [[S.Generator.Element]] {
57− return cols.product()
58−}
59−
60−// MARK: Transposition
61−
62−private extension SequenceType {
63− private func mapM<U>(@noescape transform: Generator.Element -> U?) -> [U]? {
64− var result: [U] = []
65− result.reserveCapacity(underestimateCount())
66− for e in self {
67− if let r = transform(e) { result.append(r) } else { return nil }
68− }
69− return result
70− }
71−}
72−
73−public extension SequenceType where Generator.Element : SequenceType {
74−
75− /// Returns a transposed self
76− /// ```swift
77− /// [[1, 2, 3], [1, 2, 3], [1, 2, 3]].transpose()
78− ///
79− /// [[1, 1, 1], [2, 2, 2], [3, 3, 3]]
80− /// ```
81− @warn_unused_result
82− func transpose() -> [[Generator.Element.Generator.Element]] {
83− return Array(TransposeSeq(seq: self))
84− }
85−}
86−
87−// MARK: - Lazy
88−
89−// MARK: Cartesian Product
90−/// :nodoc:
91−public struct ProdGen<C : CollectionType> : GeneratorType {
92−
93− private let cols: [C] // Must be collections, not sequences, in order to be multi-pass
94−
95− private var gens: [C.Generator]
96− private var curr: [C.Generator.Element]
97− /// :nodoc:
98− public mutating func next() -> [C.Generator.Element]? {
99−
100− for i in gens.indices.reverse() { // Loop through generators in reverse order, rolling over
101− if let n = gens[i].next() { // if generator isn't finished, just increment that column, return
102− curr[i] = n
103− return curr
104− } else { // generator is finished
105− gens[i] = cols[i].generate() // reset the generator
106− curr[i] = gens[i].next()! // set the current column to the first element of the generator
107− }
108− }
109− return nil
110− }
111−
112− private init(cols: [C]) {
113− var gens = cols.map{$0.generate()}
114− self.cols = cols
115− curr = gens.dropLast().indices.map{gens[$0].next()!} + [self.cols.last!.first!]
116− /**
117− set curr to the first value of each of the generators, except the last: don't
118− increment this generator, so that the first value returned contains it.
119− */
120− self.gens = gens
121− }
122−}
123−/// :nodoc:
124−public struct ProdSeq<C : CollectionType> : LazySequenceType {
125− private let cols: [C]
126− /// :nodoc:
127− public func generate() -> ProdGen<C> {
128− return ProdGen( cols: cols )
129− }
130− /// :nodoc:
131− public func underestimateCount() -> Int {
132− return cols.reduce(1) { (n,c) in n * c.underestimateCount() }
133− }
134−}
135−
136−/// Lazy Cartesian Product
137−/// ```swift
138−/// lazyProduct([1, 2], [3, 4])
139−///
140−/// [1, 3], [1, 4], [2, 3], [2, 4]
141−/// ```
142−@warn_unused_result
143−public func lazyProduct<C : CollectionType>
144− (cols: C...) -> ProdSeq<C> {
145− return ProdSeq(cols: cols)
146−}
147−
148−/// Lazy Cartesian Product
149−/// ```swift
150−/// lazyProduct([1, 2], [3, 4])
151−///
152−/// [1, 3], [1, 4], [2, 3], [2, 4]
153−/// ```
154−@warn_unused_result
155−public func lazyProduct<S : SequenceType>
156− (cols: S...) -> ProdSeq<[S.Generator.Element]> {
157− return ProdSeq(cols: cols.map(Array.init))
158−}
159−
160−public extension SequenceType where Generator.Element : SequenceType {
161−
162− /// Lazy Cartesian Product
163− /// ```swift
164− /// [[1, 2], [3, 4]].lazyProduct()
165− ///
166− /// [1, 3], [1, 4], [2, 3], [2, 4]
167− /// ```
168− @warn_unused_result
169− func lazyProduct() -> ProdSeq<[Generator.Element.Generator.Element]> {
170− return ProdSeq(cols: map(Array.init))
171− }
172−}
173−
174−public extension SequenceType where Generator.Element : CollectionType {
175−
176− /// Lazy Cartesian Product
177− /// ```swift
178− /// [[1, 2], [3, 4]].lazyProduct()
179− ///
180− /// [1, 3], [1, 4], [2, 3], [2, 4]
181− /// ```
182− @warn_unused_result
183− func lazyProduct() -> ProdSeq<Generator.Element> {
184− return ProdSeq(cols: Array(self))
185− }
186−}
187−
188−// MARK: Transposition
189−/// :nodoc:
190−public struct TransposeGen<T, G : GeneratorType where G.Element == T> : GeneratorType {
191− private var gens: [G]
192− /// :nodoc:
193− mutating public func next() -> [T]? {
194− return gens.indices.mapM { i in gens[i].next() }
195− }
196−}
197−/// :nodoc:
198−public struct TransposeSeq<
199− S : SequenceType where
200− S.Generator.Element : SequenceType
201− > : LazySequenceType {
202− private let seq: S
203− /// :nodoc:
204− public func generate()
205− -> TransposeGen<S.Generator.Element.Generator.Element, S.Generator.Element.Generator>{
206− return TransposeGen(gens: seq.map { g in g.generate() })
207− }
208−}
209−
210−public extension TransposeSeq where S: CollectionType {
211− @warn_unused_result
212− public func underestimateCount() -> Int {
213− return seq.first?.underestimateCount() ?? 0
214− }
215−}
216−
217−public extension LazySequenceType where Generator.Element: SequenceType {
218−
219− /// Returns a lazily transposed self
220− /// ```swift
221− /// lazy([[1, 2, 3], [1, 2, 3], [1, 2, 3]]).transpose()
222− ///
223− /// [1, 1, 1], [2, 2, 2], [3, 3, 3]
224− /// ```
225− @warn_unused_result
226− func transpose() -> TransposeSeq<Self> {
227− return TransposeSeq(seq: self)
228− }
229−}
PixelImage/SwiftSugar/SwiftSequences/Permutations.swiftdeleted−187
@@ -1,187 +0,0 @@
1−// MARK: - Common
2−
3−public extension MutableCollectionType {
4−
5− /// [Algorithm](https://en.wikipedia.org/wiki/Permutation#Generation_in_lexicographic_order)
6−
7− public mutating func nextLexPerm
8− (isOrderedBefore: (Generator.Element, Generator.Element) -> Bool) -> Self? {
9− for k in indices.reverse().dropFirst()
10− where isOrderedBefore(self[k], self[k.successor()]) {
11− for l in indices.reverse() where isOrderedBefore(self[k], self[l]) {
12− swap(&self[k], &self[l])
13− let r = (k.successor()..<endIndex)
14− for (x, y) in zip(r, r.reverse()) {
15− if x == y || x == y.successor() { return self }
16− swap(&self[x], &self[y])
17− }
18− }
19− }
20− return nil
21− }
22−}
23−
24−public extension MutableCollectionType where Generator.Element : Comparable {
25−
26− /// [Algorithm](https://en.wikipedia.org/wiki/Permutation#Generation_in_lexicographic_order)
27−
28− public mutating func nextLexPerm() -> Self? {
29− return nextLexPerm(<)
30− }
31−}
32−/// :nodoc:
33−public struct LexPermGen<C : MutableCollectionType> : GeneratorType {
34− private var col: C?
35− private let order: (C.Generator.Element, C.Generator.Element) -> Bool
36− /// :nodoc:
37− mutating public func next() -> C? {
38− defer { col = col?.nextLexPerm(order) }
39− return col
40− }
41−}
42−/// :nodoc:
43−public struct LexPermSeq<C : MutableCollectionType> : LazySequenceType {
44− private let col: C
45− private let order: (C.Generator.Element, C.Generator.Element) -> Bool
46− /// :nodoc:
47− public func generate() -> LexPermGen<C> {
48− return LexPermGen(col: col, order: order)
49− }
50−}
51−
52−// MARK: - Eager
53−
54−public extension SequenceType {
55−
56− /// Returns an array of the permutations of self, ordered lexicographically, according
57− /// to the closure `isOrderedBefore`.
58− /// - Note: The permutations returned follow self, so if self is not the first
59− /// lexicographically ordered permutation, not all permutations will be returned.
60− /// ```swift
61− /// [1, 2, 3].lexPermutations(<)
62− ///
63− /// [[1, 2, 3], [1, 3, 2], [2, 1, 3], [2, 3, 1], [3, 1, 2], [3, 2, 1]]
64− /// ```
65− /// ```swift
66− /// [1, 2, 3].lexPermutations(>)
67− ///
68− /// [[1, 2, 3]]
69− /// ```
70− @warn_unused_result
71− public func lexPermutations
72− (isOrderedBefore: (Generator.Element, Generator.Element) -> Bool) -> [[Generator.Element]] {
73− return Array(LexPermSeq(col: Array(self), order: isOrderedBefore))
74− }
75−}
76−
77−public extension MutableCollectionType where Generator.Element : Comparable {
78−
79− /// Returns an array of the permutations of self, ordered lexicographically.
80− /// - Note: The permutations returned follow self, so if self is not the first
81− /// lexicographically ordered permutation, not all permutations will be returned.
82− /// ```swift
83− /// [1, 2, 3].lexPermutations()
84− ///
85− /// [[1, 2, 3], [1, 3, 2], [2, 1, 3], [2, 3, 1], [3, 1, 2], [3, 2, 1]]
86− /// ```
87− /// ```swift
88− /// [3, 2, 1].lexPermutations()
89− ///
90− /// [[3, 2, 1]]
91− /// ```
92− @warn_unused_result
93− public func lexPermutations() -> [[Generator.Element]] {
94− return Array(LexPermSeq(col: Array(self), order: <))
95− }
96−}
97−
98−public extension SequenceType {
99−
100− /// Returns an array of the permutations of self.
101− /// ```swift
102− /// [1, 2, 3].permutations()
103− ///
104− /// [[1, 2, 3], [1, 3, 2], [2, 1, 3], [2, 3, 1], [3, 1, 2], [3, 2, 1]]
105− /// ```
106− @warn_unused_result
107− public func permutations() -> [[Generator.Element]] {
108− var col = Array(self)
109− return Array(LexPermSeq(col: Array(col.indices), order: <).map { inds in inds.map{col[$0]} })
110− }
111− /// Returns an array of the permutations of length `n` of self.
112− /// ```swift
113− /// [1, 2, 3].permutations()
114− ///
115− /// [[1, 2, 3], [1, 3, 2], [2, 1, 3], [2, 3, 1], [3, 1, 2], [3, 2, 1]]
116− /// ```
117− public func permutations(n: Int) -> [[Generator.Element]] {
118− return Array(lazyCombos(n).flatMap { a in a.permutations() })
119− }
120−}
121−
122−// MARK: - Lazy
123−
124−public extension SequenceType {
125−
126− /// Returns a lazy sequence of the permutations of self, ordered lexicographically,
127− /// according to the closure `isOrderedBefore`.
128− /// - Note: The permutations returned follow self, so if self is not the first
129− /// lexicographically ordered permutation, not all permutations will be returned.
130− /// ```swift
131− /// lazy([1, 2, 3]).lazyLexPermutations(<)
132− ///
133− /// [1, 2, 3], [1, 3, 2], [2, 1, 3], [2, 3, 1], [3, 1, 2], [3, 2, 1]
134− /// ```
135− /// ```swift
136− /// lazy([1, 2, 3]).lazyLexPermutations(>)
137− ///
138− /// [1, 2, 3]
139− /// ```
140− @warn_unused_result
141− public func lazyLexPermutations(isOrderedBefore: (Generator.Element, Generator.Element) -> Bool)
142− -> LexPermSeq<[Generator.Element]> {
143− return LexPermSeq(col: Array(self), order: isOrderedBefore)
144− }
145−}
146−
147−public extension SequenceType where Generator.Element : Comparable {
148−
149− /// Returns a lazy sequence of the permutations of self, ordered lexicographically.
150− /// - Note: The permutations returned follow self, so if self is not the first
151− /// lexicographically ordered permutation, not all permutations will be returned.
152− /// ```swift
153− /// lazy([1, 2, 3]).lazyLexPermutations()
154− ///
155− /// [1, 2, 3], [1, 3, 2], [2, 1, 3], [2, 3, 1], [3, 1, 2], [3, 2, 1]
156− /// ```
157− /// ```swift
158− /// lazy([3, 2, 1]).lazyLexPermutations()
159− ///
160− /// [3, 2, 1]
161− /// ```
162− @warn_unused_result
163− public func lazyLexPermutations() -> LexPermSeq<[Generator.Element]> {
164− return LexPermSeq(col: Array(self), order: <)
165− }
166−}
167−
168−public extension SequenceType {
169−
170− /// Returns a lazy sequence of the permutations of self.
171− /// - Note: The permutations are lexicographically ordered, based on the indices of self
172− /// ```swift
173− /// lazy([1, 2, 3]).lazyPermutations()
174− ///
175− /// [1, 2, 3], [1, 3, 2], [2, 1, 3], [2, 3, 1], [3, 1, 2], [3, 2, 1]
176− /// ```
177− /// ```swift
178− /// lazy([3, 2, 1]).lazyPermutations()
179− ///
180− /// [3, 2, 1], [3, 1, 2], [2, 3, 1], [2, 1, 3], [1, 3, 2], [1, 2, 3]
181− /// ```
182− @warn_unused_result
183− public func lazyPermutations() -> LazyMapSequence<LexPermSeq<[Int]>, [Self.Generator.Element]> {
184− let col = Array(self)
185− return col.indices.lazyLexPermutations().map { $0.map { col[$0] } }
186− }
187−}
PixelImage/SwiftSugar/SwiftSequences/ScanReduce.swiftdeleted−152
@@ -1,152 +0,0 @@
1−// MARK: - Eager
2−
3−public extension SequenceType {
4−
5− // MARK: Reduce1
6−
7− /// Return the result of repeatedly calling combine with an accumulated value
8− /// initialized to the first element of self and each element of self, in turn, i.e.
9− /// return combine(combine(...combine(combine(self[0], self[1]),
10− /// self[2]),...self[count-2]), self[count-1]).
11− /// ```swift
12− /// [1, 2, 3].reduce(+) // 6
13− /// ```
14− @warn_unused_result
15− func reduce
16− (@noescape combine: (accumulator: Generator.Element, element: Generator.Element) throws -> Generator.Element)
17− rethrows -> Generator.Element? {
18− var g = generate()
19− guard let a = g.next() else { return nil }
20− var accu = a
21− while let next = g.next() {
22− accu = try combine(accumulator: accu, element: next)
23− }
24− return accu
25− }
26−
27− // MARK: Scan
28−
29− /// Return an array where every value is equal to combine called on the previous
30− /// element, and the current element. The first element is taken to be initial.
31− /// ```swift
32− /// [1, 2, 3].scan(0, combine: +)
33− ///
34− /// [1, 3, 6]
35− /// ```
36− @warn_unused_result
37− func scan<T>(initial: T, @noescape combine: (accumulator: T, element: Generator.Element) throws -> T) rethrows -> [T] {
38− var accu = initial
39− return try map { e in
40− accu = try combine(accumulator: accu, element: e)
41− return accu
42− }
43− }
44−
45− // MARK: Scan1
46−
47− /// Return an array where every value is equal to combine called on the previous
48− /// element, and the current element.
49− /// ```swift
50− /// [1, 2, 3].scan(+)
51− ///
52− /// [3, 6]
53− /// ```
54− @warn_unused_result
55− func scan(@noescape combine: (accumulator: Generator.Element, element: Generator.Element) throws -> Generator.Element) rethrows -> [Generator.Element] {
56− var g = generate()
57− guard let i = g.next() else { return [] }
58− return try GeneratorSequence(g).scan(i, combine: combine)
59− }
60−}
61−
62−// MARK: - Lazy
63−
64−// MARK: Scan
65−
66−/// :nodoc:
67−public struct ScanGen<G : GeneratorType, T> : GeneratorType {
68−
69− private let combine: (T, G.Element) -> T
70− private var initial: T
71− private var g: G
72− /// :nodoc:
73− public mutating func next() -> T? {
74− guard let e = g.next() else { return nil }
75− initial = combine(initial, e)
76− return initial
77− }
78−}
79−
80−/// :nodoc:
81−public struct LazyScanSeq<S : SequenceType, T> : LazySequenceType {
82−
83− private let seq : S
84− private let combine: (T, S.Generator.Element) -> T
85− private let initial: T
86− /// :nodoc:
87− public func generate() -> ScanGen<S.Generator, T> {
88− return ScanGen(combine: combine, initial: initial, g: seq.generate())
89− }
90−}
91−
92−public extension LazySequenceType {
93−
94− /// Return a lazy sequence where every value is equal to combine called on the previous
95− /// element, and the current element. The first element is taken to be initial.
96− /// ```swift
97− /// lazy([1, 2, 3]).scan(0, combine: +)
98− ///
99− /// 1, 3, 6
100− /// ```
101− @warn_unused_result
102− func scan<T>(initial: T, combine: (accumulator: T, element: Generator.Element) -> T) -> LazyScanSeq<Self, T> {
103− return LazyScanSeq(seq: self, combine: combine, initial: initial)
104− }
105−}
106−
107−// MARK: Scan1
108−/// :nodoc:
109−public struct Scan1Gen<G : GeneratorType> : GeneratorType {
110−
111− private let combine: (G.Element, G.Element) -> G.Element
112− private var accu: G.Element?
113− private var g: G
114−
115− public mutating func next() -> G.Element? {
116− guard let a = accu, e = g.next() else { return nil }
117− accu = combine(a, e)
118− return accu!
119− }
120−
121− private init(combine: (G.Element, G.Element) -> G.Element, generator: G) {
122− g = generator
123− self.combine = combine
124− accu = g.next()
125− }
126−}
127−/// :nodoc:
128−public struct LazyScan1Seq<S : SequenceType> : LazySequenceType {
129−
130− private let seq: S
131− private let combine: (S.Generator.Element, S.Generator.Element) -> S.Generator.Element
132− /// :nodoc:
133− public func generate() -> Scan1Gen<S.Generator> {
134− return Scan1Gen(combine: combine, generator: seq.generate())
135− }
136−}
137−
138−public extension LazySequenceType {
139−
140− /// Return a lazy sequence where every value is equal to combine called on the previous
141− /// element, and the current element.
142− /// ```swift
143− /// lazy([1, 2, 3]).scan(+)
144− ///
145− /// 3, 6
146− /// ```
147− @warn_unused_result
148− func scan(combine: (accumulator: Generator.Element, element: Generator.Element) -> Generator.Element)
149− -> LazyScan1Seq<Self> {
150− return LazyScan1Seq(seq: self, combine: combine)
151− }
152−}
PixelImage/SwiftSugar/SwiftSequences/Slicing.swiftdeleted−138
@@ -1,138 +0,0 @@
1−// IntervalTypes
2−
3−public protocol OpenIntervalType {
4− typealias Value
5− func contains(v: Value) -> Bool
6−}
7−public protocol OpenEndedIntervalType: OpenIntervalType {
8− typealias Value: Comparable
9− var val: Value { get }
10−}
11−public protocol OpenStartedIntervalTypeTo: OpenIntervalType {
12− typealias Value: Comparable
13− var val: Value { get }
14−}
15−public protocol OpenStartedIntervalTypeThrough: OpenIntervalType {
16− typealias Value: Comparable
17− var val: Value { get }
18−}
19−
20−// Interval Structs
21−
22−public struct OpenEndedInterval<C: Comparable>: OpenEndedIntervalType {
23− public let val: C
24−}
25−public struct OpenStartedIntervalTo<C: Comparable>: OpenStartedIntervalTypeTo {
26− public let val: C
27−}
28−public struct OpenStartedIntervalThrough<C: Comparable>: OpenStartedIntervalTypeThrough {
29− public let val: C
30−}
31−
32−// Range structs
33−
34−public struct OpenEndedRange<I: ForwardIndexType where I: Comparable>: OpenEndedIntervalType {
35− public var val: I
36−}
37−public struct OpenStartedRangeTo<I: BidirectionalIndexType where I: Comparable>: OpenStartedIntervalTypeTo {
38− public var val: I
39−}
40−public struct OpenStartedRangeThrough<I: BidirectionalIndexType where I: Comparable>: OpenStartedIntervalTypeThrough {
41− public var val: I
42−}
43−
44−// Generators
45−
46−public struct EndlessIncrement<I: ForwardIndexType>: GeneratorType {
47− private var i: I
48− public mutating func next() -> I? {
49− defer { i = i.successor() }
50− return i
51− }
52−}
53−
54−// SequenceType
55−
56−extension OpenEndedRange: SequenceType {
57− public func generate() -> EndlessIncrement<I> {
58− return EndlessIncrement(i: val)
59− }
60−}
61−
62−// Operators
63−
64−postfix operator ... {}
65−prefix operator ... {}
66−prefix operator ..< {}
67−
68−public postfix func ...<C: Comparable>(c: C) -> OpenEndedInterval<C> {
69− return OpenEndedInterval(val: c)
70−}
71−public postfix func ...<I: ForwardIndexType>(c: I) -> OpenEndedRange<I> {
72− return OpenEndedRange(val: c)
73−}
74−public prefix func ..<<C: Comparable>(c: C) -> OpenStartedIntervalTo<C> {
75− return OpenStartedIntervalTo(val: c)
76−}
77−public prefix func ..<<C: BidirectionalIndexType>(c: C) -> OpenStartedRangeTo<C> {
78− return OpenStartedRangeTo(val: c)
79−}
80−public prefix func ... <C: Comparable>(c: C) -> OpenStartedIntervalThrough<C> {
81− return OpenStartedIntervalThrough(val: c)
82−}
83−public prefix func ... <C: BidirectionalIndexType>(c: C) -> OpenStartedRangeThrough<C> {
84− return OpenStartedRangeThrough(val: c)
85−}
86−
87−// Contains
88−
89−extension OpenEndedIntervalType {
90− public func contains(v: Value) -> Bool { return val <= v }
91−}
92−extension OpenStartedIntervalTypeTo {
93− public func contains(v: Value) -> Bool { return val > v }
94−}
95−extension OpenStartedIntervalTypeThrough {
96− public func contains(v: Value) -> Bool { return val >= v }
97−}
98−
99−// Pattern Matching
100−
101−public func ~=<I: OpenIntervalType>(lhs: I, rhs: I.Value) -> Bool {
102− return lhs.contains(rhs)
103−}
104−
105−// Indexing
106−
107−public extension CollectionType where Index: Comparable {
108− subscript(r: OpenEndedRange<Index>) -> SubSequence {
109− return suffixFrom(r.val)
110− }
111−}
112−
113−public extension CollectionType where Index: Comparable, Index: BidirectionalIndexType {
114− subscript(r: OpenStartedRangeTo<Index>) -> SubSequence {
115− return prefixUpTo(r.val)
116− }
117− subscript(r: OpenStartedRangeThrough<Index>) -> SubSequence {
118− return prefixThrough(r.val)
119− }
120−}
121−
122−public extension MutableCollectionType where Index: Comparable {
123− subscript(r: OpenEndedRange<Index>) -> SubSequence {
124− get { return suffixFrom(r.val) }
125− set { self[r.val..<endIndex] = newValue }
126− }
127−}
128−
129−public extension MutableCollectionType where Index: Comparable, Index: BidirectionalIndexType {
130− subscript(r: OpenStartedRangeTo<Index>) -> SubSequence {
131− get { return prefixUpTo(r.val) }
132− set { self[startIndex..<r.val] = newValue }
133− }
134− subscript(r: OpenStartedRangeThrough<Index>) -> SubSequence {
135− get { return prefixThrough(r.val) }
136− set { self[startIndex...r.val] = newValue }
137− }
138−}
PixelImage/SwiftSugar/SwiftSequences/TakeDrop.swiftdeleted−208
@@ -1,208 +0,0 @@
1−// MARK: - Eager
2−
3−// MARK: prefixWhile
4−
5−public extension SequenceType {
6−
7− /// Returns an array of self up until the first element that returns false for condition
8− /// ```swift
9− /// [1, 2, 3, 4, 5, 2].prefixWhile { $0 < 4 }
10− ///
11− /// [1, 2, 3]
12− /// ```
13− @warn_unused_result
14− func prefixWhile(@noescape condition: Generator.Element throws -> Bool) rethrows -> [Generator.Element] {
15− var ret : [Generator.Element] = []
16− var g = generate()
17− while let next = g.next() where try condition(next) { ret.append(next) }
18− return ret
19− }
20−}
21−
22−// MARK: DropWhile
23−
24−public extension SequenceType {
25−
26− /// Returns an array of self with the first elements that return true for condition
27− /// dropped
28− /// ```swift
29− /// [1, 2, 3, 4, 5, 2].dropWhile { $0 < 4 }
30− ///
31− /// [4, 5, 2]
32− /// ```
33− @warn_unused_result
34− func dropWhile(@noescape condition: Generator.Element throws -> Bool) rethrows -> [Generator.Element] {
35− var g = generate()
36− while let next = g.next() {
37− if try !condition(next) {
38− return [next] + GeneratorSequence(g)
39− }
40− }
41− return []
42− }
43−}
44−
45−public extension SequenceType {
46− /**
47− Returns a tuple of the prefix and suffix of `self`, the first element
48− being the prefix up to `n`.
49− */
50− public func breakAt(n: Int) -> ([Generator.Element],[Generator.Element]) {
51− let r = max(0, underestimateCount() - n)
52− var f,b : [Generator.Element]
53− (f,b) = ([],[])
54− f.reserveCapacity(n)
55− b.reserveCapacity(r)
56− var g = generate()
57− for _ in 0..<n {
58− if let e = g.next() { f.append(e) } else { return (f,b) }
59− }
60− while let e = g.next() { b.append(e) }
61− return (f,b)
62− }
63−}
64−
65−public extension CollectionType {
66− /**
67− Returns a tuple of the prefix and suffix of `self`, the first element
68− being the prefix up to `n`.
69− */
70− public func breakAt(n: Index) -> (SubSequence, SubSequence) {
71− return (prefixUpTo(n),suffixFrom(n))
72− }
73−}
74−
75−public extension CollectionType where Index == Int {
76− /**
77− Returns a tuple of the prefix and suffix of `self`, the first element
78− being the prefix up to `n`.
79− */
80− public func breakAt(n: Int) -> (SubSequence, SubSequence) {
81− return (prefixUpTo(n),suffixFrom(n))
82− }
83−}
84−public extension SequenceType {
85− /**
86− Returns a tuple of the prefix and suffix of `self`, the first element
87− being the prefix up to the first elements of `self` which returns
88− `true` for `isBreak`.
89− */
90− public func breakAt(@noescape isBreak: Generator.Element throws -> Bool)
91− rethrows -> ([Generator.Element],[Generator.Element]) {
92− var f,b : [Generator.Element]
93− (f,b) = ([],[])
94− var g = generate()
95− while let e = g.next() {
96− if try isBreak(e) {
97− b.append(e)
98− while let be = g.next() { b.append(be) }
99− return (f,b)
100− } else {
101− f.append(e)
102− }
103− }
104− return (f,b)
105− }
106−}
107−public extension CollectionType {
108− /**
109− Returns a tuple of the prefix and suffix of `self`, the first element
110− being the prefix up to the first elements of `self` which returns
111− `true` for `isBreak`.
112− */
113− public func breakAt(@noescape isBreak: Generator.Element throws -> Bool) rethrows -> (SubSequence, SubSequence) {
114− return try indexOf(isBreak).map(breakAt) ?? (suffixFrom(startIndex),prefixUpTo(startIndex))
115− }
116−}
117−// MARK: - Lazy
118−
119−// MARK: TakeWhile
120−/// :nodoc:
121−public struct WhileGen<G : GeneratorType> : GeneratorType {
122−
123− private var g: G
124− private let condition : G.Element -> Bool
125− /// :nodoc:
126− mutating public func next() -> G.Element? {
127− if let next = g.next() where condition(next) {
128− return next
129− }
130− return nil
131− }
132−}
133−/// :nodoc:
134−public struct WhileSeq<S : SequenceType> : LazySequenceType {
135−
136− private let seq: S
137− private let condition: S.Generator.Element -> Bool
138− /// :nodoc:
139− public func generate() -> WhileGen<S.Generator> {
140− return WhileGen(g: seq.generate(), condition: condition)
141− }
142−}
143−
144−public extension LazySequenceType {
145−
146− /// Returns a lazy sequence of self up until the first element that returns false for
147− /// condition
148− /// ```swift
149− /// [1, 2, 3, 4, 5, 2].lazy.takeWhile { $0 < 4 }
150− ///
151− /// 1, 2, 3
152− /// ```
153− @warn_unused_result
154− func prefixWhile(condition: Generator.Element -> Bool) -> WhileSeq<Self> {
155− return WhileSeq(seq: self, condition: condition)
156− }
157−}
158−
159−// MARK: DropWhile
160−/// :nodoc:
161−public struct DropWhileGen<G : GeneratorType> : GeneratorType {
162−
163− private let predicate: G.Element -> Bool
164− private var nG: G?
165− private var oG: G
166−
167− private init(g: G, predicate: G.Element -> Bool) {
168− nG = nil
169− oG = g
170− self.predicate = predicate
171− }
172− /// :nodoc:
173− public mutating func next() -> G.Element? {
174− guard nG == nil else { return nG!.next() }
175− while let next = oG.next() {
176− if !predicate(next) {
177− nG = oG
178− return next
179− }
180− }
181− return nil
182− }
183−}
184−/// :nodoc:
185−public struct DropWhileSeq<S : SequenceType> : LazySequenceType {
186−
187− private let predicate: S.Generator.Element -> Bool
188− private let seq: S
189− /// :nodoc:
190− public func generate() -> DropWhileGen<S.Generator> {
191− return DropWhileGen(g: seq.generate(), predicate: predicate)
192− }
193−}
194−
195−public extension LazySequenceType {
196−
197− /// Returns a lazy sequence of self with the first elements that return true for
198− /// condition dropped
199− /// ```swift
200− /// [1, 2, 3, 4, 5, 2].lazy.dropWhile { $0 < 4 }
201− ///
202− /// 4, 5, 2
203− /// ```
204− @warn_unused_result
205− func dropWhile(predicate: Generator.Element -> Bool) -> DropWhileSeq<Self> {
206− return DropWhileSeq(predicate: predicate, seq: self)
207− }
208−}
PixelImage/SwiftSugar/SwiftSequences/Zip.swiftdeleted−90
@@ -1,90 +0,0 @@
1−/// :nodoc:
2−public struct NilPaddedZipGenerator<G0: GeneratorType, G1: GeneratorType> : GeneratorType {
3−
4− private var (g0, g1): (G0?, G1?)
5−
6− public mutating func next() -> (G0.Element?, G1.Element?)? {
7− let (e0,e1) = (g0?.next(),g1?.next())
8− switch (e0,e1) {
9− case (nil,nil): return nil
10− case ( _,nil): g1 = nil
11− case (nil, _): g0 = nil
12− default: break
13− }
14− return (e0,e1)
15− }
16−}
17−/// :nodoc:
18−public struct NilPaddedZip<S0: SequenceType, S1: SequenceType> : LazySequenceType {
19−
20− private let (s0, s1): (S0, S1)
21− /// :nodoc:
22− public func generate() -> NilPaddedZipGenerator<S0.Generator, S1.Generator> {
23− return NilPaddedZipGenerator(g0: s0.generate(), g1: s1.generate())
24− }
25−}
26−
27−/// A sequence of pairs built out of two underlying sequences, where the elements of the
28−/// ith pair are optional ith elements of each underlying sequence. If one sequence is
29−/// shorter than the other, pairs will continue to be returned after it is exhausted, but
30−/// with its elements replaced by nil.
31−/// ```swift
32−/// zipWithPadding([1, 2, 3], [1, 2])
33−///
34−/// (1?, 1?), (2?, 2?), (3?, nil)
35−/// ```
36−@warn_unused_result
37−public func zipWithPadding<S0: SequenceType, S1: SequenceType>(s0: S0, _ s1: S1)
38− -> NilPaddedZip<S0, S1> {
39− return NilPaddedZip(s0: s0, s1: s1)
40−}
41−/// :nodoc:
42−public struct PaddedZipGenerator<G0: GeneratorType, G1: GeneratorType> : GeneratorType {
43−
44− typealias E0 = G0.Element
45− typealias E1 = G1.Element
46−
47− private var g: NilPaddedZipGenerator<G0, G1>
48− private let (p0, p1): (E0, E1)
49−
50− public mutating func next() -> (E0, E1)? {
51− guard let (e0,e1) = g.next() else { return nil }
52− return (e0 ?? p0, e1 ?? p1)
53− }
54−}
55−/// :nodoc:
56−public struct PaddedZip<S0: SequenceType, S1: SequenceType> : LazySequenceType {
57−
58− private let (s0, s1): (S0, S1)
59− private let (p0, p1): (S0.Generator.Element, S1.Generator.Element)
60− /// :nodoc:
61− public func generate() -> PaddedZipGenerator<S0.Generator, S1.Generator> {
62− return PaddedZipGenerator(
63− g: NilPaddedZipGenerator(
64− g0: s0.generate(),
65− g1: s1.generate()
66− ),
67− p0: p0,
68− p1: p1
69− )
70− }
71−}
72−
73−/// A sequence of pairs built out of two underlying sequences, where the elements of the
74−/// ith pair are the ith elements of each underlying sequence. If one sequence is
75−/// shorter than the other, pairs will continue to be returned after it is exhausted, but
76−/// with its elements replaced by its respective pad.
77−/// - Parameter pad0: the element to pad `s0` with after it is exhausted
78−/// - Parameter pad1: the element to pad `s1` with after it is exhausted
79−/// ```swift
80−/// zipWithPadding([1, 2, 3], [1, 2], pad0: 100, pad1: 900)
81−///
82−/// (1, 1), (2, 2), (3, 900)
83−/// ```
84−@warn_unused_result
85−public func zipWithPadding<
86− S0: SequenceType, S1: SequenceType
87− >(s0: S0, _ s1: S1, pad0: S0.Generator.Element, pad1: S1.Generator.Element)
88− -> PaddedZip<S0, S1> {
89− return PaddedZip(s0: s0, s1: s1, p0: pad0, p1: pad1)
90−}
PixelImage/SwiftSugar/TestCommons.swiftdeleted−96
@@ -1,96 +0,0 @@
1−// TODO: Preconditions
2−// TODO: Test memoization
3−// TODO: Reorganize Swift Sugar folders
4−// TODO: Sugar documentation
5−// TODO: Add Swift Sugar to git
6−// TODO: Add LINT to EngineKit
7−// TODO: Add @warnunusedresult where appropriate
8−
9−import Darwin
10−
11−class Random<T: Numeric> {
12−
13− let max: Double = Double(INT32_MAX)
14− let exponent: Double = 7
15−
16− init(example: T) {
17− setupRandomSeed()
18− }
19−
20− private func expRandom() -> Double {
21− let rawRandom = Double(rand()) / max
22− let exponentiated = (3 * rawRandom) ^ exponent
23− return exponentiated
24− }
25−
26− private func uniRandom() -> Double {
27− return Double(rand()) / max
28− }
29−
30− private func setupRandomSeed() {
31− var now = time(nil)
32− var date = tm()
33− localtime_r(&now, &date)
34− let day = date.tm_yday
35− let year = date.tm_year
36− srand(UInt32(365 * year + day))
37− }
38−
39− func nonnegativeRandomNumber() -> T {
40− let random = expRandom()
41− return T.fromDouble(random)
42− }
43−
44− func positiveRandomNumber() -> T {
45− let random = expRandom()
46− let result = T.fromDouble(random)
47−
48− guard result != 0 else {
49− return positiveRandomNumber()
50− }
51−
52− return result
53− }
54−
55− func randomNumber() -> T {
56− let random = expRandom()
57− let signed = random * ±(Double(rand()) - max)
58− return T.fromDouble(signed)
59− }
60−
61− func uniformRandomNumber(from tStart: T, to tEnd: T) -> T {
62− let start = tStart.toDouble
63− let end = tEnd.toDouble
64−
65− let rawRandom = uniRandom()
66− let interval = end - start
67− let result = start + (rawRandom * interval)
68− return T.fromDouble(result)
69− }
70−
71− func uniformRandomNumber(start tStart: T, interval tInterval: T)
72− -> T {
73− let start = tStart.toDouble
74− let interval = tInterval.toDouble
75−
76− let rawRandom = uniRandom()
77− let result = start + (rawRandom * interval)
78− return T.fromDouble(result)
79− }
80−
81− func uniformRandomNumber(center tCenter: T,
82− maxDeviation tInterval: T) -> T {
83− let center = tCenter.toDouble
84− let interval = tInterval.toDouble
85− let start = T.fromDouble(center - interval / 2)
86−
87− return uniformRandomNumber(start: start, interval: tInterval)
88− }
89−
90− func randomSign() -> T {
91− let rawRandom = rand() % 2
92− let result = Double((2 * rawRandom) - 1)
93− return T.fromDouble(result)
94− }
95−
96−}
PixelImage/UIKit.swift+2−2
@@ -42,7 +42,7 @@ extension CGFloat: DoubleValuable {
42 }
42 }
43 }
43 }
44
44
45− static func fromDouble(double: Double) -> CGFloat {
45+ static func fromDouble(_ double: Double) -> CGFloat {
46 return CGFloat(double)
46 return CGFloat(double)
47 }
47 }
48
48
@@ -206,7 +206,7 @@ extension CALayer {
206 }
206 }
207}
207}
208
208
209−let screenRect = UIScreen.mainScreen().bounds
209+let screenRect = UIScreen.main.bounds
210let screenWidth = screenRect.size.width
210let screenWidth = screenRect.size.width
211let screenHeight = screenRect.size.height
211let screenHeight = screenRect.size.height
212
212
PixelImage/ViewController.swift+220−181
@@ -2,186 +2,225 @@ import UIKit
2
2
3class ViewController: UIViewController, MetaballDataSource {
3class ViewController: UIViewController, MetaballDataSource {
4
4
5− var metaballView: UIImageView!
5+ var metaballView: UIImageView!
6− var renderer: MetalMetaballRenderer!
6+ var renderer: MetalMetaballRenderer!
7−
7+
8− let width = 350
8+ let width = 350
9− let height = 600
9+ let height = 600
10−
10+
11− var metaballGraph: Graph<Metaball>!
11+ var metaballGraph: Graph<Metaball>!
12− var previousLocation: CGPoint!
12+ var previousLocation: CGPoint!
13−
13+
14− var selectedMetaball: Metaball?
14+ var selectedMetaball: Metaball?
15−
15+
16− let edgeAnimationDuration: Float = 1
16+ let edgeAnimationDuration: Float = 1
17−
17+
18− override func viewDidLoad() {
18+ override func viewDidLoad() {
19− super.viewDidLoad()
19+ super.viewDidLoad()
20−
20+
21− view.backgroundColor = UIColor.whiteColor()
21+ view.backgroundColor = UIColor.white
22−
22+
23− let recognizer = UIPanGestureRecognizer(target: self, action: "handlePan:")
23+ let recognizer = UIPanGestureRecognizer(
24+ target: self,
25+ action: #selector(ViewController.handlePan(_:)))
24− view.addGestureRecognizer(recognizer)
26+ view.addGestureRecognizer(recognizer)
25−
27+
26− var positions = [CGPoint]()
28+ var positions = [CGPoint]()
27− positions.append(CGPoint(x: Double(screenWidth) / 2, y: Double(screenHeight) / 2))
29+ positions.append(CGPoint(
30+ x: Double(screenWidth) / 2,
31+ y: Double(screenHeight) / 2))
28− for i in 1...5 {
32+ for i in 1...5 {
29− let sine = sin(Double(i) * 2 * M_PI / 5)
33+ let sine = sin(Double(i) * 2 * .pi / 5)
30− let cosine = cos(Double(i) * 2 * M_PI / 5)
34+ let cosine = cos(Double(i) * 2 * .pi / 5)
31− let radius: Double = 150
35+ let radius: Double = 150
32− let x = Double(screenWidth) / 2 + sine * radius
36+ let x = Double(screenWidth) / 2 + sine * radius
33− let y = Double(screenHeight) / 2 + cosine * radius
37+ let y = Double(screenHeight) / 2 + cosine * radius
34− positions.append(CGPoint(x: x, y: y))
38+ positions.append(CGPoint(x: x, y: y))
35− }
39+ }
36−
40+
37− let colors =
41+ let colors =
38− [UIColor(red255: 110, green: 220, blue: 220, alpha: 1.0),
42+ [UIColor(red255: 110, green: 220, blue: 220, alpha: 1.0),
39− UIColor(red255: 250, green: 235, blue: 50, alpha: 1.0),
43+ UIColor(red255: 250, green: 235, blue: 50, alpha: 1.0),
40− UIColor(red255: 110, green: 220, blue: 220, alpha: 1.0),
44+ UIColor(red255: 110, green: 220, blue: 220, alpha: 1.0),
41− UIColor(red255: 90, green: 170, blue: 170, alpha: 1.0),
45+ UIColor(red255: 90, green: 170, blue: 170, alpha: 1.0),
42− UIColor(red255: 90, green: 170, blue: 170, alpha: 1.0),
46+ UIColor(red255: 90, green: 170, blue: 170, alpha: 1.0),
43− UIColor(red255: 110, green: 220, blue: 220, alpha: 1.0)]
47+ UIColor(red255: 110, green: 220, blue: 220, alpha: 1.0)]
44− let metaballs = zip(positions, colors).map { Metaball(position: $0.0, color: $0.1) }
48+ let metaballs = zip(positions, colors).map {
45−
49+ Metaball(position: $0.0, color: $0.1)
50+ }
51+
46− metaballGraph = Graph(vertices: metaballs)
52+ metaballGraph = Graph(vertices: metaballs)
47−
53+
48− let metaballViewFrame = screenRect
54+ let metaballViewFrame = screenRect
49− renderer = MetalMetaballRenderer(dataSource: self, frame: metaballViewFrame)
55+ renderer = MetalMetaballRenderer(dataSource: self,
56+ frame: metaballViewFrame)
50− metaballView = renderer.targetView
57+ metaballView = renderer.targetView
51− view.addSubview(metaballView)
58+ view.addSubview(metaballView)
52−
59+
53− for metaball in metaballs {
60+ for metaball in metaballs {
54− metaballView.addSubview(metaball)
61+ metaballView.addSubview(metaball)
55− }
62+ }
56−
63+
57− delay(1.0) {
64+ delay(1.0) {
58− self.addEdge(0, 1)
65+ self.addEdge(0, 1)
59− self.addEdge(0, 2)
66+ self.addEdge(0, 2)
60− self.addEdge(0, 3)
67+ self.addEdge(0, 3)
61− self.addEdge(0, 4)
68+ self.addEdge(0, 4)
62− self.addEdge(0, 5)
69+ self.addEdge(0, 5)
63− }
70+ }
64−
71+
65− delay(2.3) {
72+ delay(2.3) {
66− self.removeEdge(0, 1)
73+ self.removeEdge(0, 1)
67− self.removeEdge(0, 2)
74+ self.removeEdge(0, 2)
68− self.removeEdge(0, 3)
75+ self.removeEdge(0, 3)
69− self.removeEdge(0, 4)
76+ self.removeEdge(0, 4)
70− self.removeEdge(0, 5)
77+ self.removeEdge(0, 5)
71− }
78+ }
72−
79+
73− delay(4) {
80+ delay(4) {
74− for i in 1...5 {
81+ for i in 1...5 {
82+ UIView.animate(withDuration: 1.0, delay: 0,
75− UIView.animateWithDuration(1.0, delay: 0, options: UIViewAnimationOptions.CurveEaseInOut, animations: { () -> Void in
83+ options: UIViewAnimationOptions(),
84+ animations: { () -> Void in
76− let sine = sin(Double(i) * 2 * M_PI / 5)
85+ let sine = sin(Double(i) * 2 * .pi / 5)
77− let cosine = cos(Double(i) * 2 * M_PI / 5)
86+ let cosine = cos(Double(i) * 2 * .pi / 5)
78− let radius: Double = 85
87+ let radius: Double = 85
79− let x = Double(screenWidth) / 2 + sine * radius
88+ let x = Double(screenWidth) / 2 + sine * radius
80− let y = Double(screenHeight) / 2 + cosine * radius
89+ let y = Double(screenHeight) / 2 + cosine * radius
81− let metaball = metaballs[i]
90+ let metaball = metaballs[i]
82− self.animateMetaball(metaball, toPoint: CGPoint(x: x, y: y))
91+ self.animateMetaball(metaball, toPoint: CGPoint(x: x, y: y))
83− }, completion: nil)
92+ }, completion: nil)
84− }
93+ }
85− }
94+ }
86−
95+
87− delay(6) { () -> () in
96+ delay(6) { () -> () in
88− for i in 1...5 {
97+ for i in 1...5 {
89− UIView.animateWithDuration(1.0, delay: 0, usingSpringWithDamping: 0.5, initialSpringVelocity: 0, options: UIViewAnimationOptions.CurveEaseInOut, animations: { () -> Void in
98+ UIView.animate(withDuration: 1.0, delay: 0,
99+ usingSpringWithDamping: 0.5,
100+ initialSpringVelocity: 0,
101+ options: UIViewAnimationOptions(),
102+ animations: { () -> Void in
90− let sine = sin(Double(i) * 2 * M_PI / 5)
103+ let sine = sin(Double(i) * 2 * .pi / 5)
91− let cosine = cos(Double(i) * 2 * M_PI / 5)
104+ let cosine = cos(Double(i) * 2 * .pi / 5)
92− let radius: Double = 150
105+ let radius: Double = 150
93− let x = Double(screenWidth) / 2 + sine * radius
106+ let x = Double(screenWidth) / 2 + sine * radius
94− let y = Double(screenHeight) / 2 + cosine * radius
107+ let y = Double(screenHeight) / 2 + cosine * radius
95− let metaball = metaballs[i]
108+ let metaball = metaballs[i]
96− self.animateMetaball(metaball, toPoint: CGPoint(x: x, y: y))
109+ self.animateMetaball(metaball, toPoint: CGPoint(x: x, y: y))
97− }, completion: nil)
110+ }, completion: nil)
98− }
111+ }
99− }
112+ }
100−
113+
101− renderer.state = .Running
114+ renderer.state = .running
102− }
115+ }
103−
116+
104− func addEdge(i: Int, _ j: Int) {
117+ func addEdge(_ i: Int, _ j: Int) {
105− animateEdge(i, j, fadeIn: true)
118+ animateEdge(i, j, fadeIn: true)
106− }
119+ }
107−
120+
108− func removeEdge(i: Int, _ j: Int) {
121+ func removeEdge(_ i: Int, _ j: Int) {
109− animateEdge(i, j, fadeIn: false)
122+ animateEdge(i, j, fadeIn: false)
110− }
123+ }
111−
124+
112− func animateMetaball(metaball: Metaball, toPoint destination: CGPoint) {
125+ func animateMetaball(_ metaball: Metaball, toPoint destination: CGPoint) {
113− let parameters = VertexAnimationParameters(startDate: NSDate(), duration: 1.0, origin: metaball.center, destination: destination, metaball: metaball)
126+ let parameters = VertexAnimationParameters(startDate: Date(),
114− NSTimer.scheduledTimerWithTimeInterval(1.0 / 60.0, target: self, selector: "animateMetaballWithTimer:", userInfo: parameters, repeats: true)
127+ duration: 1.0,
128+ origin: metaball.center,
129+ destination: destination,
130+ metaball: metaball)
131+ Timer.scheduledTimer(
132+ timeInterval: 1.0 / 60.0,
133+ target: self,
134+ selector: #selector(ViewController.animateMetaball(withTimer:)),
135+ userInfo: parameters,
136+ repeats: true)
115− }
137+ }
116−
138+
117− func animateMetaball(withTimer timer: NSTimer) {
139+ func animateMetaball(withTimer timer: Timer) {
118− guard let userInfo = timer.userInfo as? VertexAnimationParameters else { preconditionFailure() }
140+ guard let userInfo = timer.userInfo as? VertexAnimationParameters else {
141+ preconditionFailure()
142+ }
119− let (animationStart, duration, origin, destination, metaball) = (userInfo).unpack()
143+ let (animationStart, duration, origin, destination, metaball) =
120−
144+ (userInfo).unpack()
145+
121− let now = NSDate()
146+ let now = Date()
122− var timeElapsed = Float(now.timeIntervalSinceDate(animationStart))
147+ var timeElapsed = Float(now.timeIntervalSince(animationStart))
123−
148+
124− if timeElapsed > duration {
149+ if timeElapsed > duration {
125− timer.invalidate()
150+ timer.invalidate()
126− timeElapsed = duration
151+ timeElapsed = duration
127− }
152+ }
128−
153+
129− let linearValue = timeElapsed / duration
154+ let linearValue = timeElapsed / duration
130− let interpolatedValue = interpolateSmooth(linearValue)
155+ let interpolatedValue = interpolateSmooth(linearValue)
131− print(interpolatedValue)
156+
132−
133− let position = origin + ((destination - origin) * interpolatedValue)
157+ let position = origin + ((destination - origin) * interpolatedValue)
134− metaball.center = position
158+ metaball.center = position
135−
159+
136− renderer.state = .Running
160+ renderer.state = .running
137− }
161+ }
138−
162+
139− func animateEdge(i: Int, _ j: Int, fadeIn: Bool) {
163+ func animateEdge(_ i: Int, _ j: Int, fadeIn: Bool) {
140− let parameters = EdgeAnimationParameters(startDate: NSDate(), duration: edgeAnimationDuration, fadeIn: fadeIn, i: i, j: j)
164+ let parameters = EdgeAnimationParameters(startDate: Date(),
141− NSTimer.scheduledTimerWithTimeInterval(1.0 / 60.0, target: self, selector: "animateEdgeWithTimer:", userInfo: parameters, repeats: true)
165+ duration: edgeAnimationDuration,
166+ fadeIn: fadeIn,
167+ i: i,
168+ j: j)
169+ Timer.scheduledTimer(
170+ timeInterval: 1.0 / 60.0,
171+ target: self,
172+ selector: #selector(ViewController.animateEdge(withTimer:)),
173+ userInfo: parameters,
174+ repeats: true)
142− }
175+ }
143−
176+
144− func animateEdge(withTimer timer: NSTimer) {
177+ func animateEdge(withTimer timer: Timer) {
145− guard let userInfo = timer.userInfo as? EdgeAnimationParameters else { preconditionFailure() }
178+ guard let userInfo = timer.userInfo as? EdgeAnimationParameters else {
179+ preconditionFailure()
180+ }
146− let (animationStart, duration, fadeIn, i, j) = (userInfo).unpack()
181+ let (animationStart, duration, fadeIn, i, j) = (userInfo).unpack()
147−
182+
148− let now = NSDate()
183+ let now = Date()
149− var timeElapsed = Float(now.timeIntervalSinceDate(animationStart))
184+ var timeElapsed = Float(now.timeIntervalSince(animationStart))
150−
185+
151− if timeElapsed > duration {
186+ if timeElapsed > duration {
152− timer.invalidate()
187+ timer.invalidate()
153− timeElapsed = duration
188+ timeElapsed = duration
154− }
189+ }
155−
190+
156− let linearValue = timeElapsed / duration
191+ let linearValue = timeElapsed / duration
192+ let interpolatedValue = fadeIn ?
157− let interpolatedValue = fadeIn ? interpolateSquareEaseOut(linearValue) : (1 - interpolateSquareEaseIn(linearValue))
193+ interpolateSquareEaseOut(linearValue) :
158−
194+ (1 - interpolateSquareEaseIn(linearValue))
195+
159− metaballGraph.adjacencyMatrix.set(i, j, value: interpolatedValue)
196+ metaballGraph.adjacencyMatrix.set(i, j, value: interpolatedValue)
160− metaballGraph.adjacencyMatrix.set(j, i, value: interpolatedValue)
197+ metaballGraph.adjacencyMatrix.set(j, i, value: interpolatedValue)
161−
198+
162− renderer.state = .Running
199+ renderer.state = .running
163− }
200+ }
164−
201+
165− func handlePan(recognizer: UIPanGestureRecognizer) {
202+ func handlePan(_ recognizer: UIPanGestureRecognizer) {
166− let location = recognizer.locationInView(metaballView)
203+ let location = recognizer.location(in: metaballView)
167−
204+
168− if selectedMetaball == nil {
205+ if selectedMetaball == nil {
169− for metaball in metaballs where
206+ for metaball in metaballs where
170− abs(metaball.midX - location.x) < 50 && abs(metaball.midY - location.y) < 50 {
207+ abs(metaball.midX - location.x) < 50 &&
208+ abs(metaball.midY - location.y) < 50
209+ {
171− selectedMetaball = metaball
210+ selectedMetaball = metaball
172− break
211+ break
173− }
212+ }
174− }
213+ }
175−
214+
176− guard selectedMetaball != nil else { return }
215+ guard selectedMetaball != nil else { return }
177−
216+
178− selectedMetaball?.middle = location
217+ selectedMetaball?.middle = location
179−
218+
180− renderer.state = .Running
219+ renderer.state = .running
181−
220+
182− if recognizer.state == .Ended {
221+ if recognizer.state == .ended {
183− selectedMetaball = nil
222+ selectedMetaball = nil
184− }
223+ }
185− }
224+ }
186
225
187}
226}
PixelImage/shaders.metal+2−1
@@ -33,7 +33,8 @@ kernel void
33 for (x = 1; x <= numberOfMetaballs; x += 1) {
33 for (x = 1; x <= numberOfMetaballs; x += 1) {
34 metaballData metaball = metaballBuffer[x];
34 metaballData metaball = metaballBuffer[x];
35 float2 metaballPosition = float2(metaball.x, metaball.y);
35 float2 metaballPosition = float2(metaball.x, metaball.y);
36− float2 vector = float2(metaballPosition.x - gid.x, metaballPosition.y - gid.y);
36+ float2 vector = float2(metaballPosition.x - gid.x,
37+ metaballPosition.y - gid.y);
37 float dotProduct = dot(vector, vector);
38 float dotProduct = dot(vector, vector);
38 float squaredDistance = dotProduct > 0 ? dotProduct : 1;
39 float squaredDistance = dotProduct > 0 ? dotProduct : 1;
39 float realDistance = sqrt(squaredDistance);
40 float realDistance = sqrt(squaredDistance);
Podfile+1−1
@@ -2,5 +2,5 @@ platform :ios, '9.2'
2use_frameworks!
2use_frameworks!
3
3
4target 'PixelImage' do
4target 'PixelImage' do
5− pod 'ChameleonFramework/Swift'
5+ pod 'ChameleonFramework/Swift', :git => 'https://github.com/ViccAlexander/Chameleon.git'
6end
6end
Podfile.lock+13−2
@@ -4,9 +4,20 @@ PODS:
4 - ChameleonFramework/Default
4 - ChameleonFramework/Default
5
5
6DEPENDENCIES:
6DEPENDENCIES:
7− - ChameleonFramework/Swift
7+ - ChameleonFramework/Swift (from `https://github.com/ViccAlexander/Chameleon.git`)
8+
9+EXTERNAL SOURCES:
10+ ChameleonFramework:
11+ :git: https://github.com/ViccAlexander/Chameleon.git
12+
13+CHECKOUT OPTIONS:
14+ ChameleonFramework:
15+ :commit: acc480fbe023c6e5fe40f68593f4a70a8c4c7ad5
16+ :git: https://github.com/ViccAlexander/Chameleon.git
8
17
9SPEC CHECKSUMS:
18SPEC CHECKSUMS:
10 ChameleonFramework: d21a3cc247abfe5e37609a283a8238b03575cf64
19 ChameleonFramework: d21a3cc247abfe5e37609a283a8238b03575cf64
11
20
21+PODFILE CHECKSUM: 01ad8f20bdbed983c319dde08426f855f26bc5a0
22+
12−COCOAPODS: 0.39.0
23+COCOAPODS: 1.2.0