big improvements

3 files changed, 27 insertions, 6 deletions

diff --git a/gistanalysis/notes b/gistanalysis/notes
index c53b081..18b7564 100644
--- a/gistanalysis/notes
+++ b/gistanalysis/notes
@@ -34,4 +34,19 @@ are these necessarily different things?
 what do they have in common?
 - audio data that is stored over a few frames
 
-start with the dots one.
\ No newline at end of file
+start with the dots one.
+
+how to make sh!t look good.
+
+how to draw the dots.. will this ever really look good, are there realistically gonna be many
+
+
+we like drawing lines.
+
+we could draw waveforms in loops rather than across?
+
+we could draw fft bars
+
+we could graduate the colours
+
+make a realistic breakdown between technicalities (ie audio, mapping) and content
\ No newline at end of file
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);