demo v0.9

1 files changed, 37 insertions, 5 deletions

diff --git a/vfg/src/testApp.h b/vfg/src/testApp.h
index 2d17cd0..4890724 100755
--- a/vfg/src/testApp.h
+++ b/vfg/src/testApp.h
@@ -2,6 +2,8 @@
 
 #include "ofMain.h"
 #include "ofxSprite.h"
+#include "ofxGui.h"
+#include "ofxFensterManager.h"
 
 #include "music.h"
 #include "Asterisk.h"
@@ -54,9 +56,15 @@ character class- load sprites from xml- play behaviours- block animations when o
 
 */
 
+#define GAME_INTRO 1
+#define GAME_READY 2
+#define GAME_ADVERT 3
+#define GAME_PLAYING 4
 
+class guiWindow;
 
-class testApp : public ofBaseApp{
+
+class testApp : public ofxFensterListener{
 
 	public:
 		void setup();
@@ -64,6 +72,8 @@ class testApp : public ofBaseApp{
 		void draw();
 		void exit();
 
+		void keyPressedEvent(ofKeyEventArgs &args);
+		void keyPressed(int key, ofxFenster* win);
 		void keyPressed  (int key);
 		void keyReleased(int key);
 		void mouseMoved(int x, int y );
@@ -74,7 +84,8 @@ class testApp : public ofBaseApp{
 		void dragEvent(ofDragInfo dragInfo);
 		void gotMessage(ofMessage msg);
 	
-		//void loadanimals(string which);
+		ofVideoPlayer intro;
+		ofVideoPlayer advert;
 
 		ofVideoPlayer background;
 		ofImage vignette;
@@ -85,7 +96,7 @@ class testApp : public ofBaseApp{
 		vector<Animal> penguins;
 		vector<Animal> raccoons;
 		
-		vector<vector<Animal> > animals;
+		//vector<vector<Animal> > animals;
 		
 		//vector<Animal> playanimals;
 
@@ -105,12 +116,33 @@ class testApp : public ofBaseApp{
 
 		bool showFPS;
 		bool showVis;
+		bool fullscreenoutput;
+		
+		int currentsong,nextsong,gamestate;
 		
-		int currentsong,nextsong;
+		guiWindow *guiWin;
+		ofxPanel gui;
+		ofxIntSlider tS;
+		ofxParameter<int>threshStart;
+		ofxIntSlider tE;
+		ofxParameter<int> threshEnd;
+		ofxIntSlider ts;
+		ofxParameter<int> timescale;
+		ofxIntSlider kT;
+		ofxParameter<int> keyThresh;
 
 };
 
-
+class guiWindow: public ofxFensterListener{
+public:
+	~guiWindow();
+	testApp *parent;
+	void setup();
+	void setParent(testApp *p);
+	void draw();
+	void dragEvent(ofDragInfo dragInfo,ofxFenster* win);
+	void windowMoved(int x, int y);
+};