In short, this is new:

- ImageSequencer class added, requires planetary data service files (not added to openspace-data, too large)
   : Given current time returns path to specific image in dataset for projection.
- Changes to RenderablePlanetProjection class to accomodate sequencing
- Fixed normal computation in reverse-mapping stage
- Rudimental target recognition (will prob. become part of separate class at some point - since both fov & proj classes do similar things)

Next up:
- Redo pluto mockup visualization & begin spreadsheet reader for instrument-switching.
This commit is contained in:
Michal Marcinkowski
2015-01-16 13:06:52 -05:00
parent 3c2110e7e3
commit fa0f26c9da
13 changed files with 98 additions and 65 deletions

View File

@@ -66,12 +66,11 @@ protected:
void loadProjectionTexture();
bool auxiliaryRendertarget();
glm::mat4 computeProjectorMatrix(const glm::vec3 loc, glm::dvec3 aim, const glm::vec3 up);
void attitudeParameters(double time);
private:
void imageProjectGPU();
ImageSequencer* _sequencer;
properties::StringProperty _colorTexturePath;
properties::StringProperty _projectionTexturePath;
properties::TriggerProperty _imageTrigger;
@@ -84,7 +83,7 @@ private:
planetgeometryprojection::PlanetGeometryProjection* _geometry;
glm::vec2 _camScaling;
glm::vec3 _lookUp;
glm::vec3 _up;
glm::mat4 _transform;
glm::mat4 _projectorMatrix;
@@ -102,7 +101,7 @@ private:
glm::dmat3 _instrumentMatrix;
glm::vec3 _boresight;
double _time;
double _time[2];
double lightTime;
std::string _target;