safety commit - still working on colorsingle

example/RefractiveIndex.cpp

@@ -228,22 +228,29 @@ void RefractiveIndex::draw()
         if(_currentAnalysis->meshIsComplete){
             
             fbo.begin();
-            glShadeModel(GL_SMOOTH); 
+            ofEnableSmoothing();
-            glEnable(GL_NORMALIZE);  
+            //glShadeModel(GL_SMOOTH); 
+            //glFogf(GL_FOG_END, -200);
+
+            //glHint(GL_NICEST, GL_DONT_CARE);         
+            
+            //glEnable(GL_NORMALIZE);  
             //glEnable(GL_DEPTH_TEST);
-            //light.enable();  
             //ofEnableSeparateSpecularLight(); 
             
-            ofEnableSmoothing(); 
+            //ofEnableLighting();  
+            //light.setPosition(ofVec3f(fbo.getWidth()/2, fbo.getHeight()/2,_currentAnalysis->_mesh_size_multiplier *500));  
+            //lightStatic.setPosition(ofVec3f(20,50,100));  
+            //ofEnableSeparateSpecularLight();  
+            //ofGetLightingEnabled(); 
             
             //ofSetLineWidth(1.0f);
             //glPointSize(5.0f);
        
-            //glHint(GL_NICEST);
+            //ofEnableBlendMode ( OF_BLENDMODE_ADD );
-            ofEnableBlendMode ( OF_BLENDMODE_ADD );
             //ofEnableBlendMode ( OF_BLENDMODE_MULTIPLY );
             //ofEnableBlendMode ( OF_BLENDMODE_SUBTRACT );
-            //ofEnableBlendMode ( OF_BLENDMODE_ALPHA );
+            ofEnableBlendMode ( OF_BLENDMODE_ALPHA );
             //ofEnableBlendMode ( OF_BLENDMODE_SCREEN );
             
             ofClear(0,0,0);

example/RefractiveIndex.h

@@ -77,4 +77,5 @@ public:
     ofPixels    keepOnScreen;
     ofFbo fbo;
     ofLight light;
+    ofLight lightStatic; 
 };

src/ColorSingleAnalysis.cpp

@@ -1,9 +1,11 @@
 #include "ColorSingleAnalysis.h"
 #include "ofMain.h"
-
 #include "Poco/Timer.h"
 #include "Poco/Thread.h"
 
+#include <string>
+#include <iostream>
+
 #include "RefractiveIndex.h"
 
 using Poco::Timer;
@@ -32,12 +34,6 @@ void ColorSingleAnalysis::setup(int camWidth, int camHeight)
     cout << "ACQUIRE_TIME ColorSingleAnalysis " << acq_run_time << endl;
 
     
-    //flag for main sketch
-    meshIsComplete=false;
-    _gotFirstImage=false;
-    
-    _mesh_size_multiplier=3;
-    
     //int acq_run_time = 25;   // 20 seconds of acquiring per run
     
     DELTA_T_SAVE = 1*(10*acq_run_time/2); // for 20 seconds, we want this to be around 200 files
@@ -60,6 +56,7 @@ void ColorSingleAnalysis::setup(int camWidth, int camHeight)
     b = 0;
     
     fileNameTag = "";
+    fileNameColor = "";
     
     _show_image = false;
     _image_shown = false;
@@ -164,11 +161,30 @@ void ColorSingleAnalysis::synthesise()
                 
                 ///////////////////////// PROCESS THE SAVED CAMERA IMAGES OF SHIT TO THE IMAGES //////////////////////////
                 
+                if(_saved_filenames_analysis[i].find("RED")>0)
+                {
+                    fileNameColor = "RED";
+                    cout<<"FOUND RED"<<endl;
+                }
+                   
+                if(_saved_filenames_analysis[i].find("BLUE")>0)
+                {
+                    fileNameColor = "BLUE";
+                    cout<<"FOUND BLUE"<<endl;
+                }
+            
+                if(_saved_filenames_analysis[i].find("GREEN")>0)
+                {
+                    fileNameColor = "GREEN";
+                    cout<<"FOUND GREEN"<<endl;
+                }
+            
                 cvColorImage1.setFromPixels(image1.getPixels(), image1.width, image1.height);
                 //cvColorImage2.setFromPixels(image5.getPixels(), image5.width, image5.height);
                 
-                //cvColorImage1.blur(1);
+                cvColorImage1.blur(1);
-                //cvColorImage1.erode();
+                cvColorImage1.erode();
+                cvColorImage1.erode();
             
                 //cvColorImage1.dilate();
                 //cvColorImage1.dilate();
@@ -178,8 +194,8 @@ void ColorSingleAnalysis::synthesise()
                 //cvFloatImage1 = cvColorImage1;
                 //cvGrayImage1 = cvColorImage1;
             
