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

Name changes

Browse Source
This commit is contained in:
Sebastian Piwell
2016-05-09 13:09:47 -04:00
parent 819b227976
commit 39ff2415bb
27 changed files with 153 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/query/query.cpp
View File

@@ -30,9 +30,11 @@
#include <openspace/rendering/renderable.h>
#include <openspace/scene/scene.h>
#include <openspace/scene/scenegraphnode.h>
#include <modules/iswa/rendering/iswacygnet.h>
#include <openspace/rendering/screenspacerenderable.h>
#include <modules/iswa/rendering/iswagroup.h>
#include <openspace/rendering/screenspacerenderable.h>
#include <modules/iswa/util/iswamanager.h>
#include <modules/iswa/rendering/iswacygnet.h>
namespace openspace {
@@ -82,13 +84,13 @@ properties::Property* property(const std::string& uri) {
properties::Property* property = ssr->property(remainingUri);
return property;
}
std::shared_ptr<ISWAGroup> group = ISWAManager::ref().iSWAGroup(nameUri);
#ifdef OPENSPACE_MODULE_ISWA_ENABLED
std::shared_ptr<IswaGroup> group = IswaManager::ref().iswaGroup(nameUri);
if(group){
properties::Property* property = group->property(remainingUri);
return property;
}
#endif
LERROR("Node or ScreenSpaceRenderable' " << nameUri << "' did not exist");
return nullptr;
}