From 8fe8572729f186269b02ac2bb149fe9a25671cae Mon Sep 17 00:00:00 2001
From: Comment <tim@gray.(none)>
Date: Wed, 5 Dec 2012 22:10:04 +0000
Subject: asterisk with thread

---
 vfg/src/testApp.h | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'vfg/src/testApp.h')

diff --git a/vfg/src/testApp.h b/vfg/src/testApp.h
index 4852073..d4a9627 100755
--- a/vfg/src/testApp.h
+++ b/vfg/src/testApp.h
@@ -71,12 +71,12 @@ class testApp : public ofxFensterListener{
 		void windowResized(int w, int h);
 		void dragEvent(ofDragInfo dragInfo);
 		void gotMessage(ofMessage msg);
-		
+
 		void drawBackgroundLayers();
 		void activateGame();
 		void activatePractice();
 		void switchAnimals();
-	
+
 		ofVideoPlayer intro;
 		ofVideoPlayer advert;
 		ofSoundPlayer backgroundmusic;
@@ -87,38 +87,37 @@ class testApp : public ofxFensterListener{
 		vector<song*> songs;
 		song practiceSong;
 
-	
+
 		vector<Animal> penguins;
 		vector<Animal> raccoons;
-		
+
 		//vector<vector<Animal> > animals;
-		
+
 		//vector<Animal> playanimals;
 
 		vector<Animal>* playanimal;
 		vector<Tag*> tags;
-		
+
 		vector<Billboard*> logos;
-		
+
 		puppetSprite banner;
 		puppetSprite wirebirds;
-		
+
 		Billboard* lyricspanel;
 
 		Puppet testpenguin;
 		int currentlevel;
 
 		Asterisk game;
-		int gamepoll;
 
 		bool showFPS;
 		bool showVis;
 		bool fullscreenoutput;
-		
+
 		int currentsong,nextsong,gamestate,segmentStartTime;
-		
+
 		float fadelength;
-		
+
 		guiWindow *guiWin;
 		ofxPanel gui;
 		ofxIntSlider tS;
@@ -129,6 +128,7 @@ class testApp : public ofxFensterListener{
 		ofxParameter<int> timescale;
 		ofxIntSlider kT;
 		ofxParameter<int> keyThresh;
+		ofxToggle showWire;
 
 };
 
-- 
cgit v1.2.3