mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-22 19:29:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup in projection classes

Browse Source
This commit is contained in:
Alexander Bock
2016-05-08 16:20:51 +02:00
parent bee9309f98
commit 02674cb1c5
3 changed files with 48 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/newhorizons/rendering/renderablemodelprojection.cpp
+12 -4
View File
@@ -301,8 +301,11 @@ bool RenderableModelProjection::deinitialize() {
}
void RenderableModelProjection::render(const RenderData& data) {
if (!_programObject) return;
if (!_textureProj) return;
if (!_programObject)
return;
if (!_textureProj)
return;
_programObject->activate();
_frameCount++;
@@ -413,8 +416,13 @@ void RenderableModelProjection::imageProjectGPU() {
}
void RenderableModelProjection::attitudeParameters(double time) {
_stateMatrix = SpiceManager::ref().positionTransformMatrix(_source, _destination, time);
_instrumentMatrix = SpiceManager::ref().positionTransformMatrix(_instrumentID, _destination, time);
try {
_stateMatrix = SpiceManager::ref().positionTransformMatrix(_source, _destination, time);
_instrumentMatrix = SpiceManager::ref().positionTransformMatrix(_instrumentID, _destination, time);
}
catch (const SpiceManager::SpiceException& e) {
return;
}
_transform = glm::mat4(1);