mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-06 11:39:49 -06:00
Fixing assets that had problems loading (#3528)
- Correctly remove interpolating render program to prevent invalid shader access - Fix Apollo 11 location - Fix Apollo 17 location - Replace errors with warnings for Gala and Rime instruments for Juice - Correctly rely on the solarsystembarycenter asset in the Voyager/Pioneer asset - Use correct identifier for the Jupiter barycenter - NASA Treks assets - Slidedeck - Fix unloading of missions - No longer crash when loading and unloading image sequence assets
This commit is contained in:
@@ -712,6 +712,8 @@ TemporalTileProvider::InterpolateTileProvider::~InterpolateTileProvider() {
|
||||
glDeleteFramebuffers(1, &fbo);
|
||||
glDeleteBuffers(1, &vboQuad);
|
||||
glDeleteVertexArrays(1, &vaoQuad);
|
||||
|
||||
global::renderEngine->removeRenderProgram(shaderProgram.get());
|
||||
}
|
||||
|
||||
Tile TemporalTileProvider::InterpolateTileProvider::tile(const TileIndex& tileIndex) {
|
||||
|
||||
@@ -369,9 +369,18 @@ void ImageSequencer::runSequenceParser(SequenceParser& parser) {
|
||||
// from 'predicted event file' (mission-playbook)
|
||||
for (const Image& i : source) {
|
||||
for (const Image& j : destination) {
|
||||
if (source.empty()) {
|
||||
break;
|
||||
}
|
||||
|
||||
const double diff = std::abs(i.timeRange.start - j.timeRange.start);
|
||||
if (diff < epsilon) {
|
||||
source.erase(source.begin() + 1);
|
||||
if (source.size() == 1) {
|
||||
source.erase(source.begin());
|
||||
}
|
||||
else {
|
||||
source.erase(source.begin() + 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user