From 35aa74f743008d188e516e98a500d2886d28d661 Mon Sep 17 00:00:00 2001
From: Jamie Allen <jamie@heavyside.net>
Date: Fri, 11 May 2012 20:25:57 +0200
Subject: [PATCH] further commit with correct orientation / placement of the
 images for FCP

---
 example/RefractiveIndex.cpp  | 2 +-
 src/RelaxRateAnalysis.cpp    | 4 ++--
 src/ShadowScapesAnalysis.cpp | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/example/RefractiveIndex.cpp b/example/RefractiveIndex.cpp
index 7afb8c2..da271df 100644
--- a/example/RefractiveIndex.cpp
+++ b/example/RefractiveIndex.cpp
@@ -155,7 +155,7 @@ void RefractiveIndex::start_analysis()
 
     //    fbo.allocate( _currentAnalysis->_mesh_size_multiplier *_vid_w,_currentAnalysis->_mesh_size_multiplier * _vid_h);
     //camera.setPosition((fbo.getWidth()/2), fbo.getHeight()/2,_currentAnalysis->_mesh_size_multiplier *500);
-    camera.setPosition(0, (fbo.getHeight()/2)+250,  _currentAnalysis->_mesh_size_multiplier*500);
+    camera.setPosition(0, (fbo.getHeight()/2)+150,  _currentAnalysis->_mesh_size_multiplier*500);
     camera.setFov(65.0);
     camera.setOrientation(ofVec3f(-2,0,0));
     _meshRotation=0;
diff --git a/src/RelaxRateAnalysis.cpp b/src/RelaxRateAnalysis.cpp
index 7b32d63..edf9787 100755
--- a/src/RelaxRateAnalysis.cpp
+++ b/src/RelaxRateAnalysis.cpp
@@ -28,9 +28,9 @@ void RelaxRateAnalysis::setup(int camWidth, int camHeight)
     _gotFirstImage=false;
     _mesh_size_multiplier   = 8;
     vertexSubsampling_x       = 1; //must be at least '1'
-    vertexSubsampling_y       = 7; //must be at least '1'
+    vertexSubsampling_y       = 5; //must be at least '1'
     chooseColour            = 2;
-    multiplier              = 3.0;
+    multiplier              = 4.0;
     
     //blendMode = OF_BLENDMODE_ADD;
     //blendMode = OF_BLENDMODE_MULTIPLY;
diff --git a/src/ShadowScapesAnalysis.cpp b/src/ShadowScapesAnalysis.cpp
index 34e4b30..a921e76 100755
--- a/src/ShadowScapesAnalysis.cpp
+++ b/src/ShadowScapesAnalysis.cpp
@@ -28,13 +28,14 @@ void ShadowScapesAnalysis::setup(int camWidth, int camHeight)
     //flag for main sketch
     meshIsComplete=false;
     _gotFirstImage=false;
-    _mesh_size_multiplier   = 15;
+    _mesh_size_multiplier   = 8;
     vertexSubsampling       = 1;
     chooseColour            = 5;
     multiplier              = 4.0;
     
     ofSetLineWidth(5.0f);
     glPointSize(5.0f);
+    glEnable(GL_DEPTH_TEST);
     
     //blendMode = OF_BLENDMODE_ADD;
     //blendMode = OF_BLENDMODE_MULTIPLY;