git.iko.soy/metal-metaballs
on master help sign in
Merged release-optimization into master
commit59406ea59520adf4a3613fe0d422fb24d03ba044 authorvinivendra <vinivendra@gmail.com> dateWed 10 Feb 2016, 21:43 (11 years ago) parent7c82db87288e92
12 files changed+192−233
.gitignore+2 PixelImage.xcodeproj/project.pbxproj+4−8 PixelImage.xcodeproj/project.xcworkspace/xcuserdata/vini.xcuserdatad/UserInterfaceState.xcuserstate PixelImage.xcodeproj/xcuserdata/vini.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist−23 PixelImage/ImageMetaballRenderer.swift−101 PixelImage/MetaballDataSource.swift+6 PixelImage/MetaballRenderer.swift−18 PixelImage/Metal.swift+30 PixelImage/MetalMetaballRenderer.swift+123−54 PixelImage/UIKit.swift+2 PixelImage/ViewController.swift+18−21 PixelImage/shaders.metal+7−8
.gitignore+2
@@ -1 +1,3 @@
11.DS*
2+PixelImage.xcodeproj/xcuserdata/*
3+PixelImage.xcodeproj/project.xcworkspace/xcuserdata/*
PixelImage.xcodeproj/project.pbxproj+4−8
@@ -13,13 +13,12 @@
1313 2426868F1C63B72A00D62456 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2426868E1C63B72A00D62456 /* Assets.xcassets */; };
1414 242686921C63B72A00D62456 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 242686901C63B72A00D62456 /* LaunchScreen.storyboard */; };
1515 24E1E7D71C67C8B200ECF1C4 /* UIKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24E1E7D61C67C8B200ECF1C4 /* UIKit.swift */; };
16− 24E1E7D91C67C9C900ECF1C4 /* MetaballRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24E1E7D81C67C9C900ECF1C4 /* MetaballRenderer.swift */; };
17− 24E1E7DB1C67CA3600ECF1C4 /* ImageMetaballRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24E1E7DA1C67CA3600ECF1C4 /* ImageMetaballRenderer.swift */; };
1816 24E1E7E21C67D37F00ECF1C4 /* Metal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 24E1E7E11C67D37F00ECF1C4 /* Metal.framework */; };
1917 24E1E7E41C67D39300ECF1C4 /* MetalKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 24E1E7E31C67D39300ECF1C4 /* MetalKit.framework */; };
2018 24E1E7EB1C67D70300ECF1C4 /* MetalMetaballRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24E1E7EA1C67D70300ECF1C4 /* MetalMetaballRenderer.swift */; };
2119 24E1E7F01C67D74300ECF1C4 /* Metal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24E1E7EE1C67D74300ECF1C4 /* Metal.swift */; };
2220 24E1E7F11C67D74300ECF1C4 /* shaders.metal in Sources */ = {isa = PBXBuildFile; fileRef = 24E1E7EF1C67D74300ECF1C4 /* shaders.metal */; };
21+ 24ED21CD1C6C2397009C40FC /* MetaballDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24ED21CC1C6C2397009C40FC /* MetaballDataSource.swift */; };
2322 24FFA86B1C6BA038005ACD60 /* ApproximationOperator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24FFA84C1C6BA038005ACD60 /* ApproximationOperator.swift */; };
2423 24FFA86C1C6BA038005ACD60 /* Collections.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24FFA84D1C6BA038005ACD60 /* Collections.swift */; };
2524 24FFA86D1C6BA038005ACD60 /* ComparatorChains.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24FFA84E1C6BA038005ACD60 /* ComparatorChains.swift */; };
@@ -59,13 +58,12 @@
5958 242686911C63B72A00D62456 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
6059 242686931C63B72A00D62456 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
6160 24E1E7D61C67C8B200ECF1C4 /* UIKit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIKit.swift; sourceTree = "<group>"; };
62− 24E1E7D81C67C9C900ECF1C4 /* MetaballRenderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MetaballRenderer.swift; sourceTree = "<group>"; };
63− 24E1E7DA1C67CA3600ECF1C4 /* ImageMetaballRenderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageMetaballRenderer.swift; sourceTree = "<group>"; };
6461 24E1E7E11C67D37F00ECF1C4 /* Metal.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Metal.framework; path = System/Library/Frameworks/Metal.framework; sourceTree = SDKROOT; };
6562 24E1E7E31C67D39300ECF1C4 /* MetalKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MetalKit.framework; path = System/Library/Frameworks/MetalKit.framework; sourceTree = SDKROOT; };
6663 24E1E7EA1C67D70300ECF1C4 /* MetalMetaballRenderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MetalMetaballRenderer.swift; sourceTree = "<group>"; };
6764 24E1E7EE1C67D74300ECF1C4 /* Metal.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Metal.swift; sourceTree = "<group>"; };
6865 24E1E7EF1C67D74300ECF1C4 /* shaders.metal */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.metal; path = shaders.metal; sourceTree = "<group>"; };
66+ 24ED21CC1C6C2397009C40FC /* MetaballDataSource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MetaballDataSource.swift; sourceTree = "<group>"; };
6967 24FFA84C1C6BA038005ACD60 /* ApproximationOperator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ApproximationOperator.swift; sourceTree = "<group>"; };
7068 24FFA84D1C6BA038005ACD60 /* Collections.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Collections.swift; sourceTree = "<group>"; };
7169 24FFA84E1C6BA038005ACD60 /* ComparatorChains.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ComparatorChains.swift; sourceTree = "<group>"; };
@@ -134,8 +132,7 @@
134132 242686871C63B72A00D62456 /* AppDelegate.swift */,
135133 242686891C63B72A00D62456 /* ViewController.swift */,
136134 24E1E7D61C67C8B200ECF1C4 /* UIKit.swift */,
137− 24E1E7D81C67C9C900ECF1C4 /* MetaballRenderer.swift */,
138− 24E1E7DA1C67CA3600ECF1C4 /* ImageMetaballRenderer.swift */,
135+ 24ED21CC1C6C2397009C40FC /* MetaballDataSource.swift */,
139136 24E1E7EA1C67D70300ECF1C4 /* MetalMetaballRenderer.swift */,
140137 24E1E7EE1C67D74300ECF1C4 /* Metal.swift */,
141138 24E1E7EF1C67D74300ECF1C4 /* shaders.metal */,
@@ -289,13 +286,13 @@
289286 24FFA8861C6BA038005ACD60 /* TestCommons.swift in Sources */,
290287 24FFA8741C6BA038005ACD60 /* SignOperator.swift in Sources */,
291288 24FFA8821C6BA038005ACD60 /* ScanReduce.swift in Sources */,
289+ 24ED21CD1C6C2397009C40FC /* MetaballDataSource.swift in Sources */,
292290 24FFA8831C6BA038005ACD60 /* Slicing.swift in Sources */,
293291 24FFA8721C6BA038005ACD60 /* Sequence.swift in Sources */,
294292 24FFA87F1C6BA038005ACD60 /* Iterate.swift in Sources */,
295293 24FFA8761C6BA038005ACD60 /* Categorise.swift in Sources */,
296294 24FFA86D1C6BA038005ACD60 /* ComparatorChains.swift in Sources */,
297295 24FFA8711C6BA038005ACD60 /* PowerOperator.swift in Sources */,
298− 24E1E7D91C67C9C900ECF1C4 /* MetaballRenderer.swift in Sources */,
299296 24E1E7D71C67C8B200ECF1C4 /* UIKit.swift in Sources */,
300297 24FFA8851C6BA038005ACD60 /* Zip.swift in Sources */,
301298 24FFA8791C6BA038005ACD60 /* Cycle.swift in Sources */,
@@ -304,7 +301,6 @@
304301 24FFA87D1C6BA038005ACD60 /* Hopping.swift in Sources */,
305302 24E1E7EB1C67D70300ECF1C4 /* MetalMetaballRenderer.swift in Sources */,
306303 24FFA87A1C6BA038005ACD60 /* Enumerate.swift in Sources */,
307− 24E1E7DB1C67CA3600ECF1C4 /* ImageMetaballRenderer.swift in Sources */,
308304 242686881C63B72A00D62456 /* AppDelegate.swift in Sources */,
309305 24E1E7F01C67D74300ECF1C4 /* Metal.swift in Sources */,
310306 24FFA87C1C6BA038005ACD60 /* FlatMap.swift in Sources */,
PixelImage.xcodeproj/project.xcworkspace/xcuserdata/vini.xcuserdatad/UserInterfaceState.xcuserstatedeleted

