1 files changed, 21 insertions, 10 deletions
diff --git a/audioin/src/ofApp.cpp b/audioin/src/ofApp.cpp
index 1f037d5..a6fa8d1 100644
--- a/audioin/src/ofApp.cpp
+++ b/audioin/src/ofApp.cpp
@@ -22,12 +22,22 @@ void ofApp::setup(){
 
     lineWidth=2.0f;
 
-    laser.set_pts(45000);
+    lasergui.setup("laser","",5,5);
+    lasergui.add(laser_power.set("power", false));
+    lasergui.add(laser_intensity.set("intensity", 30, 0, 255));
+    lasergui.add(laser_points.set("points", 30000, 0, 40000));
+    lasergui.add(laser_subdivide.set("subdivide", 15, 1, 100));
+    lasergui.add(laser_blank_num.set("blank points", 8, 0, 32));
+    lasergui.add(laser_max_angle.set("max angle", 15.0f, 1.0f, 90.0f));
   
 }
 void ofApp::update(){
     
- 
+    laser.set_pts(laser_points);
+    laser.set_subdivide(laser_subdivide);
+    laser.set_blanknum(laser_blank_num);
+    laser.set_maxangle(laser_max_angle);
+    laser.set_intensity(laser_intensity);
 }
 
 int sampleNum=0;
@@ -38,30 +48,31 @@ void ofApp::draw(){
 
     ofSetLineWidth(lineWidth);
 
-    ofPushMatrix();
-
-    ofTranslate(0,ofGetHeight()/2);
+    float vpos=ofGetHeight()/2;
 
-    ofScale(1.0f,ofGetHeight()*vScale);
+    float scale=ofGetHeight()*vScale;
 
     colourPolyline 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();
 
-    int numpts=laser.draw(line);
+    int numpts=0;
 
-    ofPopMatrix();
+    if (laser_power) numpts=laser.draw(line);
     
     frameNum++;
 
+    lasergui.draw();
+
     ofSetWindowTitle(ofToString(ofGetFrameRate())+" fps, pts:"+(numpts?ofToString(numpts):"ERR"));
 
 }