From d7eefb73403785845c3c6e9d77e09f2f9bdd4ff6 Mon Sep 17 00:00:00 2001
From: tim <tim@eclectronics.org>
Date: Thu, 30 Mar 2017 00:15:52 +0100
Subject: ofxInstagram updates for addon lib

---
 menuApp/src/ofApp.h | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

(limited to 'menuApp/src/ofApp.h')

diff --git a/menuApp/src/ofApp.h b/menuApp/src/ofApp.h
index 761e6c3..7fd1c5f 100644
--- a/menuApp/src/ofApp.h
+++ b/menuApp/src/ofApp.h
@@ -6,8 +6,22 @@
 #include "ofxTextSuite.h"
 
 #define IMAGE_SLOTS 5
-//#define FACTOR 1.0
+//#define FACTOR 1.0 //now in config.make
+#define FONTSIZE 13
+#define FONTSPACING FONTSIZE*2.3 // 30
 #define POLL_INTERVAL 60.0
+#define MENUTAG "#hangdai"
+
+class menuItem {
+	public:
+		menuItem(std::string _caption="",std::string _price=""){
+			caption=_caption;
+			price=_price;
+		}
+		ofImage *image;
+		std::string caption;
+		std::string price;
+};
 
 class ofApp : public ofBaseApp{
 	
@@ -31,17 +45,24 @@ class ofApp : public ofBaseApp{
 		void gotMessage(ofMessage msg);
 		void exit();
 
+		float lastPoll;
+
 		ofImage background;
 		ofImage overlay;
 
 		ofxInstagram instagram;
 		ofxThreadedImageLoader  getImages;
-		deque<ofImage> images;
+		deque<menuItem> items;
+
+		map<std::string,ofImage> imagepool;
 
 		ofTrueTypeFont	type14;
 		//ofImage images[5];
 
 		ofxTextBlock        myText;
 		TextBlockAlignment  alignment;  //constants for controlling state
+
+		std::string menutag;
 };
 
+
-- 
cgit v1.2.3