Use place holders for projected images (UV coordinates still not working)

This commit is contained in:
Erik Broberg
2016-08-09 20:23:33 -04:00
parent a729e067ec
commit 72252d6a47
3 changed files with 6 additions and 13 deletions
+2 -2
View File
@@ -40,7 +40,7 @@ return {
},
DataInputTranslation = {
Instruments = {
POLY_CAM = {
ORX_OCAMS_POLYCAM = {
DetectorType = "Camera",
Spice = {"ORX_OCAMS_POLYCAM"},
Files = {
@@ -49,7 +49,7 @@ return {
"Recon_225m_Equatorial_PolyCam",
},
},
SPECTOMETER = {
ORX_REXIS = {
DetectorType = "Camera",
Spice = {"ORX_REXIS"},
Files = {
@@ -334,7 +334,8 @@ void RenderableModelProjection::attitudeParameters(double time) {
void RenderableModelProjection::project() {
for (auto img : _imageTimes) {
attitudeParameters(img.startTime);
imageProjectGPU(_projectionComponent.loadProjectionTexture(img.path));
auto projTexture = _projectionComponent.loadProjectionTexture(img.path, img.isPlaceholder);
imageProjectGPU(projTexture);
}
_capture = false;
}
@@ -63,8 +63,6 @@ InstrumentTimesParser::InstrumentTimesParser(
_detectorType = "CAMERA"; //default value
for (const auto& instrumentKey : instruments.keys()) {
ghoul::Dictionary instrumentDict;
@@ -103,10 +101,6 @@ bool InstrumentTimesParser::create() {
return false;
}
using Recursive = ghoul::filesystem::Directory::Recursive;
using Sort = ghoul::filesystem::Directory::Sort;
std::vector<std::string> sequencePaths = sequenceDir.read(Recursive::Yes, Sort::No);
for (auto it = _instrumentFiles.begin(); it != _instrumentFiles.end(); it++) {
std::string instrumentID = it->first;
for (std::string filename: it->second) {
@@ -133,7 +127,8 @@ bool InstrumentTimesParser::create() {
Image image;
image.startTime = timeRange._min;
image.stopTime = timeRange._max;
image.path = filepath;
image.path = "";
image.isPlaceholder = true;
image.activeInstruments.push_back(instrumentID);
image.target = _target;
image.projected = false;
@@ -145,9 +140,6 @@ bool InstrumentTimesParser::create() {
}
}
std::stable_sort(_captureProgression.begin(), _captureProgression.end());
//std::stable_sort(_instrumentTimes.begin(), _instrumentTimes.end());
std::stable_sort(_targetTimes.begin(), _targetTimes.end(), targetComparer);