diff options
| author | tim <tim@eclectronics.org> | 2017-03-30 01:07:57 +0100 |
|---|---|---|
| committer | tim <tim@eclectronics.org> | 2017-03-30 01:07:57 +0100 |
| commit | e89f7750aff2e0a9fe8c4fd7fa60c62e0a02b594 (patch) | |
| tree | 260b3ced4eb049ced5ced148b446fef47ec4aefb /menuApp/src/ofApp.h | |
| parent | d7eefb73403785845c3c6e9d77e09f2f9bdd4ff6 (diff) | |
cleanup
Diffstat (limited to 'menuApp/src/ofApp.h')
| -rw-r--r-- | menuApp/src/ofApp.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/menuApp/src/ofApp.h b/menuApp/src/ofApp.h index 7fd1c5f..1c1f747 100644 --- a/menuApp/src/ofApp.h +++ b/menuApp/src/ofApp.h @@ -30,7 +30,6 @@ class ofApp : public ofBaseApp{ void setup(); void update(); void draw(); - void loadimages(); void keyPressed(int key); void keyReleased(int key); @@ -45,24 +44,24 @@ class ofApp : public ofBaseApp{ void gotMessage(ofMessage msg); void exit(); - float lastPoll; - - ofImage background; - ofImage overlay; - ofxInstagram instagram; ofxThreadedImageLoader getImages; - deque<menuItem> items; + std::string menutag; + void loadInstagramFeed(); + + float lastPoll; + + deque<menuItem> items; map<std::string,ofImage> imagepool; ofTrueTypeFont type14; - //ofImage images[5]; ofxTextBlock myText; TextBlockAlignment alignment; //constants for controlling state - std::string menutag; + ofImage background; + ofImage overlay; }; |
