From 58a744fccac1a831c28eca66c889dd4e21fd6daa Mon Sep 17 00:00:00 2001
From: Eryn Wells <eryn@erynwells.me>
Date: Tue, 18 Sep 2018 19:23:12 -0700
Subject: [PATCH] More tweaking and clean up

---
 Waveform/GameViewController.swift |  51 ++++--------------------------
 Waveform/art.scnassets/blank.scn  | Bin 9759 -> 9757 bytes
 2 files changed, 7 insertions(+), 44 deletions(-)

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..<GameViewController.numberOfBallsPerSide {
                     let ijSphere = sphere.clone()
                     balls.append(ijSphere)
+
                     ijSphere.name = "sphere\(i),\(j)"
                     ijSphere.worldPosition = SCNVector3(x: CGFloat(-GameViewController.numberOfBallsPerSide / 2) + CGFloat(i),
                                                         y: 0.0,
                                                         z: CGFloat(-GameViewController.numberOfBallsPerSide / 2) + CGFloat(j))
+
+                    let ijMaterial = ijSphere.geometry!.firstMaterial!.copy() as! SCNMaterial
+                    ijSphere.geometry!.replaceMaterial(at: 0, with: ijMaterial)
+
                     sphereContainer.addChildNode(ijSphere)
                 }
             }
@@ -85,48 +90,6 @@ class GameViewController: NSViewController, SCNSceneRendererDelegate {
         
         // configure the view
         sceneView.backgroundColor = NSColor.black
-        
-        // Add a click gesture recognizer
-        let clickGesture = NSClickGestureRecognizer(target: self, action: #selector(handleClick(_:)))
-        var gestureRecognizers = sceneView.gestureRecognizers
-        gestureRecognizers.insert(clickGesture, at: 0)
-        sceneView.gestureRecognizers = gestureRecognizers
-    }
-    
-    @objc
-    func handleClick(_ gestureRecognizer: NSGestureRecognizer) {
-        // retrieve the SCNView
-        let scnView = self.view as! SCNView
-        
-        // check what nodes are clicked
-        let p = gestureRecognizer.location(in: scnView)
-        let hitResults = scnView.hitTest(p, options: [:])
-        // check that we clicked on at least one object
-        if hitResults.count > 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 08f35b73304c45463458489facec9471de19e5a5..7c7b1690449bcc7d0daa8d3cd4c692dc291f167c 100644
GIT binary patch
delta 308
zcmbR5GuLNABfA2lDx)@|!Nv|FRz{Z1yIDm<C*PLl<(Fk}W;o9v#VF6<*}&T%KY62^
zFtZ|~(&Ru{b5S)0DTX$NvkdEj@)}TeT9f^yrI~dYbtkWv$(J=mQeg~LVanhszy>r+
z8D!RGE|~?)Vxqy$em<G$86}x{>Av|XsX0zLnR$7e56MfgDu0q@m*$rila`Q{lJ=Jl
zln#~-l@6DVkuH>;DZN8_m-HU#kCXqZ%uYWbe^UOc{4M!s^6%yUDX=Q=Du^h^DyS>y
zDOf2uE4V1QDfladD8wqHDr70lS6Ha9SYfHcGKJL&cNFd^JWzO~@Lb`8;v>Z;iXRn!
nDzPfDD{(4uEBPsfE5#}$DP=2_C{-$TD@{<EI{Ck<JmYi#gjrXh

delta 311
zcmbR1Gv8-IBfBD_8lw)Q;l>UlRz|kXyIDm<<rrlcq!`*5&N8fLkYbc$aAr6Uq!k!E
z1y~w*8{{W%loMuFVpN{YC~YpPj-*l(s#1Hhue3C?E~DP$^)h*r&r9+08$)GG89ad|
zD1%Jc%q6pcSwcM6+0Q34J)<NuFWomkB{jz<F*hl-sATg2c?nkK_flV^Ii&@qC8VXK
zWuyb8gQY{I!=)po<D`qFXG`yr-Xpzl@^6*d>4)S`%U_qjBmYAFqXL5hy8^$0n1Z~5
zrh<Wjje@I!n}UZzphB2Jyh6G{j>1BP#R^LmmMg4KSgUYP;eo;<g(nIx6+S6GQGBNO
qS@E|LyAr1ow-T>XfKsGVyi$r%u2Pv&wNkIrB&F$-|EkI}&IAB^)K`=M