removed the xml shit in main.cpp
This commit is contained in:
parent
7dc3e305a8
commit
5df657051d
@ -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
|
||||
|
||||
@ -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;
|
||||
|
||||
};
|
||||
@ -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());
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user