summaryrefslogtreecommitdiff
path: root/gui/src/AudioPlotter.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'gui/src/AudioPlotter.cpp')
-rw-r--r--gui/src/AudioPlotter.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/gui/src/AudioPlotter.cpp b/gui/src/AudioPlotter.cpp
index e78e8ba..ba78f1e 100644
--- a/gui/src/AudioPlotter.cpp
+++ b/gui/src/AudioPlotter.cpp
@@ -3,12 +3,12 @@
colourPolyline Audioplotter::compute_chaos(colourPolyline& poly,float colourFade){
colourPolyline tempPoly;
for (int i=0;i<poly.size();i++){
- REAL iv[6]={poly[i].x,poly[i].y,chaos_a,chaos_b,chaos_k,chaos_p};
- //ofLog() << i<<": calculating chaos with: "<<poly[i].x<<" "<<poly[i].y<<" "<<attractor.a<<" "<<attractor.b<<" "<<attractor.k<<" "<<attractor.p;
+ REAL iv[6]={(poly[i].x-(ofGetWidth()/2))/chaosscale,(poly[i].y-(ofGetHeight()/2))/chaosscale,chaos_a,chaos_b,chaos_k,chaos_p};
+ //ofLog() << i<<": calculating chaos with: "<<poly[i].x<<"->"<<((poly[i].x-(ofGetWidth()/2))/chaosscale)<<" "<<poly[i].y<<"->"<<((poly[i].y-(ofGetHeight()/2))/chaosscale)<<" "<<attractor.a<<" "<<attractor.b<<" "<<attractor.k<<" "<<attractor.p;
attractor.set(iv);
attractor.calc();
//ofLog() << i<<": got points: "<<attractor.nx<<" "<<attractor.ny;
- tempPoly.addVertex(ofPoint(attractor.nx,attractor.ny),poly.getColourAt(i)*colourFade);
+ tempPoly.addVertex(ofPoint((attractor.nx*chaosscale)+(ofGetWidth()/2),(attractor.ny*chaosscale)+(ofGetHeight()/2)),poly.getColourAt(i)*colourFade);
}
return tempPoly;
}