fairly good chaos

1 files changed, 5 insertions, 1 deletions

diff --git a/gistanalysis/src/ofApp.h b/gistanalysis/src/ofApp.h
index 350e53f..961fcc4 100644
--- a/gistanalysis/src/ofApp.h
+++ b/gistanalysis/src/ofApp.h
@@ -56,7 +56,7 @@ public:
     colourPolyline compute_chaos(colourPolyline& poly,float colourFade=1.0f){
         colourPolyline tempPoly;
         for (int i=0;i<poly.size();i++){
-                REAL iv[6]={poly[i].x,poly[i].y,attractor.a,attractor.b,attractor.k,attractor.p};
+                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;
                 attractor.set(iv);
                 attractor.calc();
@@ -147,6 +147,10 @@ public:
 
         ofParameter<bool> usechaos;
         ofParameter<float> chaosamount;
+        ofParameter<float> chaos_a;
+        ofParameter<float> chaos_b;
+        ofParameter<float> chaos_k;
+        ofParameter<float> chaos_p;
 
 private:
     vector < vector<colourPolyline>> data;