diff --git a/Waveform/GameViewController.swift b/Waveform/GameViewController.swift index 0ced5e5..0ebc728 100644 --- a/Waveform/GameViewController.swift +++ b/Waveform/GameViewController.swift @@ -63,10 +63,15 @@ class GameViewController: NSViewController, SCNSceneRendererDelegate { for j in 0.. 0 { - // retrieved the first clicked object - let result = hitResults[0] - - // get its material - let material = result.node.geometry!.firstMaterial! - - // highlight it - SCNTransaction.begin() - SCNTransaction.animationDuration = 0.5 - - // on completion - unhighlight - SCNTransaction.completionBlock = { - SCNTransaction.begin() - SCNTransaction.animationDuration = 0.5 - - material.emission.contents = NSColor.black - - SCNTransaction.commit() - } - - material.emission.contents = NSColor.red - - SCNTransaction.commit() - } } func delayForSphereAt(x: Int, y: Int) -> Double { @@ -146,7 +109,7 @@ class GameViewController: NSViewController, SCNSceneRendererDelegate { 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)) / 2.0 node.worldPosition.y = CGFloat(y) @@ -159,6 +122,6 @@ class GameViewController: NSViewController, SCNSceneRendererDelegate { } func map(_ x: Double, inMin: Double, inMax: Double, outMin: Double, outMax: Double) -> Double { - return (x - inMin) * (outMax - outMin) / (inMax - inMin) + outMin; + return (x - inMin) * (outMax - outMin) / (inMax - inMin) + outMin } } diff --git a/Waveform/art.scnassets/blank.scn b/Waveform/art.scnassets/blank.scn index 08f35b7..7c7b169 100644 Binary files a/Waveform/art.scnassets/blank.scn and b/Waveform/art.scnassets/blank.scn differ