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

Merge with develop

Browse Source
This commit is contained in:
Sebastian Piwell
2016-06-13 13:30:26 -04:00
parent 3e034b73bb 73ceaafd13
commit 65bacf3119
118 changed files with 4496 additions and 2092 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/onscreengui/src/guiiswacomponent.cpp
+5 -1
View File
@@ -116,6 +116,7 @@ void GuiIswaComponent::render() {
}
}
#ifdef OPENSPACE_MODULE_ISWA_ENABLED
if(ImGui::CollapsingHeader("Cdf files")){
auto cdfInfo = IswaManager::ref().cdfInformation();
@@ -151,6 +152,7 @@ void GuiIswaComponent::render() {
}
}
}
#endif
for (const auto& p : _propertiesByOwner) {
if (ImGui::CollapsingHeader(p.first.c_str())) {
@@ -209,6 +211,7 @@ void GuiIswaComponent::render() {
}
#ifdef OPENSPACE_MODULE_ISWA_ENABLED
if (ImGui::CollapsingHeader("iSWA screen space cygntes")) {
auto map = IswaManager::ref().cygnetInformation();
@@ -237,7 +240,8 @@ void GuiIswaComponent::render() {
}
}
#endif
ImGui::End();
}