eryn/moogfest18-waveform
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Little bit of cleanup

Browse source
This commit is contained in:
Eryn Wells 2018-09-18 06:51:25 -07:00
parent 18a92331c9
commit ef199a0805
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Waveform/GameViewController.swift
View file

@ -134,8 +134,6 @@ class GameViewController: NSViewController, SCNSceneRendererDelegate {
// MARK: - SCNRendererDelegate // MARK: - SCNRendererDelegate
static let numberOfSteps = 100
var step = 0
var maxY = 0.0 var maxY = 0.0
var minY = 0.0 var minY = 0.0
@ -144,10 +142,9 @@ class GameViewController: NSViewController, SCNSceneRendererDelegate {
for x in 0..<GameViewController.numberOfBallsPerSide { for x in 0..<GameViewController.numberOfBallsPerSide {
let idx = z * GameViewController.numberOfBallsPerSide + x let idx = z * GameViewController.numberOfBallsPerSide + x
let node = balls[idx] let node = balls[idx]
let delay = delayForSphereAt(x: x, y: z)
//let inputX = 2.0 * Double.pi * Double(step) / Double(GameViewController.numberOfSteps) + delay
let inputX = 2.0 / 3.0 * time + delay let delay = delayForSphereAt(x: x, y: z)
let inputX = 0.5 * time + delay
let y = sin(inputX) + sin(2.0 * inputX) + sin(4.0 * inputX) + sin(8.0 * inputX) let y = sin(inputX) + sin(2.0 * inputX) + sin(4.0 * inputX) + sin(8.0 * inputX)
node.worldPosition.y = CGFloat(y) node.worldPosition.y = CGFloat(y)
@ -158,7 +155,6 @@ class GameViewController: NSViewController, SCNSceneRendererDelegate {
node.scale = SCNVector3(x: scale, y: scale, z: scale) node.scale = SCNVector3(x: scale, y: scale, z: scale)
} }
} }
step = (step + 1) % GameViewController.numberOfSteps
} }
func map(_ x: Double, inMin: Double, inMax: Double, outMin: Double, outMax: Double) -> Double { func map(_ x: Double, inMin: Double, inMax: Double, outMin: Double, outMax: Double) -> Double {