Binary file not shown.

PixelImage.xcodeproj/xcuserdata/vini.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlistdeleted−23
@@ -1,23 +0,0 @@
1−<?xml version="1.0" encoding="UTF-8"?>
2−<Bucket
3− type = "1"
4− version = "2.0">
5− <Breakpoints>
6− <BreakpointProxy
7− BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
8− <BreakpointContent
9− shouldBeEnabled = "Yes"
10− ignoreCount = "0"
11− continueAfterRunningActions = "No"
12− filePath = "PixelImage/MetalMetaballRenderer.swift"
13− timestampString = "476814708.217603"
14− startingColumnNumber = "9223372036854775807"
15− endingColumnNumber = "9223372036854775807"
16− startingLineNumber = "62"
17− endingLineNumber = "62"
18− landmarkName = "updateTargetView(_:dataSource:)"
19− landmarkType = "5">
20− </BreakpointContent>
21− </BreakpointProxy>
22− </Breakpoints>
23−</Bucket>
PixelImage/ImageMetaballRenderer.swiftdeleted−101
@@ -1,101 +0,0 @@
1−
2−import UIKit
3−
4−class ImageMetaballRenderer: MetaballRenderer {
5− typealias TargetView = UIImageView
6−
7− static func updateTargetView(imageView: TargetView, dataSource: MetaballDataSource) {
8− let width = Int(imageView.width)
9− let height = Int(imageView.height)
10− let metaballs = dataSource.metaballs
11−
12− let bytesPerPixel = 4;
13− let bytesPerRow = bytesPerPixel * width;
14− let bitsPerComponent = 8;
15−
16− var matrix = PixelMatrix(width: width, height: height)
17− for i in 0..<width {
18− for j in 0..<height {
19− let pixelPosition = CGPoint(x: i, y: j)
20−
21− var sum: CGFloat = 0
22−
23− for combo in metaballs.combos() {
24− let metaball1 = combo[0].middle
25− let metaball2 = combo[1].middle
26−
27− let metaball1Vector = metaball1 - pixelPosition
28− let metaball2Vector = metaball2 - pixelPosition
29−
30− let direction1 = metaball1Vector.normalized
31− let direction2 = metaball2Vector.normalized
32−
33− let cos = direction1 * direction2
34−
35− let value1 = 255000 / (metaball1Vector * metaball1Vector + 1)
36− let value2 = 255000 / (metaball2Vector * metaball2Vector + 1)
37−
38− let v = gradient(value1 + value2)
39− let link = ((1 - cos) * 0.5) ^ 50
40−
41− let weightedLink = 128 * CGFloat(link)
42− let weightedValue = 0.6 * CGFloat(v)
43−
44− sum += weightedValue + weightedLink
45− }
46−
47− let result = threshold(sum)
48−
49− matrix.set(x: i, y: j, r:0, g:result/2, b:result)
50− }
51− }
52−
53− let buffer: UnsafeMutablePointer<Void> = UnsafeMutablePointer(matrix.pixels)
54−
55− let colorSpace = CGColorSpaceCreateDeviceRGB()
56− let context = CGBitmapContextCreate(buffer, width, height, bitsPerComponent, bytesPerRow, colorSpace, CGImageAlphaInfo.PremultipliedLast.rawValue | CGBitmapInfo.ByteOrder32Big.rawValue);
57−
58− let cgImage = CGBitmapContextCreateImage(context)
59− let image = UIImage(CGImage: cgImage!)
60− imageView.image = image
61− }
62−}
63−
64−struct PixelMatrix {
65− var pixels: [UInt8]
66−
67− let width: Int
68− let height: Int
69−
70− init(width: Int, height: Int) {
71− self.width = width
72− self.height = height
73− pixels = [UInt8](count: (4 * width * height), repeatedValue: 255)
74− }
75−
76− mutating func set(x x: Int, y: Int, r: UInt8, g: UInt8, b: UInt8) {
77− let index = 4 * (y * width + x)
78− pixels[index ] = r
79− pixels[index + 1] = g
80− pixels[index + 2] = b
81− }
82−
83− mutating func set(x x: Int, y: Int, white: UInt8) {
84− let index = 4 * (y * width + x)
85− pixels[index ] = white
86− pixels[index + 1] = white
87− pixels[index + 2] = white
88− }
89−}
90−
91−func threshold(value: CGFloat) -> UInt8 {
92− return value < 128 ? 0 : 255
93−}
94−
95−func gradient(value: CGFloat) -> UInt8 {
96− return UInt8(min(max(value, 0), CGFloat(255)))
97−}
98−
99−func thresholdf(value value: CGFloat, cap: CGFloat = 0.5) -> CGFloat {
100− return value < cap ? 0 : 1.0
101−}
PixelImage/MetaballDataSource.swiftnew file+6
@@ -0,0 +1,6 @@
1+
2+import Metal
3+
4+protocol MetaballDataSource {
5+ var metaballs: [Metaball] { get }
6+}
PixelImage/MetaballRenderer.swiftdeleted−18
@@ -1,18 +0,0 @@
1−
2−import UIKit
3−
4−protocol MetaballDataSource {
5− var metaballs: [Metaball] { get }
6−}
7−
8−protocol MetaballRenderer {
9− typealias TargetView: UIView
10−
11− static func updateTargetView(targetView: TargetView, dataSource: MetaballDataSource)
12−}
13−
14−extension MetaballRenderer {
15− static func createTargetView(frame frame: CGRect) -> TargetView {
16− return TargetView(frame: frame)
17− }
18−}
PixelImage/Metal.swift+30
@@ -1,4 +1,5 @@
11import Metal
2+import UIKit
23
34class MTLContext {
45 let device: MTLDevice
@@ -11,3 +12,32 @@ class MTLContext {
1112 self.commandQueue = device.newCommandQueue()
1213 }
1314}
15+
16+class MTLComputeContext {
17+ var texture: MTLTexture
18+ var imageBuffer: UnsafeMutablePointer<Void>
19+
20+ init(size: CGSize, texture: MTLTexture) {
21+ let width = Int(size.width)
22+ let height = Int(size.height)
23+ let imageByteCount = width * height * 4
24+ imageBuffer = malloc(imageByteCount)
25+
26+ self.texture = texture
27+ }
28+
29+ func updateToSize(size: CGSize, texture: MTLTexture) {
30+ free(imageBuffer)
31+
32+ let width = Int(size.width)
33+ let height = Int(size.height)
34+ let imageByteCount = width * height * 4
35+ imageBuffer = malloc(imageByteCount)
36+
37+ self.texture = texture
38+ }
39+
40+ deinit {
41+ free(imageBuffer)
42+ }
43+}
PixelImage/MetalMetaballRenderer.swift+123−54
@@ -1,7 +1,3 @@
1−// TODO: Render metaballs on layer/view instead of image
2−// TODO: Remove references to view size from shader
3−// TODO: Make shader ignore metaballs that are outside a certain area of tolerance (eg ±100 from borders)
4−
51// TODO: Make graphics have edges only according to graph (instead of being a complete graph)
62
73// TODO: Interpolate metaball colors
@@ -11,44 +7,113 @@
117import Metal
128import UIKit
139
14−class MetalMetaballRenderer: MetaballRenderer {
10+var i = 0
11+
12+class MetalMetaballRenderer {
1513
1614 typealias TargetView = UIImageView
1715
18− static let context = MTLContext()
16+ let targetView: TargetView
17+
18+ let context = MTLContext()
19+ var activeComputeContext: MTLComputeContext
20+ var idleComputeContext: MTLComputeContext
21+
22+ let dataSource: MetaballDataSource
23+
24+ let semaphore = dispatch_semaphore_create(2)
25+
26+ enum RendererState {
27+ case Idle
28+ case Running
29+ case Ending
30+ }
31+
32+ var state: RendererState = .Idle {
33+ willSet {
34+ if state == .Idle {
35+ if newValue == .Running {
36+ updateTargetView()
37+ }
38+ }
39+ }
40+ }
41+
42+ required init(dataSource: MetaballDataSource, frame: CGRect) {
43+ self.dataSource = dataSource
44+
45+ targetView = TargetView(frame: frame)
46+
47+ let width = Int(frame.width)
48+ let height = Int(frame.height)
49+ let textureDescriptor =
50+ MTLTextureDescriptor.texture2DDescriptorWithPixelFormat(.BGRA8Unorm, width: width, height: height, mipmapped: false)
51+
52+ let texture1 = context.device.newTextureWithDescriptor(textureDescriptor)
53+ activeComputeContext = MTLComputeContext(size: targetView.size, texture: texture1)
54+ let texture2 = context.device.newTextureWithDescriptor(textureDescriptor)
55+ idleComputeContext = MTLComputeContext(size: targetView.size, texture: texture2)
56+ }
57+
58+ func updateTargetView() {
59+
60+ let timeout = dispatch_time(DISPATCH_TIME_NOW, 1000000000)
61+ dispatch_semaphore_wait(semaphore, timeout)
62+
63+ print("Update \(i++)!")
64+
65+ state = .Ending
66+
67+ dispatch_async(dispatch_get_global_queue(Int(QOS_CLASS_USER_INTERACTIVE.rawValue), 0)) { () -> Void in
68+
69+ let computeContext = self.activeComputeContext
70+ swap(&self.activeComputeContext, &self.idleComputeContext)
71+
72+ // Render graphics to metal texture
73+ self.renderToContext(computeContext)
1974
20− static func updateTargetView(imageView: UIImageView, dataSource: MetaballDataSource) {
21− let metaballs = dataSource.metaballs
75+ if self.state != .Running {
76+ self.state = .Idle
77+ } else {
78+ self.updateTargetView()
79+ }
80+
81+ // Transform metal texture into image
82+ let uiimage = self.createImageFromContext(computeContext)
83+
84+ dispatch_semaphore_signal(self.semaphore)
85+
86+ dispatch_async(dispatch_get_main_queue(), { () -> Void in
87+ // Send image to view
88+ self.targetView.image = uiimage
89+ })
90+ }
91+ }
92+
93+ func renderToContext(computeContext: MTLComputeContext) {
94+ let width = Int(targetView.width)
95+ let height = Int(targetView.height)
2296
2397 let kernelFunction: MTLFunction?
2498 let pipeline: MTLComputePipelineState
25− var internalTexture: MTLTexture! = nil
26−
2799 do {
100+ // Get long-lived objects
28101 kernelFunction = context.library.newFunctionWithName("drawMetaballs")
29102 pipeline = try context.device.newComputePipelineStateWithFunction(kernelFunction!)
30103
31− let width = Int(imageView.width)
32− let height = Int(imageView.height)
33−
34− let textureDescriptor =
35− MTLTextureDescriptor.texture2DDescriptorWithPixelFormat(.BGRA8Unorm, width: width, height: height, mipmapped: false)
36−
37− internalTexture = context.device.newTextureWithDescriptor(textureDescriptor)
104+ // Configure info for computing
38105 let threadGroupCounts = MTLSizeMake(8, 8, 1)
39106 let threadGroups = MTLSizeMake(width / threadGroupCounts.width,
40107 height / threadGroupCounts.height, 1)
41108
42− //
43− let metaballInfoTexture = metaballTexture(metaballs)
44−
45− //
109+ // Send commands to metal and render
46110 let commandBuffer = context.commandQueue.commandBuffer()
47111
48112 let commandEncoder = commandBuffer.computeCommandEncoder()
49113 commandEncoder.setComputePipelineState(pipeline)
50− commandEncoder.setTexture(internalTexture, atIndex: 0)
51− commandEncoder.setTexture(metaballInfoTexture, atIndex: 1)
114+ commandEncoder.setTexture(computeContext.texture, atIndex: 0)
115+ let metaballInfoBuffer = metaballBuffer()
116+ commandEncoder.setBuffer(metaballInfoBuffer, offset: 0, atIndex: 0)
52117 commandEncoder.dispatchThreadgroups(threadGroups,
53118 threadsPerThreadgroup: threadGroupCounts)
54119 commandEncoder.endEncoding()
@@ -59,30 +124,32 @@ class MetalMetaballRenderer: MetaballRenderer {
59124 } catch _ {
60125 print("Error!")
61126 }
62−
63− imageView.image = image(texture: internalTexture)
64127 }
65128
66− static func image(texture texture: MTLTexture) -> UIImage {
129+ func createImageFromContext(computeContext: MTLComputeContext) -> UIImage {
130+ let texture = computeContext.texture
131+
132+ // Get image info
67133 let imageSize = CGSizeMake(CGFloat(texture.width),
68134 CGFloat(texture.height))
69−
70135 let width = Int(imageSize.width)
71136 let height = Int(imageSize.height)
72−
73137 let imageByteCount = width * height * 4
74− let imageBytes = malloc(imageByteCount)
75138 let bytesPerRow = width * 4
76139 let region = MTLRegionMake2D(0, 0, width, height)
77− texture.getBytes(imageBytes, bytesPerRow: bytesPerRow,
78− fromRegion: region, mipmapLevel: 0)
79140
80− let provider = CGDataProviderCreateWithData(nil, imageBytes,
81− imageByteCount) {
82− (_, data, _) -> Void in
83− free(UnsafeMutablePointer<Void>(data))
141+ // Allocate the buffer if needed
142+ if computeContext.imageBuffer == nil {
143+ computeContext.imageBuffer = malloc(imageByteCount)
84144 }
85145
146+ // Transfer texture info into image buffer
147+ texture.getBytes(computeContext.imageBuffer, bytesPerRow: bytesPerRow,
148+ fromRegion: region, mipmapLevel: 0)
149+
150+ // Get info for UIImage
151+ let provider = CGDataProviderCreateWithData(nil, computeContext.imageBuffer,
152+ imageByteCount, nil)
86153 let bitsPerComponent = 8
87154 let bitsperPixel = 32
88155 let colorSpaceRef = CGColorSpaceCreateDeviceRGB()
@@ -90,37 +157,39 @@ class MetalMetaballRenderer: MetaballRenderer {
90157 CGImageAlphaInfo.PremultipliedLast.rawValue |
91158 CGBitmapInfo.ByteOrder32Big.rawValue)
92159 let renderingIntent = CGColorRenderingIntent.RenderingIntentDefault
160+
161+ // Create UIImage from image buffer
93162 let imageRef = CGImageCreate(width, height,
94163 bitsPerComponent, bitsperPixel, bytesPerRow,
95164 colorSpaceRef, bitmapInfo, provider,
96165 nil, false, renderingIntent)
97166 let image = UIImage(CGImage: imageRef!, scale: 0.0,
98− orientation: UIImageOrientation.DownMirrored)
167+ orientation: UIImageOrientation.Up)
99168
100169 return image
101170 }
102171
103− static func metaballTexture(metaballs: [Metaball]) -> MTLTexture {
104− let floats: [Float] = metaballs.reduce([Float(metaballs.count)]) { (var array, metaball) -> [Float] in
105− array.append(Float(metaball.midX))
106− array.append(Float(metaball.midY))
172+ func metaballBuffer() -> MTLBuffer {
173+ // Create Float array for buffer
174+ // Exclude metaballs far from the view's bounds
175+ let border: CGFloat = 100
176+ let metaballs = self.dataSource.metaballs
177+ var floats: [Float] = metaballs.reduce([Float(0)]) { (var array, metaball) -> [Float] in
178+ let x = CGFloat(metaball.midX)
179+ let y = CGFloat(metaball.midY)
180+ if -border < x ≤ targetView.width + border &&
181+ -border < y ≤ targetView.height + border {
182+ array.append(Float(x))
183+ array.append(Float(y))
184+ }
107185 return array
108186 }
109− let size = floats.count
187+ // Add array size to start of array so metal knows how far to go
188+ floats[0] = Float(floats.count) / 2
110189
111− let textureDescriptor =
112− MTLTextureDescriptor.texture2DDescriptorWithPixelFormat(
113− .R32Float, width: size, height: 1, mipmapped: false)
114−
115− let texture = context.device.newTextureWithDescriptor(textureDescriptor)
116−
117− let region = MTLRegionMake2D(0, 0, size, 1)
190+ // Create buffer
191+ let buffer = context.device.newBufferWithBytes(floats, length: floats.count * sizeof(Float), options: .StorageModeShared)
118192
119− texture.replaceRegion(region, mipmapLevel: 0, withBytes: floats,
120− bytesPerRow: sizeof(Float) * size)
121−
122− return texture
193+ return buffer
123194 }
124−
125195}
126−
PixelImage/UIKit.swift+2
@@ -44,6 +44,8 @@ extension CGFloat: DoubleValuable {
4444 }
4545}
4646
47+extension CGFloat: Numeric {}
48+
4749extension CGRect {
4850 var x: CGFloat {
4951 get { return origin.x }
PixelImage/ViewController.swift+18−21
@@ -3,11 +3,8 @@ import UIKit
33
44class ViewController: UIViewController, MetaballDataSource {
55
6− let dynamicRendering = true
7− typealias Renderer = MetalMetaballRenderer // ImageMetaballRenderer // MetalMetaballRenderer
8− typealias TargetView = Renderer.TargetView
9−
10− var metaballView: TargetView!
6+ var metaballView: UIImageView!
7+ var renderer: MetalMetaballRenderer!
118
129 let width = 350
1310 let height = 600
@@ -17,50 +14,50 @@ class ViewController: UIViewController, MetaballDataSource {
1714 }
1815 var previousLocation: CGPoint!
1916
17+ var selectedMetaball: Metaball?
18+
2019 override func viewDidLoad() {
2120 super.viewDidLoad()
2221
23−
2422 let recognizer = UIPanGestureRecognizer(target: self, action: "handlePan:")
2523 view.addGestureRecognizer(recognizer)
2624
27−
2825 let border = 20
2926 let metaballViewFrame = CGRect(x: border/2, y: border/2, width: width, height: height)
30− metaballView = Renderer.createTargetView(frame: metaballViewFrame)
27+ renderer = MetalMetaballRenderer(dataSource: self, frame: metaballViewFrame)
28+ metaballView = renderer.targetView
3129
3230 let bigView = UIView(frame: CGRect(x: 10, y: 70, width: width + border, height: height + border))
3331 bigView.backgroundColor = UIColor.redColor()
3432 bigView.addSubview(metaballView)
3533 view.addSubview(bigView)
3634
37−
3835 for metaball in metaballs {
3936 metaballView.addSubview(metaball)
4037 }
4138
42−
43− Renderer.updateTargetView(metaballView, dataSource: self)
39+ renderer.state = .Running
4440 }
4541
4642 func handlePan(recognizer: UIPanGestureRecognizer) {
4743 let location = recognizer.locationInView(metaballView)
4844
49− var selectedMetaball: UIView?
50−
51− for metaball in metaballs where
52− abs(metaball.midX - location.x) < 50 && abs(metaball.midY - location.y) < 50 {
53− selectedMetaball = metaball
54− break
45+ if selectedMetaball == nil {
46+ for metaball in metaballs where
47+ abs(metaball.midX - location.x) < 50 && abs(metaball.midY - location.y) < 50 {
48+ selectedMetaball = metaball
49+ break
50+ }
5551 }
5652
53+ guard selectedMetaball != nil else { return }
54+
5755 selectedMetaball?.middle = location
5856
59− if recognizer.state == .Changed && dynamicRendering {
60− Renderer.updateTargetView(metaballView, dataSource: self)
61− }
57+ renderer.state = .Running
58+
6259 if recognizer.state == .Ended {
63− Renderer.updateTargetView(metaballView, dataSource: self)
60+ selectedMetaball = nil
6461 }
6562 }
6663}
PixelImage/shaders.metal+7−8
@@ -5,22 +5,21 @@ using namespace metal;
55
66kernel void
77 drawMetaballs(texture2d<float, access::write> outTexture[[texture(0)]],
8− texture2d<float, access::read>
9− metaballTexture[[texture(1)]],
8+ constant float *metaballBuffer [[buffer(0)]],
109 uint2 gid[[thread_position_in_grid]]) {
1110
12− char numberOfMetaballs = metaballTexture.read(0)[0];
11+ char numberOfMetaballs = metaballBuffer[0];
1312 char metaballArraySize = numberOfMetaballs * 2 + 1;
1413
1514 float sum = 0;
1615
1716 for (char i = 1; i < metaballArraySize; i += 2) {
1817 for (char j = i + 2; j < metaballArraySize; j += 2) {
19− float2 metaball1 = float2(metaballTexture.read(i)[0],
20− 600 - metaballTexture.read(i + 1)[0]);
18+ float2 metaball1 = float2(metaballBuffer[i],
19+ metaballBuffer[i + 1]);
2120
22− float2 metaball2 = float2(metaballTexture.read(j)[0],
23− 600 - metaballTexture.read(j + 1)[0]);
21+ float2 metaball2 = float2(metaballBuffer[j],
22+ metaballBuffer[j + 1]);
2423
2524 float2 metaball1Vector
2625 = float2(metaball1.x - gid.x, metaball1.y - gid.y);
@@ -45,7 +44,7 @@ kernel void
4544 }
4645 }
4746
48− float result = sum;
47+ float result = mix(0.0, 1.0, step(0.4, sum));
4948
5049 outTexture.write(float4(result, result / 2, 0, 1), gid);
5150}