gauthiier/RefractiveIndex
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

fixed timings so everything is on the second-basis, fixed David's flags so that each section in the classes terminates on RUN_DONE

Browse Source
This commit is contained in:
Jamie Allen
2012-02-20 19:48:43 +01:00
parent 12d210327b
commit b514c12a53
19 changed files with 220 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
example/RefractiveIndex.cpp
+9 -4
View File
@@ -8,6 +8,9 @@
~ contact: dviid@labs.ciid.dk
*/
////also the new shit////
#include "RefractiveIndex.h"
#include "ShadowScapesAnalysis.h"
@@ -94,13 +97,14 @@ void RefractiveIndex::setup()
//getting a warning from the OFlog that the pixels aren't allocated
//void ofPixels::allocate(int w, int h, ofImageType type)
_pixels.allocate(_vid_w, _vid_h, OF_IMAGE_COLOR);
//TODO: whichever one of these is first - it always runs twice ?
// _analysisVector.push_back(new ShadowScapesAnalysis(V));
// _analysisVector.push_back(new ShadowScapesAnalysis(H));
// _analysisVector.push_back(new ShadowScapesAnalysis(D));
_analysisVector.push_back(new ShadowScapesAnalysis(V));
_analysisVector.push_back(new ShadowScapesAnalysis(H));
_analysisVector.push_back(new ShadowScapesAnalysis(D));
_analysisVector.push_back(new RelaxRateAnalysis());
@@ -205,10 +209,11 @@ void RefractiveIndex::setup_camera()
{
stop_camera();
if(!_vidGrabber.initGrabber(_vid_w, _vid_h)) {
if(!_vidGrabber.initGrabber(_vid_w, _vid_h)) {
ofLog(OF_LOG_ERROR) << "RefractiveIndex::setup_camera - could not initialise grabber";
return;
}
_vidGrabber.listDevices();
_vidGrabber.setVerbose(true);
_vid_stream_open = true;
example/RefractiveIndex.h
-5
View File
@@ -1,8 +1,3 @@
/*
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ author: dviid
~ contact: dviid@labs.ciid.dk
*/
#pragma once
example/main.cpp
+2 -8
View File
@@ -4,21 +4,15 @@
#define SCREEN_WIDTH 800
#define SCREEN_HEIGHT 600
/////////////////////////dis is the new shit///////////
/////////////////////////dis is the new shit///////////
/////////////////////////dis is the new shit///////////
/////////////////////////dis is the new shit///////////
////also the new shit////
int main() {
ofAppGlutWindow window;
ofxXmlSettings XML;
XML.loadFile("../data/config.refindx");
bool fullscreen = (XML.getValue("config:display:fullscreen", "false") == "true" ? true : false);
bool fullscreen = (XML.getValue("config:display:fullscreen", "true") == "true" ? true : false);
int screen_w = XML.getValue("config:display:width", SCREEN_WIDTH);
int screen_h = XML.getValue("config:display:height", SCREEN_HEIGHT);