diff options
Diffstat (limited to 'gistanalysis/src')
| -rw-r--r-- | gistanalysis/src/ofApp.cpp | 14 | ||||
| -rw-r--r-- | gistanalysis/src/ofApp.h | 2 |
2 files changed, 11 insertions, 5 deletions
diff --git a/gistanalysis/src/ofApp.cpp b/gistanalysis/src/ofApp.cpp index 76e53a9..ab5f374 100644 --- a/gistanalysis/src/ofApp.cpp +++ b/gistanalysis/src/ofApp.cpp @@ -2,6 +2,9 @@ using namespace std; +int MAX_POINTS=40000; +int LASER_INTENSITY=37; + //-------------------------------------------------------------- void ofApp::setup(){ ofSetCircleResolution(80); @@ -46,10 +49,10 @@ void ofApp::setup(){ gui.setup("panel"); // most of the time you don't need a name but don't forget to call setup - gui.add(numPlots.set("num plots", 1, 1, 128)); + gui.add(numPlots.set("num plots", 50, 1, 256)); gui.add(scalePlot.set( "scale plot", 0.1f, 0.0f, 1.0f )); gui.add(decayPlot.set( "decay", 0.9f, 0.0f, 1.0f )); - gui.add(xform.set("xform",ofVec2f(0,0),ofVec2f(-10,-10),ofVec2f(10,10))); + gui.add(xform.set("xform",ofVec2f(0,0),ofVec2f(-50,-50),ofVec2f(50,50))); /* @@ -79,7 +82,10 @@ void ofApp::setup(){ //loadSong("passades/1 The Ninth Set-sector1:sector2pt.1.aiff"); //loadSong("assets/sounds/Coltrane_acc_VUIMM.wav"); - plotter=Audioplotter(4,true); + plotter=Audioplotter(5,true); + + laser.set_pts(MAX_POINTS); + laser.set_intensity(LASER_INTENSITY); } @@ -276,7 +282,7 @@ void ofApp::drawOutput(ofEventArgs & args){ _xform.makeTranslationMatrix(xform->x,xform->y,0); auto lines=plotter.output(_xform,scalePlot,decayPlot); - laser.draw(lines,50); + laser.draw(lines,30); ofTranslate(0,ofGetHeight()/2); diff --git a/gistanalysis/src/ofApp.h b/gistanalysis/src/ofApp.h index 44c4aa6..eca2a91 100644 --- a/gistanalysis/src/ofApp.h +++ b/gistanalysis/src/ofApp.h @@ -57,7 +57,7 @@ public: for (int i=0;i<num;i++){ newdata.addVertex(((step*(i+1))*ofGetWidth())/audio.size(),audio[step*(i+1)]*ofGetHeight(),colour); if (!joined){ - newdata.addVertex((((step*(i+1))*ofGetWidth())/audio.size())+1,(audio[step*(i+1)])*ofGetHeight(),0,0,0); + newdata.addVertex((((step*(i+1))*ofGetWidth())/audio.size())+5,(audio[step*(i+1)])*ofGetHeight(),0,0,0); } } data.insert(data.begin(),newdata); |