-                cvXorS( cvColorImage1.getCvImage(), cvScalarAll(255), cvColorImage1.getCvImage(), 0 );
+                //cvXorS( cvColorImage1.getCvImage(), cvScalarAll(255), cvColorImage1.getCvImage(), 0 );
-                //cvSmooth( cvGrayImage1.getCvImage(), cvGrayImage1.getCvImage(), CV_GAUSSIAN, 3, 3 );
+                cvSmooth( cvGrayImage1.getCvImage(), cvGrayImage1.getCvImage(), CV_GAUSSIAN, 3, 3 );
                 //cvCanny(cvGrayImage1.getCvImage(), cvGrayImage1.getCvImage(), 100, 100, 3);
                 //cvLaplace(cvGrayImage1.getCvImage(), cvGrayImage1.getCvImage(), 0);
             
@@ -484,11 +500,22 @@ void ColorSingleAnalysis::setMeshFromPixels(vector<float> sPixels, ofImage curre
     
     //get rid of all previous vectors and colours
     mesh.clear();
-    mesh.setMode(OF_PRIMITIVE_TRIANGLES);
+    mesh.setMode(OF_PRIMITIVE_POINTS);
+    
+    /*
+     OF_PRIMITIVE_TRIANGLES,9
+     OF_PRIMITIVE_TRIANGLE_STRIP,
+     OF_PRIMITIVE_TRIANGLE_FAN,
+     OF_PRIMITIVE_LINES,
+     OF_PRIMITIVE_LINE_STRIP,
+     OF_PRIMITIVE_LINE_LOOP,
+     OF_PRIMITIVE_POINTS
+     
+     */
     
     ofColor meshColour=ofColor(255,0,0);
     
-    int chooseColour=1  ;
+    int chooseColour=2  ;
     
     //the average z position of the matrix - used later to centre the mesh on the z axis when drawing
     float zPlaneAverage=0;
@@ -537,6 +564,90 @@ void ColorSingleAnalysis::setMeshFromPixels(vector<float> sPixels, ofImage curre
             }
         }
     }
+    
+    if(chooseColour==2){
+                
+        for(int i=0;i<sPixels.size();i++){
+            ofColor currentSecondImageColor = currentSecondImage.getColor(x, y+1);
+            
+            mesh.addColor(  currentSecondImageColor.getBrightness());
+            mesh.addVertex(ofVec3f(_mesh_size_multiplier*x,_mesh_size_multiplier*(y+1),- sPixels[ (currentSecondImage.getWidth()*(y+1))+x    ]   ));
+             
+            currentSecondImageColor = currentSecondImage.getColor(x, y);
+            mesh.addColor(  currentSecondImageColor.getBrightness());
+            mesh.addVertex(ofVec3f(_mesh_size_multiplier*x,_mesh_size_multiplier*y,- sPixels[(currentSecondImage.getWidth()*(y))+x ]  ));
+            
+            currentSecondImageColor = currentSecondImage.getColor(x+1, y+1);
+            mesh.addColor(  currentSecondImageColor.getBrightness());
+            mesh.addVertex(ofVec3f(_mesh_size_multiplier*(x+1),_mesh_size_multiplier*(y+1),- sPixels[(currentSecondImage.getWidth()*(y+1))+x+1 ]  ));
+      
+            currentSecondImageColor =  currentSecondImage.getColor(x+1, y+1);
+            mesh.addColor(  currentSecondImageColor.getBrightness());
+            mesh.addVertex(ofVec3f(_mesh_size_multiplier*(x+1),_mesh_size_multiplier*(y+1),- sPixels[(currentSecondImage.getWidth()*(y+1))+x+1]   ));
+            
+            currentSecondImageColor =  currentSecondImage.getColor(x, y);
+            mesh.addColor(  currentSecondImageColor.getBrightness());
+            mesh.addVertex(ofVec3f(_mesh_size_multiplier*x,_mesh_size_multiplier*y,- sPixels[(currentSecondImage.getWidth()*(y))+x ]  ));
+            
+            currentSecondImageColor =  currentSecondImage.getColor(x+1, y);
+            mesh.addColor(  currentSecondImageColor.getBrightness());
+            mesh.addVertex(ofVec3f(_mesh_size_multiplier*(x+1),_mesh_size_multiplier*y,- sPixels[(currentSecondImage.getWidth()*(y))+x +1 ]));
+            
+            x++;
+            if(x>=currentSecondImage.getWidth()-1){
+                x=0;
+                y++;
+                //something is going badly wrong with my maths for me to need this HELP TODO fix this - why am I running over the end of the vector?
+                if(y>=currentSecondImage.getHeight()-1){
+                    break;
+                }
+            }
+        }
+    }
+    
+    if(chooseColour==3){
+        
+        ofColor currentSecondImageColor;
+        
+        if (fileNameColor=="RED")
+        {
+            currentSecondImageColor.r=255;
+            currentSecondImageColor.g=0;
+            currentSecondImageColor.b=0;
+        }
+            
+        for(int i=0;i<sPixels.size();i++){
+                       
+            mesh.addColor(  currentSecondImageColor);
+            mesh.addVertex(ofVec3f(_mesh_size_multiplier*x,_mesh_size_multiplier*(y+1),- sPixels[ (currentSecondImage.getWidth()*(y+1))+x    ]   ));
+            
+            mesh.addColor(  currentSecondImageColor);
+            mesh.addVertex(ofVec3f(_mesh_size_multiplier*x,_mesh_size_multiplier*y,- sPixels[(currentSecondImage.getWidth()*(y))+x ]  ));
+            
+            mesh.addColor(  currentSecondImageColor);
+            mesh.addVertex(ofVec3f(_mesh_size_multiplier*(x+1),_mesh_size_multiplier*(y+1),- sPixels[(currentSecondImage.getWidth()*(y+1))+x+1 ]  ));
+           
+            mesh.addColor(  currentSecondImageColor);
+            mesh.addVertex(ofVec3f(_mesh_size_multiplier*(x+1),_mesh_size_multiplier*(y+1),- sPixels[(currentSecondImage.getWidth()*(y+1))+x+1]   ));
+            
+            mesh.addColor( currentSecondImageColor);
+            mesh.addVertex(ofVec3f(_mesh_size_multiplier*x,_mesh_size_multiplier*y,- sPixels[(currentSecondImage.getWidth()*(y))+x ]  ));
+            
+            mesh.addColor(  currentSecondImageColor);
+            mesh.addVertex(ofVec3f(_mesh_size_multiplier*(x+1),_mesh_size_multiplier*y,- sPixels[(currentSecondImage.getWidth()*(y))+x +1 ]));
+            
+            x++;
+            if(x>=currentSecondImage.getWidth()-1){
+                x=0;
+                y++;
+                //something is going badly wrong with my maths for me to need this HELP TODO fix this - why am I running over the end of the vector?
+                if(y>=currentSecondImage.getHeight()-1){
+                    break;
+                }
+            }
+        }
+    }
+}
 }
 
 
