diff options
| -rw-r--r-- | pluginchooser/addons.make | 1 | ||||
| -rw-r--r-- | pluginchooser/src/main.cpp | 2 | ||||
| -rw-r--r-- | pluginchooser/src/ofApp.cpp | 15 | ||||
| -rw-r--r-- | pluginchooser/src/ofApp.h | 5 |
4 files changed, 22 insertions, 1 deletions
diff --git a/pluginchooser/addons.make b/pluginchooser/addons.make index 1ea1f10..a95afd5 100644 --- a/pluginchooser/addons.make +++ b/pluginchooser/addons.make @@ -1,3 +1,4 @@ ofxGui ofxAChaoslib +ofxHelios diff --git a/pluginchooser/src/main.cpp b/pluginchooser/src/main.cpp index d9d6188..851c933 100644 --- a/pluginchooser/src/main.cpp +++ b/pluginchooser/src/main.cpp @@ -4,7 +4,7 @@ int main(int argc, char *argv[]){ ofGLFWWindowSettings settings; settings.decorated = true; - settings.setSize(400,400); + settings.setSize(800,600); settings.setPosition(ofVec2f(100,100)); settings.resizable = false; diff --git a/pluginchooser/src/ofApp.cpp b/pluginchooser/src/ofApp.cpp index 351c429..4c98ea7 100644 --- a/pluginchooser/src/ofApp.cpp +++ b/pluginchooser/src/ofApp.cpp @@ -9,6 +9,8 @@ void ofApp::setup(){ plugingui.setup("chaos","",10,10); + testsettings.setup("test","",10,160); + } void ofApp::update(){ @@ -23,6 +25,19 @@ void ofApp::draw(){ plugingui.draw(); + testsettings.draw(); + + //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 +*/ } void ofApp::exit() { diff --git a/pluginchooser/src/ofApp.h b/pluginchooser/src/ofApp.h index 8d716c1..9a0a632 100644 --- a/pluginchooser/src/ofApp.h +++ b/pluginchooser/src/ofApp.h @@ -2,6 +2,7 @@ #include "ofMain.h" #include "pluginpanel.h" +#include "colourPolyline.h" class ofApp: public ofBaseApp{ @@ -24,4 +25,8 @@ class ofApp: public ofBaseApp{ pluginPanel plugingui; + ofxPanel testsettings; + + deque<vector<colourPolyline > > drawing; + }; |