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

[MetaballsKit] In order to modify the actual Ball instance, you have to reference it by index each time (I think)

Browse source
This commit is contained in:
Eryn Wells 2017-08-06 07:53:23 -07:00
parent 515218a66e
commit bb4bdd1568
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
MetaballsKit/Metaballs.swift
View file

@ -67,22 +67,22 @@ public class Field {
public func update() { public func update() {
let selfBounds = bounds let selfBounds = bounds
for var ball in balls { for i in 0..<balls.count {
// Update position of ball. // Update position of ball.
ball.update() balls[i].update()
if !selfBounds.contains(ball.position.CGPoint) { if !selfBounds.contains(balls[i].position.CGPoint) {
// Degenerate case. If the ball finds itself outside the bounds of the field, plop it back in the center. // Degenerate case. If the ball finds itself outside the bounds of the field, plop it back in the center.
ball.position = Point(x: Float(selfBounds.midX), y: Float(selfBounds.midY)) balls[i].position = Point(x: Float(selfBounds.midX), y: Float(selfBounds.midY))
} else { } else {
// Do collision detection with walls. // Do collision detection with walls.
let ballBounds = ball.bounds let ballBounds = balls[i].bounds
if !selfBounds.contains(ballBounds) { if !selfBounds.contains(ballBounds) {
if ballBounds.minX < selfBounds.minX || ballBounds.maxX > selfBounds.maxX { if ballBounds.minX < selfBounds.minX || ballBounds.maxX > selfBounds.maxX {
ball.velocity.dx *= -1 balls[i].velocity.dx *= -1
} }
if ballBounds.minY < selfBounds.minY || ballBounds.maxY > selfBounds.maxY { if ballBounds.minY < selfBounds.minY || ballBounds.maxY > selfBounds.maxY {
ball.velocity.dy *= -1 balls[i].velocity.dy *= -1
} }
} }
} }