Image sequencing improvements and optimization of projection.

Projection now occurs only at specified timestamps.
Todo:
projection class now dependent on image sequences, will have
to change that once we read specific instrument schedule.
This commit is contained in:
Michal Marcinkowski
2015-01-21 11:28:38 -05:00
parent fa0f26c9da
commit a8e5b61272
11 changed files with 170 additions and 84 deletions
@@ -88,6 +88,7 @@ private:
glm::mat4 _projectorMatrix;
// spice
std::string _sequenceDir;
std::string _instrumentID;
std::string _projectorID;
std::string _projecteeID;
+6 -2
View File
@@ -69,7 +69,8 @@ public:
glm::dvec3 interpolate(glm::dvec3 p0, glm::dvec3 p1, float t);
glm::dvec3 bisection(glm::dvec3 p1, glm::dvec3 p2, double tolerance);
double distanceBetweenPoints(psc p1, psc p2);
void computeColors();
// instance variables
int _nrInserted = 0;
int _isteps;
@@ -114,7 +115,10 @@ public:
// time
double _time = 0;
double _oldTime = 0;
int _delta = 0;
// capturetime
double _timeInterval;
double _nextCaptureTime;
};
}
#endif
+12 -6
View File
@@ -45,14 +45,20 @@ public:
static void deinitialize();
bool sequenceReset();
public:
void createImage(double t1, double t2, std::string path = "dummypath");
bool getImagePath(double& _currentTime, std::string& path);
bool getImagePath(std::string _currentTime, std::string& path);
//double _previousTime; // not sure if i wanna use this yet.
bool getImagePath(double& _currentTime, std::string& path, bool closedInterval = false);
bool getImagePath(std::string _currentTime, std::string& path, bool closedInterval = false);
double getNextCaptureTime();
double getIntervalLength(){ return _intervalLength; };
static ImageSequencer* _sequencer;
private:
double nextCaptureTime(double _time);
void createImage(double t1, double t2, std::string path = "dummypath");
double _nextCapture;
double _intervalLength;
};
} // namespace openspace