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

Merge with latest master

Browse Source
This commit is contained in:
GPayne
2020-02-19 09:25:33 -07:00
parent 79a3b42d06
commit addfa65fa6
230 changed files with 1151 additions and 2270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
View File

@@ -487,7 +487,8 @@ void RenderablePlanetProjection::imageProjectGPU(
if (glm::vec3* radius = std::any_cast<glm::vec3>(&r)){
_fboProgramObject->setUniform(_fboUniformCache.radius, radius);
}
} else {
}
else {
LERROR("Geometry object needs to provide radius");
}
if (_geometry->hasProperty("Segments")) {
@@ -495,7 +496,8 @@ void RenderablePlanetProjection::imageProjectGPU(
if (int* segments = std::any_cast<int>(&s)) {
_fboProgramObject->setUniform(_fboUniformCache.segments, segments[0]);
}
}else{
}
else{
LERROR("Geometry object needs to provide segment count");
}