mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-23 12:39:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merged.

Browse Source
This commit is contained in:
Jonathas Costa
2018-03-16 15:17:13 -04:00
parent 39855e1512 5774c328de
commit 721bdfa752
239 changed files with 2935 additions and 1734 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
+8 -9
View File
@@ -200,19 +200,18 @@ RenderablePlanetProjection::RenderablePlanetProjection(const ghoul::Dictionary&
"RenderablePlanetProjection"
);
std::string name;
bool success = dict.getValue(SceneGraphNode::KeyName, name);
ghoul_assert(success, "");
ghoul::Dictionary geometryDictionary;
success = dict.getValue(KeyGeometry, geometryDictionary);
bool success = dict.getValue(KeyGeometry, geometryDictionary);
if (success) {
geometryDictionary.setValue(SceneGraphNode::KeyName, name);
using planetgeometry::PlanetGeometry;
_geometry = PlanetGeometry::createFromDictionary(geometryDictionary);
_geometry = planetgeometry::PlanetGeometry::createFromDictionary(
geometryDictionary
);
}
_projectionComponent.initialize(dict.value<ghoul::Dictionary>(KeyProjection));
_projectionComponent.initialize(
identifier(),
dict.value<ghoul::Dictionary>(KeyProjection)
);
_colorTexturePaths.addOption(0, NoImageText);
_colorTexturePaths.onChange([this](){