From 6d2306c1200db53de92bd5af73b62b5049d02b56 Mon Sep 17 00:00:00 2001 From: Tim Redfern Date: Fri, 4 Nov 2022 03:47:42 +0000 Subject: WIP --- pluginchooser/src/ofApp.cpp | 52 ++++++++++++++++++++++++++++++++++------- pluginchooser/src/pluginpanel.h | 22 ++++++++++------- 2 files changed, 57 insertions(+), 17 deletions(-) diff --git a/pluginchooser/src/ofApp.cpp b/pluginchooser/src/ofApp.cpp index 4c98ea7..511b7c6 100644 --- a/pluginchooser/src/ofApp.cpp +++ b/pluginchooser/src/ofApp.cpp @@ -13,8 +13,40 @@ void ofApp::setup(){ } +#define STEPS_X 8 +#define STEPS_Y 6 +#define NUM_FRAMES 10 + void ofApp::update(){ plugingui.update(); + + //seed the pipeline of drawing for the chaos algorithm +/* + n-> delete + n-1 -> chaos -> n + n-2 -> chaos -> n-1 + + . . . + + 1 -> chaos -> 2 + new frame -> chaos -> 1 +*/ + + vector frame; + for (int i=ofGetWidth()/STEPS_X;iNUM_FRAMES){ + drawing.pop_back(); + } + } void ofApp::draw(){ @@ -27,17 +59,19 @@ void ofApp::draw(){ testsettings.draw(); - //seed the pipeline of drawing for the chaos algorithm -/* - n-> delete - n-1 -> chaos -> n - n-2 -> chaos -> n-1 + glLineWidth(2); - . . . + for (auto i=drawing.begin();i!=drawing.end();i++){ + for (auto j=i->begin();j!=i->end();j++){ + for (int k=0;ksize();k++){ + (*j)[k]=plugingui.calc((*j)[k]); + } + j->draw(); + } + } + + ofSetWindowTitle(ofToString(ofGetFrameRate(), 2)+" fps"); - 1 -> chaos -> 2 - new frame -> chaos -> 1 -*/ } void ofApp::exit() { diff --git a/pluginchooser/src/pluginpanel.h b/pluginchooser/src/pluginpanel.h index 82c7e46..02bf5d7 100644 --- a/pluginchooser/src/pluginpanel.h +++ b/pluginchooser/src/pluginpanel.h @@ -21,6 +21,7 @@ public: input_index=_input_index; params=_params; iv.resize(_params.size()+_dimension); + plugin->setup (); } string name; AChaosBase *plugin; @@ -35,13 +36,13 @@ public: params[i].val=_params[i]; } } - ofVec2f calc(ofVec2f point){ - iv[input_index]=point.x; - iv[input_index+1]=point.y; + ofVec3f calc(ofVec3f point){ + iv[input_index]=point.x-(ofGetWidth()/2); + iv[input_index+1]=point.y-(ofGetHeight()/2); plugin->set(iv); plugin->calc(); vector ov=plugin->getVec(); - return ofVec2f(ov[0],ov[1]); + return ofVec3f(ov[0]+(ofGetWidth()/2),ov[1]+(ofGetHeight()/2),0); } }; @@ -157,11 +158,16 @@ class pluginPanel : public ofxPanel { } } void update(){ - //push params to plugin - plugins[index].update(params); + + //push params to plugin + plugins[index].update(params); + } - ofVec2f calc(ofVec2f point){ - return plugins[index].calc(point); + ofVec3f calc(ofVec3f point){ + //if (active){ + return plugins[index].calc(point); + //} + //return point; } private: int index; -- cgit v1.2.3