mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-18 02:49:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

More cleanup

Browse Source
This commit is contained in:
Alexander Bock
2020-05-06 21:54:02 +02:00
parent 340444ce0d
commit befef58e80
2 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/openspace/scene/assetloader.h
View File

@@ -214,7 +214,7 @@ private:
// State change listeners
std::vector<AssetListener*> _assetListeners;
// References to lua values
// References to Lua values
std::unordered_map<Asset*, std::vector<int>> _onInitializationFunctionRefs;
std::unordered_map<Asset*, std::vector<int>> _onDeinitializationFunctionRefs;
std::unordered_map<Asset*, std::map<Asset*, std::vector<int>>>

29
modules/imgui/src/guiassetcomponent.cpp
View File

@@ -39,14 +39,14 @@ namespace {
using State = openspace::Asset::State;
switch (state) {
case State::Loaded: return "Loaded";
case State::LoadingFailed: return "LoadingFailed";
case State::Synchronizing: return "Synchronizing";
case State::SyncRejected: return "SyncRejected";
case State::SyncResolved: return "SyncResolved";
case State::Initialized: return "Initialized";
case State::InitializationFailed: return "InitializationFailed";
default: return "Unknown";
case State::Loaded: return "Loaded";
case State::LoadingFailed: return "LoadingFailed";
case State::Synchronizing: return "Synchronizing";
case State::SyncRejected: return "SyncRejected";
case State::SyncResolved: return "SyncResolved";
case State::Initialized: return "Initialized";
case State::InitializationFailed: return "InitializationFailed";
default: return "Unknown";
}
}
@@ -54,14 +54,14 @@ namespace {
using State = openspace::ResourceSynchronization::State;
switch (state) {
case State::Unsynced: return "Unsynced";
case State::Syncing: return "Syncing";
case State::Resolved: return "Resolved";
case State::Rejected: return "Rejected";
default: return "Unknown";
case State::Unsynced: return "Unsynced";
case State::Syncing: return "Syncing";
case State::Resolved: return "Resolved";
case State::Rejected: return "Rejected";
default: return "Unknown";
}
}
}
} // namespace
namespace openspace::gui {
@@ -69,7 +69,6 @@ GuiAssetComponent::GuiAssetComponent()
: GuiComponent("Assets")
{}
void GuiAssetComponent::render() {
bool e = _isEnabled;
ImGui::Begin("Assets", &e);