mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-25 21:48:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into MultiModelFormatReader

Browse Source
This commit is contained in:
Jonathas Costa
2016-03-16 10:44:07 -04:00
parent 182e332661 c3aa8fecc2
commit b09026ee42
13 changed files with 34 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/newhorizons/rendering/renderableplanetprojection.cpp
+4 -4
View File
@@ -369,16 +369,16 @@ void RenderablePlanetProjection::imageProjectGPU(){
_fboProgramObject->setUniform("boresight" , _boresight);
if (_geometry->hasProperty("radius")){
boost::any r = _geometry->property("radius")->get();
if (glm::vec4* radius = boost::any_cast<glm::vec4>(&r)){
ghoul::any r = _geometry->property("radius")->get();
if (glm::vec4* radius = ghoul::any_cast<glm::vec4>(&r)){
_fboProgramObject->setUniform("radius", radius);
}
}else{
LERROR("Geometry object needs to provide radius");
}
if (_geometry->hasProperty("segments")){
boost::any s = _geometry->property("segments")->get();
if (int* segments = boost::any_cast<int>(&s)){
ghoul::any s = _geometry->property("segments")->get();
if (int* segments = ghoul::any_cast<int>(&s)){
_fboProgramObject->setAttribute("segments", segments[0]);
}
}else{
modules/newhorizons/util/imagesequencer.cpp
-1
View File
@@ -30,7 +30,6 @@
#include <openspace/util/time.h>
#include <ghoul/filesystem/cachemanager.h>
#include <modules/newhorizons/util/decoder.h>
#include <boost/algorithm/string.hpp>
#include <openspace/util/spicemanager.h>
#include <fstream>