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

Remove screenspacerenderables and iSWACygnets

Browse Source
This commit is contained in:
Sebastian Piwell
2016-04-04 15:30:54 -04:00
parent 7eb312d10b 3fbfb9bb33
commit 8e996f5bab
16 changed files with 80 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/query/query.cpp
+6 -9
View File
@@ -72,15 +72,7 @@ properties::Property* property(const std::string& uri) {
const std::string nameUri = uri.substr(0, nameSeparator);
const std::string remainingUri = uri.substr(nameSeparator + 1);
SceneGraphNode* node = sceneGraphNode("iSWA");
if(node){
std::shared_ptr<ISWACygnet> cygnet = static_cast <ISWAContainer*>(node->renderable())->iSWACygnet(nameUri);
if(cygnet){
return cygnet->property(remainingUri);
}
}
node = sceneGraphNode(nameUri);
SceneGraphNode* node = sceneGraphNode(nameUri);
if (node) {
properties::Property* property = node->property(remainingUri);
return property;
@@ -91,6 +83,11 @@ properties::Property* property(const std::string& uri) {
properties::Property* property = ssr->property(remainingUri);
return property;
}
std::shared_ptr<ISWACygnet> cygnet = ISWAManager::ref().iSWACygnet(nameUri);
if(cygnet){
return cygnet->property(remainingUri);
}
LERROR("Node, iSWACygnet or ScreenSpaceRenderable' " << nameUri << "' did not exist");
return nullptr;