diff options
| -rw-r--r-- | gistanalysis/src/ofApp.cpp | 4 | ||||
| -rw-r--r-- | gistanalysis/src/ofApp.h | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/gistanalysis/src/ofApp.cpp b/gistanalysis/src/ofApp.cpp index bc3ec34..d5fdf65 100644 --- a/gistanalysis/src/ofApp.cpp +++ b/gistanalysis/src/ofApp.cpp @@ -67,6 +67,10 @@ void ofApp::setup(){ chaosgui.setup("chaos","",230,10); // most of the time you don't need a name but don't forget to call setup chaosgui.add(plotter.usechaos.set("use",false)); chaosgui.add(plotter.chaosamount.set("amount", 0.5f, 0.0f, 1.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)); + chaosgui.add(plotter.chaos_p.set("p", 7.7f, 0.0f, 10.0f)); /* //add special crest graph 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; |