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

Feature/cmake cleanup (#381)

Browse Source 
* Rename OnScreenGui module to ImGui
* Support multiple external module folders (closes #31)
* Cleaning up CMake files
  * Restructure application specification
  * Add parameter for library mode to all modules
  * Add functions to handle global variable state
* Misc/remove warnings (#383)
* Increase build timeout and do a clean rebuild every commit
This commit is contained in:
Alexander Bock
2017-08-14 09:38:32 -04:00
committed by GitHub
parent 0b063827b8
commit c275b2f833
321 changed files with 2201 additions and 1892 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/scene/scenegraphnode.cpp
+5 -6
View File
@@ -102,8 +102,9 @@ std::unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(const ghoul
if (dictionary.hasKey(keyTransformTranslation)) {
ghoul::Dictionary translationDictionary;
dictionary.getValue(keyTransformTranslation, translationDictionary);
result->_transform.translation =
std::unique_ptr<Translation>(Translation::createFromDictionary(translationDictionary));
result->_transform.translation = Translation::createFromDictionary(
translationDictionary
);
if (result->_transform.translation == nullptr) {
LERROR("Failed to create ephemeris for SceneGraphNode '"
<< result->name() << "'");
@@ -116,8 +117,7 @@ std::unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(const ghoul
if (dictionary.hasKey(keyTransformRotation)) {
ghoul::Dictionary rotationDictionary;
dictionary.getValue(keyTransformRotation, rotationDictionary);
result->_transform.rotation =
std::unique_ptr<Rotation>(Rotation::createFromDictionary(rotationDictionary));
result->_transform.rotation = Rotation::createFromDictionary(rotationDictionary);
if (result->_transform.rotation == nullptr) {
LERROR("Failed to create rotation for SceneGraphNode '"
<< result->name() << "'");
@@ -130,8 +130,7 @@ std::unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(const ghoul
if (dictionary.hasKey(keyTransformScale)) {
ghoul::Dictionary scaleDictionary;
dictionary.getValue(keyTransformScale, scaleDictionary);
result->_transform.scale =
std::unique_ptr<Scale>(Scale::createFromDictionary(scaleDictionary));
result->_transform.scale = Scale::createFromDictionary(scaleDictionary);
if (result->_transform.scale == nullptr) {
LERROR("Failed to create scale for SceneGraphNode '"
<< result->name() << "'");