diff options
Diffstat (limited to 'gui/src')
| -rw-r--r-- | gui/src/AudioPlotter.cpp | 15 | ||||
| -rw-r--r-- | gui/src/AudioPlotter.h | 1 | ||||
| -rw-r--r-- | gui/src/ofApp.cpp | 5 |
3 files changed, 15 insertions, 6 deletions
diff --git a/gui/src/AudioPlotter.cpp b/gui/src/AudioPlotter.cpp index ba78f1e..ec53bf4 100644 --- a/gui/src/AudioPlotter.cpp +++ b/gui/src/AudioPlotter.cpp @@ -68,10 +68,17 @@ void Audioplotter::addpoints(vector <float> &audio){ } else{ for (int i=0;i<num;i++){ - colourPolyline line; - line.addVertex(((step*(i+1))*ofGetWidth())/audio.size(),(0.5f+audio[step*(i+1)])*ofGetHeight(),startColour); - line.addVertex(((step*(i+1))*ofGetWidth())/audio.size()+width,(0.5f+audio[step*(i+1)])*ofGetHeight(),startColour); - newdata.push_back(line); + colourPolyline line; + if (random){ + float in=ofRandom(0.0f,audio.size()); + line.addVertex(((in*ofGetWidth())/audio.size())-(width/2),(0.5f+audio[in])*ofGetHeight(),startColour); + line.addVertex(((in*ofGetWidth())/audio.size())+(width/2),(0.5f+audio[in])*ofGetHeight(),startColour); + } + else { + line.addVertex(((step*(i+1))*ofGetWidth())/audio.size()-(width/2),(0.5f+audio[step*(i+1)])*ofGetHeight(),startColour); + line.addVertex(((step*(i+1))*ofGetWidth())/audio.size()+(width/2),(0.5f+audio[step*(i+1)])*ofGetHeight(),startColour); + } + newdata.push_back(line); } } data.insert(data.begin(),newdata); diff --git a/gui/src/AudioPlotter.h b/gui/src/AudioPlotter.h index 3bbb20c..fba5516 100644 --- a/gui/src/AudioPlotter.h +++ b/gui/src/AudioPlotter.h @@ -25,6 +25,7 @@ public: void addpoints(vector <float> &audio); int numpoints(); + ofParameter<bool> random; ofParameter<bool> joined; ofParameter<bool> bars; ofParameter<int> width; diff --git a/gui/src/ofApp.cpp b/gui/src/ofApp.cpp index b7092f7..44939cc 100644 --- a/gui/src/ofApp.cpp +++ b/gui/src/ofApp.cpp @@ -67,8 +67,8 @@ void ofApp::setup(){ chaosgui.setup("chaos","",460,820); chaosgui.add(plotter.usechaos.set("use",false)); - chaosgui.add(plotter.chaosamount.set("amount", 0.5f, 0.0f, 1.0f)); - chaosgui.add(plotter.chaosscale.set("scale", 10.0f, 1.0f, 250.0f)); + chaosgui.add(plotter.chaosamount.set("amount", 0.0f, -0.1f, 0.1f)); + chaosgui.add(plotter.chaosscale.set("scale", 100.0f, 1.0f, 1000.0f)); chaosgui.add(plotter.chaos_a.set("a", 0.85f, 0.0f, 10.0f)); chaosgui.add(plotter.chaos_b.set("b", 0.9f, 0.0f, 10.0f)); chaosgui.add(plotter.chaos_k.set("k", 0.4f, 0.0f, 10.0f)); @@ -103,6 +103,7 @@ void ofApp::setup(){ audiogui.add(useFft.set("fft",false)); audiogui.add(scalePlot.set("plotscale", 0.1f, 0.0f, 1.0f )); //parameters are recognised by name only? audiogui.add(decayPlot.set("decay", 0.9f, 0.0f, 1.0f )); + audiogui.add(plotter.random.set("random",true)); audiogui.add(plotter.joined.set("joined",true)); audiogui.add(plotter.bars.set("bars",true)); audiogui.add(plotter.width.set("point width", 2, 1, 256)); |