diff options
| -rw-r--r-- | gui/addons.make | 3 | ||||
| -rw-r--r-- | gui/src/chainImage.h | 6 | ||||
| -rw-r--r-- | gui/src/ofApp.cpp | 2 | ||||
| -rw-r--r-- | gui/src/ofApp.h | 2 |
4 files changed, 10 insertions, 3 deletions
diff --git a/gui/addons.make b/gui/addons.make index eff8aaa..e8305b7 100644 --- a/gui/addons.make +++ b/gui/addons.make @@ -1,4 +1,5 @@ ofxJSON ofxDMX ofxMidi -ofxArtnet
\ No newline at end of file +ofxArtnet +ofxThreadedImageLoader
\ No newline at end of file diff --git a/gui/src/chainImage.h b/gui/src/chainImage.h index aa7301d..66b2dbf 100644 --- a/gui/src/chainImage.h +++ b/gui/src/chainImage.h @@ -2,6 +2,7 @@ #include "ofMain.h" #include "ofxJSON.h" +#include "ofxThreadedImageLoader.h" #define THUMB_BORDER_RATIO 0.8 #define THUMB_SIZE 160 @@ -84,6 +85,9 @@ class chainImageSet{ dragRotate=0.0f; dragPoint=ofPoint(0,0); } + chainImageSet(const chainImageSet& mom){ + chainImageSet(); + } void drawGui(int x,int y,bool is_selected); void drawOutput(); void update(); @@ -117,4 +121,6 @@ class chainImageSet{ bool additive; float intensity; + + ofxThreadedImageLoader loader; };
\ No newline at end of file diff --git a/gui/src/ofApp.cpp b/gui/src/ofApp.cpp index 4f73e90..a264f83 100644 --- a/gui/src/ofApp.cpp +++ b/gui/src/ofApp.cpp @@ -84,7 +84,7 @@ for (int i=0;i<sets.size();i++){ } //artnet.sendDmx("10.7.175.170", dmx_data, 512); - next_update=ofGetElapsedTimef()+0.2f; + next_update=ofGetElapsedTimef()+0.1f; } diff --git a/gui/src/ofApp.h b/gui/src/ofApp.h index 1df35e0..8216a9c 100644 --- a/gui/src/ofApp.h +++ b/gui/src/ofApp.h @@ -46,7 +46,7 @@ class USBdmxMap{ dmx->setLevel(chan_shutter,255); //,0); dmx->update(); - printf("Dmx: %i,%i,%i @ %i \n",color[0],color[1],color[2],intensity); + //printf("Dmx: %i,%i,%i @ %i \n",color[0],color[1],color[2],intensity); } int chan_R, chan_G, chan_B, chan_intensity, chan_shutter, chan_white; float x,y; |