summaryrefslogtreecommitdiff
path: root/gui
diff options
context:
space:
mode:
authorTim Redfern <tim@getdrop.com>2022-09-29 21:12:40 +0100
committerTim Redfern <tim@getdrop.com>2022-09-29 21:12:40 +0100
commita2c919f85c366e02cdc71f0fb46f4ebd4e4afebe (patch)
treeba1b88607e8de35b0b49683648d7f64ac8259fe1 /gui
parent8c43a654fdc0a0fd822fd0bd9462cdadf6d96456 (diff)
revert to working single plugin chaos
Diffstat (limited to 'gui')
-rw-r--r--gui/src/AudioPlotter.cpp4
-rw-r--r--gui/src/chaoslib.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/gui/src/AudioPlotter.cpp b/gui/src/AudioPlotter.cpp
index 3c43a5d..b3b37a8 100644
--- a/gui/src/AudioPlotter.cpp
+++ b/gui/src/AudioPlotter.cpp
@@ -35,13 +35,13 @@ vector <colourPolyline> Audioplotter::output(float plotscale,float plotdecay){
for (int i=0;i<data.size();i++){
vector <colourPolyline> newdata;
for (int j=0;j<data[i].size();j++){
- colourPolyline line=lineTransformer::polyLineTransform(x,data[i][j]); //,fadefactor);
+ colourPolyline line=data[i][j];lineTransformer::polyLineTransform(x,data[i][j]); //,fadefactor);
line.setColour((line.getColourAt(0)*fadefactor)+(((ofColor)endColour)*(1.0f-fadefactor)));
if (usechaos) {
colourPolyline chaosline=compute_chaos(line); //,fadefactor);
- ofLog() << "computing chaos at "<<chaosamount<<" in: "<<line.size()<<" out: "<<chaosline.size()<<" point 0:"<<line[0].x<<","<<line[0].y;
+ ofLog() << "computing chaos at "<<chaosamount<<" in: "<<line.size()<<" out: "<<chaosline.size()<<" point 0:"<<line[0].x<<","<<line[0].y<<", chaos 0:"<<chaosline[0].x<<","<<chaosline[0].y;
line.mix(chaosline,chaosamount); //chaos
}
diff --git a/gui/src/chaoslib.h b/gui/src/chaoslib.h
index e4a08ae..655efcc 100644
--- a/gui/src/chaoslib.h
+++ b/gui/src/chaoslib.h
@@ -174,7 +174,7 @@ class chaosPanel : public ofxPanel {
}
}
}
- colourPolyline compute_chaos(const colourPolyline& poly){
+ colourPolyline compute_chaos(colourPolyline& poly){
float chaosscale=1.0f;
colourPolyline tempPoly;
for (int i=0;i<poly.size();i++){