summaryrefslogtreecommitdiff
path: root/gui/src/ofApp.h
diff options
context:
space:
mode:
Diffstat (limited to 'gui/src/ofApp.h')
-rw-r--r--gui/src/ofApp.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/gui/src/ofApp.h b/gui/src/ofApp.h
index 8772ad2..9098bef 100644
--- a/gui/src/ofApp.h
+++ b/gui/src/ofApp.h
@@ -89,7 +89,7 @@ class ofApp: public ofBaseApp, public ofxMidiListener {
void outputMouseReleased(ofMouseEventArgs & args);
void outputWindowResized(ofResizeEventArgs &resizeargs);
- void select_random_shapes();
+ void select_random_shapes(float duration);
void default_settings();
void save_settings();
@@ -195,12 +195,13 @@ class ofApp: public ofBaseApp, public ofxMidiListener {
//svg gui
ofxToggle shapes_randomise;
ofxFloatSlider shapes_amount;
- ofxIntSlider shapes_duration;
+ ofxFloatSlider shapes_duration;
ofxToggle use_mask;
ofxToggle invert_mask;
//segmenter
ofxToggle use_segmenter;
+ ofxToggle colour_segmenter;
ofxFloatSlider segmenter_speed;
ofxFloatSlider segmenter_length;
ofxIntSlider segmenter_number;
@@ -237,6 +238,8 @@ class ofApp: public ofBaseApp, public ofxMidiListener {
ofxSVG svg;
vector <colourLineSegmenter> segmenters;
+ vector <float> shape_selection_durations;
+
set <int> shape_selection;
int framecounter;
float phase,prev_time; //to calculate phase