From 5df657051d6bf44c8eb918146621f1b9a341d932 Mon Sep 17 00:00:00 2001
From: Jamie Allen <jamie@heavyside.net>
Date: Tue, 21 Feb 2012 16:48:39 +0100
Subject: [PATCH] removed the xml shit in main.cpp

---
 example/RefractiveIndex.cpp |  4 ----
 example/RefractiveIndex.h   |  3 ++-
 example/main.cpp            | 18 ++++++++----------
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/example/RefractiveIndex.cpp b/example/RefractiveIndex.cpp
index e73dec6..9ed9a12 100644
--- a/example/RefractiveIndex.cpp
+++ b/example/RefractiveIndex.cpp
@@ -1,8 +1,6 @@
 
-
 ////also the new shit////
 
-
 #include "RefractiveIndex.h"
 
 #include "ShadowScapesAnalysis.h"
@@ -16,8 +14,6 @@
 #include "DiffNoiseAnalysis.h"
 
 #include "ofxXmlSettings.h"
-#include "ofxOpenCv.h"
-
 
 #define CAMERA_ID           1
 #define CAMERA_ACQU_WIDTH   640
diff --git a/example/RefractiveIndex.h b/example/RefractiveIndex.h
index 049ca3c..f796612 100644
--- a/example/RefractiveIndex.h
+++ b/example/RefractiveIndex.h
@@ -8,7 +8,7 @@
 #include "AbstractAnalysis.h"
 #include "AnalysisAdaptor.h"
 
-
+#include "ofxOpenCv.h"
 
 class RefractiveIndex : public ofBaseApp
 {
@@ -62,5 +62,6 @@ public:
     // this should be in xml
     static string           _location;
     
+    ofxCvColorImage			colorImg;
     
 };
\ No newline at end of file
diff --git a/example/main.cpp b/example/main.cpp
index 2732dc3..b7d310c 100755
--- a/example/main.cpp
+++ b/example/main.cpp
@@ -1,6 +1,5 @@
 #include "ofAppGlutWindow.h"
 #include "RefractiveIndex.h"
-#include "ofxXmlSettings.h"
 
 #define SCREEN_WIDTH        800
 #define SCREEN_HEIGHT       600
@@ -9,22 +8,21 @@
 
 int main() {
 	ofAppGlutWindow window;
+   
+    bool fullscreen;
     
-    ofxXmlSettings   XML;
+    //fullscreen = true; 
     
-    XML.loadFile("../data/config.refindx");
-    
-    bool fullscreen = (XML.getValue("config:display:fullscreen", "false") == "true" ? true : false);
-    int screen_w = XML.getValue("config:display:width", SCREEN_WIDTH);
-    int screen_h = XML.getValue("config:display:height", SCREEN_HEIGHT);     
+    fullscreen = false;
     
     cout << "> display configuration" << endl;
     cout << "* fullscreen: " << (fullscreen ? "yes" : "no") << endl;
+ 
     if(!fullscreen) {
-        cout << "* screen width: " << screen_w << endl;
-        cout << "* screen height: " << screen_h << endl;
+        cout << "* screen width: " << SCREEN_WIDTH << endl;
+        cout << "* screen height: " << SCREEN_HEIGHT << endl;
     }
     
-	ofSetupOpenGL(&window, screen_w, screen_h, (fullscreen ? OF_FULLSCREEN : OF_WINDOW));
+	ofSetupOpenGL(&window, SCREEN_WIDTH, SCREEN_HEIGHT, (fullscreen ? OF_FULLSCREEN : OF_WINDOW));
 	ofRunApp(new RefractiveIndex());
 }