generate wave at correct coords

1 files changed, 9 insertions, 10 deletions

diff --git a/audioin/src/ofApp.cpp b/audioin/src/ofApp.cpp
index 16134ce..2309650 100644
--- a/audioin/src/ofApp.cpp
+++ b/audioin/src/ofApp.cpp
@@ -48,32 +48,31 @@ void ofApp::draw(){
 
     ofSetLineWidth(lineWidth);
 
-    ofPushMatrix();
+    float vpos=ofGetHeight()/2;
 
-    ofTranslate(0,ofGetHeight()/2);
-
-    ofScale(1.0f,ofGetHeight()*vScale);
+    float scale=ofGetHeight()*vScale;
 
     ofPolyline line;
 
-
-    line.addVertex(0,buffer[0]);
+    line.addVertex(0,vpos+(buffer[0]*scale));
 
     float i=0.0f;
     while (i<(ofGetWidth()+hScale)){
         i+=max(1.0f,hScale);
-        line.curveTo(i,buffer[(int)i]);
+        line.curveTo(i,vpos+(buffer[(int)i]*scale));
     }
 
     line.draw();
 
-    //laser.draw(line);
+    int numpts=0;
 
-    ofPopMatrix();
+    if (laser_power) numpts=laser.draw(line);
     
     frameNum++;
 
-    ofSetWindowTitle(ofToString(ofGetFrameRate()));
+    lasergui.draw();
+
+    ofSetWindowTitle(ofToString(ofGetFrameRate())+" fps, pts:"+(numpts?ofToString(numpts):"ERR"));
 
 }