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

Make some public things internal; scale balls by x and y depending on what's larger

Browse source
This commit is contained in:
Eryn Wells 2018-10-13 12:41:40 -07:00
parent 09e9bf1f1a
commit 1c1171df59
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
MetaballsKit/Metaballs.swift
View file

@ -96,7 +96,9 @@ public class Field {
NSLog("Updating size of field: old:\(parameters.size), new:\(newValue)") NSLog("Updating size of field: old:\(parameters.size), new:\(newValue)")
if parameters.size != newValue { if parameters.size != newValue {
// Scale balls to new position and size. // Scale balls to new position and size.
let scale = parameters.size.x != 0 ? Float(newValue.x / parameters.size.x) : 1 let scaleX = parameters.size.x != 0 ? Float(newValue.x / parameters.size.x) : 1
let scaleY = parameters.size.y != 0 ? Float(newValue.y / parameters.size.y) : 1
let scale = max(scaleX, scaleY)
balls = balls.map { balls = balls.map {
let r = $0.radius * scale let r = $0.radius * scale
let p = randomPoint(forBallWithRadius: r) let p = randomPoint(forBallWithRadius: r)
@ -131,7 +133,7 @@ public class Field {
NotificationCenter.default.removeObserver(self, name: PreferencesDidChange_Color, object: nil) NotificationCenter.default.removeObserver(self, name: PreferencesDidChange_Color, object: nil)
} }
public func update() { func update() {
let selfBounds = bounds let selfBounds = bounds
for i in 0..<balls.count { for i in 0..<balls.count {
// Update position of ball. // Update position of ball.
@ -156,7 +158,7 @@ public class Field {
populateBallBuffer() populateBallBuffer()
} }
public func add(ballWithRadius radius: Float) { func add(ballWithRadius radius: Float) {
let position = randomPoint(forBallWithRadius: radius) let position = randomPoint(forBallWithRadius: radius)
let dx = Float(5 - Int(arc4random_uniform(10))) let dx = Float(5 - Int(arc4random_uniform(10)))
@ -172,7 +174,7 @@ public class Field {
populateBallBuffer() populateBallBuffer()
} }
public func clear() { func clear() {
balls.removeAll(keepingCapacity: true) balls.removeAll(keepingCapacity: true)
} }
@ -190,8 +192,8 @@ public class Field {
// MARK: - Metal Configuration // MARK: - Metal Configuration
private var device: MTLDevice? private var device: MTLDevice?
public private(set) var parametersBuffer: MTLBuffer? private(set) var parametersBuffer: MTLBuffer?
public private(set) var ballBuffer: MTLBuffer? private(set) var ballBuffer: MTLBuffer?
/// Create the Metal buffer containing basic parameters of the simulation. /// Create the Metal buffer containing basic parameters of the simulation.
private func populateParametersBuffer() { private func populateParametersBuffer() {