summaryrefslogtreecommitdiff
path: root/gui/src/ofApp.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'gui/src/ofApp.cpp')
-rw-r--r--gui/src/ofApp.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/gui/src/ofApp.cpp b/gui/src/ofApp.cpp
index 6ff5d9e..ee406af 100644
--- a/gui/src/ofApp.cpp
+++ b/gui/src/ofApp.cpp
@@ -67,7 +67,7 @@ void ofApp::setup(){
//============================ gui
- lasergui.setup( );
+ lasergui.setup("laser","",230,820);
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));
@@ -75,7 +75,9 @@ void ofApp::setup(){
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));
- responsegui.setup("audio response","",230,970);
+ madlaser.setup("madlaser",140,820);
+
+ responsegui.setup("audio response","",10,970);
responsegui.add(onset_threshold.set("onset threshold", 0.05f, 0.0f, 1.0f ));
responsegui.add(use_onset.set("trigger onset",false));
responsegui.add(onset_duration.set("duration", 10, 1, 100));
@@ -534,6 +536,7 @@ void ofApp::draw(){
}
else {
lasergui.draw();
+ madlaser.panel.draw();
drawgui.draw();
audiogui.draw();
chaosgui.draw();