eryn/metaballs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[MetaballsKit] Center balls added to the field

Browse source
This commit is contained in:
Eryn Wells 2017-08-05 09:29:13 -07:00
parent eff20b8b93
commit 0c175acc79
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
MetaballsKit/Metaballs.swift
View file

@ -83,11 +83,11 @@ public class Field {
} }
public func add(ballWithRadius radius: CGFloat) { public func add(ballWithRadius radius: CGFloat) {
print("Adding ball with r=\(radius)") NSLog("Adding ball with r=\(radius); fieldSize=\(size)")
let insetBounds = bounds.insetBy(dx: radius, dy: radius) let insetBounds = bounds.insetBy(dx: radius, dy: radius)
let x = CGFloat(UInt32(insetBounds.minX) + arc4random_uniform(UInt32(insetBounds.width))) // let x = CGFloat(UInt32(insetBounds.minX) + arc4random_uniform(UInt32(insetBounds.width)))
let y = CGFloat(UInt32(insetBounds.minY) + arc4random_uniform(UInt32(insetBounds.height))) // let y = CGFloat(UInt32(insetBounds.minY) + arc4random_uniform(UInt32(insetBounds.height)))
let position = CGPoint(x: x, y: y) let position = CGPoint(x: insetBounds.midX, y: insetBounds.midY)
// TODO: Randomly generate velocity too. // TODO: Randomly generate velocity too.
let ball = Ball(radius: radius, position: position, velocity: CGVector()) let ball = Ball(radius: radius, position: position, velocity: CGVector())
balls.append(ball) balls.append(ball)
@ -229,7 +229,6 @@ public class Field {
let encoder = buffer.makeComputeCommandEncoder() let encoder = buffer.makeComputeCommandEncoder()
encoder.setComputePipelineState(state) encoder.setComputePipelineState(state)
encoder.setBuffer(parametersBuffer, offset: 0, at: 0) encoder.setBuffer(parametersBuffer, offset: 0, at: 0)
// TODO: Compute this size better.
encoder.setBuffer(ballBuffer, offset: 0, at: 1) encoder.setBuffer(ballBuffer, offset: 0, at: 1)
encoder.setTexture(sampleTexture, at: 0) encoder.setTexture(sampleTexture, at: 0)
encoder.dispatchThreadgroups(threadgroupCount, threadsPerThreadgroup: threadgroupSize) encoder.dispatchThreadgroups(threadgroupCount, threadsPerThreadgroup: threadgroupSize)