@@ -572,12 +683,15 @@ vector<float> ColorSingleAnalysis::_returnDepthsAtEachPixel(ofImage &image1, ofI
             ofColor imageColor1 = imagePixels1.getColor(x, y);
             //ofColor colourImage2 = imagePixels2.getColor(x, y);
             
-            //float _distanceToCentre=ofDist(imagePixels1.getWidth()/2, imagePixels1.getHeight()/2, x, y);
+            float _distanceToCentre=ofDist(imagePixels1.getWidth()/2, imagePixels1.getHeight()/2, x, y);
-            //float _presumedBrightness=ofMap(sqrt(_maxPossibleDistanceToCentre)-sqrt(_distanceToCentre), 0,  sqrt(_maxPossibleDistanceToCentre), 0, 255);
+            float _presumedBrightness=ofMap(sqrt(_maxPossibleDistanceToCentre)-sqrt(_distanceToCentre), 0,  sqrt(_maxPossibleDistanceToCentre), 0, 255);
-            //float _presumedBrightness=255;
             
             //int thisDiff=abs(imageColor1.getHue());
-            int thisDiff=abs(imageColor1.getBrightness());
+            //int thisDiff=abs(imageColor1.getBrightness());
+            //int thisDiff=abs(imageColor1.getBrightness()-_presumedBrightness);
+            
+            //int thisDiff=abs(imageColor1.getHue());
+            int thisDiff=abs(imageColor1.getLightness());
             
             //cout<<thisDiff<< " thisDiff "<<endl;
             
@@ -585,7 +699,7 @@ vector<float> ColorSingleAnalysis::_returnDepthsAtEachPixel(ofImage &image1, ofI
             //green hue: 120 
             //blue hue: 240
             
-            float multiplier=2.0;
+            float multiplier=1.0;
             
             differences.push_back(multiplier* thisDiff);
             
@@ -604,4 +718,3 @@ vector<float> ColorSingleAnalysis::_returnDepthsAtEachPixel(ofImage &image1, ofI
     //difference.setFromPixels(thesePixels,imagePixels1.getWidth(),imagePixels1.getHeight(), 3);
     return differences;
 }
-

src/ColorSingleAnalysis.h

@@ -32,6 +32,7 @@ protected:
 
     bool    _RUN_DONE;
     string  fileNameTag;
+    string  fileNameColor;
     float   r,g,b;
     
     int     _run_cnt, _save_cnt, _fade_cnt, _synth_save_cnt, _anim_cnt;