From cae8be229004e32ce76b38e207ea24a02434b18d Mon Sep 17 00:00:00 2001
From: Tim Redfern <tim@eclectronics.org>
Date: Mon, 9 Jul 2012 20:36:05 +0100
Subject: version 1.2

---
 gaunt01/src/testApp.h | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

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

diff --git a/gaunt01/src/testApp.h b/gaunt01/src/testApp.h
index 4fa679e..7c95e6e 100644
--- a/gaunt01/src/testApp.h
+++ b/gaunt01/src/testApp.h
@@ -23,10 +23,9 @@
 #define CALIBRATE 1
 
 #define  TITLES 0
-#define  CREDIT 1
-#define  EXPLAIN 2
-#define  PLAYING 3
-#define  GOTCHA 4
+#define  EXPLAIN 1
+#define  PLAYING 2
+#define  GOTCHA 3
 
 #define CAM_WIDTH_FG 640
 #define CAM_HEIGHT_FG 480
@@ -78,27 +77,27 @@ class testApp : public ofBaseApp{
 		ofVideoPlayer 		vidPlayer;
 
 		ofxCvColorImage		colorImg;
-		
+
 		int diffchannel;
-		
+
 		cv::Mat accumulator,outmat,hsvback,hsvfront,backchan,frontchan,output;			// background accumulation
-		
+
 		ofxCvColorImage				currentFrame;
 		ofxCvColorImage				background;
-		
+
 		ofxCvColorImage				mogoutput;
-		
+
 		ofxCvGrayscaleImage			grayFrame;
 		ofxCvGrayscaleImage			grayBg;
 		ofxCvGrayscaleImage			grayDiff;
-		
+
 		float						learningRate;
 		bool 						bFirstFrame;
-		
+
 		//cv::BackgroundSubtractorMOG mog;
-	
+
 		float mogf;
-		
+
 		bool removeShadows;
 		int shadowThreshold;
 	/*
-- 
cgit v1.2.3