From 9a6c1c6a55982f6929c7276f3111bca2e8dd9f2c Mon Sep 17 00:00:00 2001
From: Jamie Allen <jamie@heavyside.net>
Date: Fri, 11 May 2012 23:37:50 +0200
Subject: [PATCH] safety commit prior to leaving for manchester

---
 src/ColorSingleAnalysis.cpp | 10 +++++-----
 src/IResponseAnalysis.cpp   |  4 ++--
 src/StrobeAnalysis.cpp      |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/ColorSingleAnalysis.cpp b/src/ColorSingleAnalysis.cpp
index 568c92d..66d6334 100755
--- a/src/ColorSingleAnalysis.cpp
+++ b/src/ColorSingleAnalysis.cpp
@@ -27,7 +27,7 @@ void ColorSingleAnalysis::setup(int camWidth, int camHeight)
     meshIsComplete=false;
     _gotFirstImage=false;
     _mesh_size_multiplier=8;
-    vertexSubsampling = 1;
+    vertexSubsampling = 2;
     chooseColour=1;
     
     int acq_run_time;   // 10 seconds of acquiring per run
@@ -325,7 +325,7 @@ void ColorSingleAnalysis::draw()
     glEnable(GL_DEPTH_TEST);
     
     ofSetLineWidth(1.0f);
-    // glPointSize(4.0f);
+    glPointSize(1.0f);
     
     ofEnableBlendMode ( OF_BLENDMODE_ADD );
     //ofEnableBlendMode ( OF_BLENDMODE_MULTIPLY );
@@ -542,10 +542,10 @@ void ColorSingleAnalysis::setMeshFromPixels(vector<float> sPixels, ofImage curre
     //mesh.setMode(OF_PRIMITIVE_TRIANGLES);
     //mesh.setMode(OF_PRIMITIVE_TRIANGLE_STRIP);
     //mesh.setMode(OF_PRIMITIVE_TRIANGLE_FAN);
-    mesh.setMode(OF_PRIMITIVE_LINES);
+    //mesh.setMode(OF_PRIMITIVE_LINES);
     //mesh.setMode(OF_PRIMITIVE_LINE_STRIP);
     //mesh.setMode(OF_PRIMITIVE_LINE_LOOP);
-    //mesh.setMode(OF_PRIMITIVE_POINTS);
+    mesh.setMode(OF_PRIMITIVE_POINTS);
   
     /*
      OF_PRIMITIVE_TRIANGLES,
@@ -558,7 +558,7 @@ void ColorSingleAnalysis::setMeshFromPixels(vector<float> sPixels, ofImage curre
      
      */
     
-    ofColor meshColour=ofColor(255,255,255);
+    ofColor meshColour=ofColor(255,255,255, 255);
     
       //the average z position of the matrix - used later to centre the mesh on the z axis when drawing
     float zPlaneAverage=0;
diff --git a/src/IResponseAnalysis.cpp b/src/IResponseAnalysis.cpp
index cf90d6e..a697f70 100755
--- a/src/IResponseAnalysis.cpp
+++ b/src/IResponseAnalysis.cpp
@@ -35,7 +35,7 @@ void IResponseAnalysis::setup(int camWidth, int camHeight)
     meshIsComplete=false;
     _gotFirstImage=false;
     
-    _mesh_size_multiplier=4;
+    _mesh_size_multiplier=8;
     
     //int acq_run_time = 20;   // 20 seconds of acquiring per run
     
@@ -517,7 +517,7 @@ vector<float> IResponseAnalysis::_returnDepthsAtEachPixel(ofImage &image1, ofIma
             int thisDiff=abs(imageColor1.getBrightness()-_presumedBrightness);
 
             //cout<<thisDiff<< " thisDiff "<<endl;
-            float multiplier=2.0;
+            float multiplier=4.0;
             
             differences.push_back(multiplier * thisDiff);
             
diff --git a/src/StrobeAnalysis.cpp b/src/StrobeAnalysis.cpp
index 49e9bda..b16cedb 100755
--- a/src/StrobeAnalysis.cpp
+++ b/src/StrobeAnalysis.cpp
@@ -27,7 +27,7 @@ void StrobeAnalysis::setup(int camWidth, int camHeight)
     _mesh_size_multiplier   = 8;
     vertexSubsampling       = 3;
     chooseColour            = 2;
-    multiplier              = 2.0;
+    multiplier              = 4.0;
     
     //blendMode = OF_BLENDMODE_ADD;
     //blendMode = OF_BLENDMODE_MULTIPLY;