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

Update Ghoul repository

Browse Source 
Adapt to changes in Ghoul
This commit is contained in:
Alexander Bock
2020-02-12 00:01:24 +01:00
parent fde307ead9
commit 81fda6c8db
16 changed files with 34 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
+4 -4
View File
@@ -483,16 +483,16 @@ void RenderablePlanetProjection::imageProjectGPU(
_fboProgramObject->setUniform(_fboUniformCache.boresight, _boresight);
if (_geometry->hasProperty("Radius")) {
ghoul::any r = _geometry->property("Radius")->get();
if (glm::vec3* radius = ghoul::any_cast<glm::vec3>(&r)){
std::any r = _geometry->property("Radius")->get();
if (glm::vec3* radius = std::any_cast<glm::vec3>(&r)){
_fboProgramObject->setUniform(_fboUniformCache.radius, radius);
}
} else {
LERROR("Geometry object needs to provide radius");
}
if (_geometry->hasProperty("Segments")) {
ghoul::any s = _geometry->property("Segments")->get();
if (int* segments = ghoul::any_cast<int>(&s)) {
std::any s = _geometry->property("Segments")->get();
if (int* segments = std::any_cast<int>(&s)) {
_fboProgramObject->setUniform(_fboUniformCache.segments, segments[0]);
}
}else{