make vector of meshes static since we only ever want to display one at a time

This commit is contained in:
Tom Schofield 2012-02-20 12:00:18 +00:00
parent 935d6414b5
commit bf8c630add
4 changed files with 9 additions and 3 deletions

View File

@ -34,6 +34,9 @@
#include "RefractiveIndex.h" #include "RefractiveIndex.h"
#include "ofxFileHelper.h" #include "ofxFileHelper.h"
vector<ofMesh> AbstractAnalysis::meshes;
// this is the main threaded loop for a given analysis // this is the main threaded loop for a given analysis
void AbstractAnalysis::do_synthesize() { void AbstractAnalysis::do_synthesize() {
_state = STATE_ACQUIRING; _state = STATE_ACQUIRING;

View File

@ -64,6 +64,9 @@ protected:
//EG FILENAME : DIFF_NOISE_7_85.7322.jpg RETURNS : 85.7322 //EG FILENAME : DIFF_NOISE_7_85.7322.jpg RETURNS : 85.7322
virtual int getRecordedValueFromFileName(string str); virtual int getRecordedValueFromFileName(string str);
static vector<ofMesh>meshes;
public: public:
string _name; string _name;
@ -84,7 +87,7 @@ protected:
//added Tom S 19/2/12 //added Tom S 19/2/12
//each mesh in the vector is a seperate 3D point cloud which is coloured with pixel data and shifted in the z plane according to the specified type of colour difference eg red value or hue //each mesh in the vector is a seperate 3D point cloud which is coloured with pixel data and shifted in the z plane according to the specified type of colour difference eg red value or hue
vector<ofMesh>meshes; //make this vector were static
//how fast to move from one mesh to the next //how fast to move from one mesh to the next
float speed; float speed;
//the index (inside the vector of meshes) of the current mesh being displayed //the index (inside the vector of meshes) of the current mesh being displayed

View File

@ -45,7 +45,7 @@ using Poco::Thread;
void ColorMultiAnalysis::setup(int camWidth, int camHeight) void ColorMultiAnalysis::setup(int camWidth, int camHeight)
{ {
DELTA_T_SAVE = 150; // the right number is about 300 DELTA_T_SAVE = 100;//150; // the right number is about 300
NUM_PHASE = 1; NUM_PHASE = 1;
NUM_RUN = 1; NUM_RUN = 1;
NUM_SAVE_PER_RUN = 100;//; NUM_SAVE_PER_RUN = 100;//;

View File

@ -18,7 +18,7 @@ using Poco::Thread;
void ColorSingleAnalysis::setup(int camWidth, int camHeight) void ColorSingleAnalysis::setup(int camWidth, int camHeight)
{ {
DELTA_T_SAVE = 300; DELTA_T_SAVE = 100;//300;
NUM_PHASE = 1; NUM_PHASE = 1;
NUM_RUN = 1; NUM_RUN = 1;
NUM_SAVE_PER_RUN = 100; NUM_SAVE_PER_RUN = 100;