From 2e7888f07132517d6a5c0143d864ab492f0aa7da Mon Sep 17 00:00:00 2001 From: Jamie Allen Date: Sun, 19 Feb 2012 12:55:51 +0100 Subject: [PATCH] test commit for re-newed jamie branch on sunday 19th of feb --- example/RefractiveIndex.cpp | 18 +++++++++--------- example/main.cpp | 8 ++++++++ src/RelaxRateAnalysis.cpp | 2 +- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/example/RefractiveIndex.cpp b/example/RefractiveIndex.cpp index 03e38f9..d831ee9 100644 --- a/example/RefractiveIndex.cpp +++ b/example/RefractiveIndex.cpp @@ -97,23 +97,23 @@ void RefractiveIndex::setup() //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()); + _analysisVector.push_back(new RelaxRateAnalysis()); - // _analysisVector.push_back(new IResponseAnalysis()); + _analysisVector.push_back(new IResponseAnalysis()); _analysisVector.push_back(new ShapeFromShadingAnalysis()); - // _analysisVector.push_back(new StrobeAnalysis()); + _analysisVector.push_back(new StrobeAnalysis()); - // _analysisVector.push_back(new CamNoiseAnalysis()); + _analysisVector.push_back(new CamNoiseAnalysis()); - // _analysisVector.push_back(new ColorSingleAnalysis()); + _analysisVector.push_back(new ColorSingleAnalysis()); - // _analysisVector.push_back(new ColorMultiAnalysis()); + _analysisVector.push_back(new ColorMultiAnalysis()); _analysisVector.push_back(new DiffNoiseAnalysis()); diff --git a/example/main.cpp b/example/main.cpp index cab31b6..cea5f27 100755 --- a/example/main.cpp +++ b/example/main.cpp @@ -4,6 +4,14 @@ #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/////////// + int main() { ofAppGlutWindow window; diff --git a/src/RelaxRateAnalysis.cpp b/src/RelaxRateAnalysis.cpp index bc210e8..b3ed89c 100755 --- a/src/RelaxRateAnalysis.cpp +++ b/src/RelaxRateAnalysis.cpp @@ -20,7 +20,7 @@ void RelaxRateAnalysis::setup(int camWidth, int camHeight) { DELTA_T_SAVE = 300; NUM_PHASE = 1; - NUM_RUN = 1; + NUM_RUN = 3; NUM_SAVE_PER_RUN = 100; create_dir();