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

Address clang tidy complaints

Browse Source 
Update Ghoul repository
Update SGCT repository
This commit is contained in:
Alexander Bock
2018-11-30 15:34:09 -05:00
parent 752750bee8
commit c7a96a6b59
121 changed files with 626 additions and 670 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
+5 -3
View File
@@ -466,7 +466,7 @@ bool RenderablePlanetProjection::isReady() const {
}
void RenderablePlanetProjection::imageProjectGPU(
std::shared_ptr<ghoul::opengl::Texture> projectionTexture)
const ghoul::opengl::Texture& projectionTexture)
{
_projectionComponent.imageProjectBegin();
@@ -474,7 +474,7 @@ void RenderablePlanetProjection::imageProjectGPU(
ghoul::opengl::TextureUnit unitFbo;
unitFbo.activate();
projectionTexture->bind();
projectionTexture.bind();
_fboProgramObject->setUniform(_fboUniformCache.projectionTexture, unitFbo);
_fboProgramObject->setUniform(_fboUniformCache.projectorMatrix, _projectorMatrix);
@@ -596,7 +596,9 @@ void RenderablePlanetProjection::render(const RenderData& data, RendererTasks&)
break;
}
RenderablePlanetProjection::attitudeParameters(img.timeRange.start);
imageProjectGPU(_projectionComponent.loadProjectionTexture(img.path));
std::shared_ptr<ghoul::opengl::Texture> t =
_projectionComponent.loadProjectionTexture(img.path);
imageProjectGPU(*t);
++nPerformedProjections;
}
_imageTimes.erase(