mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-21 12:29:04 -06:00
Code Issues Packages Projects Releases Wiki Activity

Works even if no iSWA module is created

Browse Source
This commit is contained in:
Sebastian Piwell
2016-04-05 16:38:30 -04:00
parent 48ccd6d389
commit 7a0d880299
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/scene/default.scene
View File

@@ -28,7 +28,7 @@ return {
--"gridGalactic",
--"gridEcliptic",
--"gridEquatorial",
--"iswa",
"iswa",
}
}

12
modules/onscreengui/src/gui.cpp
View File

@@ -428,12 +428,14 @@ void GUI::renderMainWindow() {
}
#ifdef OPENSPACE_MODULE_ISWA_ENABLED
static const int addCygnetBufferSize = 256;
static char addCygnetBuffer[addCygnetBufferSize];
ImGui::InputText("addCynget", addCygnetBuffer, addCygnetBufferSize);
if(ISWAManager::isInitialized()){
static const int addCygnetBufferSize = 256;
static char addCygnetBuffer[addCygnetBufferSize];
ImGui::InputText("addCynget", addCygnetBuffer, addCygnetBufferSize);
if(ImGui::SmallButton("Add Cygnet")){
ISWAManager::ref().addCygnet(std::string(addCygnetBuffer));
if(ImGui::SmallButton("Add Cygnet")){
ISWAManager::ref().addCygnet(std::string(addCygnetBuffer));
}
}
#endif

8
src/query/query.cpp
View File

@@ -85,9 +85,11 @@ properties::Property* property(const std::string& uri) {
}
#ifdef OPENSPACE_MODULE_ISWA_ENABLED
std::shared_ptr<ISWACygnet> cygnet = ISWAManager::ref().iSWACygnet(nameUri);
if(cygnet){
return cygnet->property(remainingUri);
if(ISWAManager::isInitialized()){
std::shared_ptr<ISWACygnet> cygnet = ISWAManager::ref().iSWACygnet(nameUri);
if(cygnet){
return cygnet->property(remainingUri);
}
}
#endif