poret/UnrealImGui
1
0
Fork 0
mirror of https://github.com/kevinporetti/UnrealImGui.git synced 2025-01-18 16:30:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed warning about hiding 'ModuleManager' declaration.

Browse Source
This commit is contained in:
Sebastian 2018-07-10 18:02:43 +01:00
parent 5968c3ce84
commit daa18fcf25
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Source/ImGui/Private/ImGuiModule.cpp
View File

@ -34,25 +34,25 @@ struct EDelegateCategory
}; };
}; };
static FImGuiModuleManager* ModuleManager = nullptr; static FImGuiModuleManager* ImGuiModuleManager = nullptr;
#if WITH_EDITOR #if WITH_EDITOR
static FImGuiEditor* ModuleEditor = nullptr; static FImGuiEditor* ImGuiEditor = nullptr;
#endif #endif
#if WITH_EDITOR #if WITH_EDITOR
FImGuiDelegateHandle FImGuiModule::AddEditorImGuiDelegate(const FImGuiDelegate& Delegate) FImGuiDelegateHandle FImGuiModule::AddEditorImGuiDelegate(const FImGuiDelegate& Delegate)
{ {
checkf(ModuleManager, TEXT("Null pointer to internal module implementation. Is module available?")); checkf(ImGuiModuleManager, TEXT("Null pointer to internal module implementation. Is module available?"));
return { ModuleManager->GetContextManager().GetEditorContextProxy().OnDraw().Add(Delegate), return { ImGuiModuleManager->GetContextManager().GetEditorContextProxy().OnDraw().Add(Delegate),
EDelegateCategory::Default, Utilities::EDITOR_CONTEXT_INDEX }; EDelegateCategory::Default, Utilities::EDITOR_CONTEXT_INDEX };
} }
#endif #endif
FImGuiDelegateHandle FImGuiModule::AddWorldImGuiDelegate(const FImGuiDelegate& Delegate) FImGuiDelegateHandle FImGuiModule::AddWorldImGuiDelegate(const FImGuiDelegate& Delegate)
{ {
checkf(ModuleManager, TEXT("Null pointer to internal module implementation. Is module available?")); checkf(ImGuiModuleManager, TEXT("Null pointer to internal module implementation. Is module available?"));
#if WITH_EDITOR #if WITH_EDITOR
checkf(GEngine, TEXT("Null GEngine. AddWorldImGuiDelegate should be only called with GEngine initialized.")); checkf(GEngine, TEXT("Null GEngine. AddWorldImGuiDelegate should be only called with GEngine initialized."));
@ -66,10 +66,10 @@ FImGuiDelegateHandle FImGuiModule::AddWorldImGuiDelegate(const FImGuiDelegate& D
checkf(WorldContext, TEXT("Couldn't find current world. AddWorldImGuiDelegate should be only called from a valid world.")); checkf(WorldContext, TEXT("Couldn't find current world. AddWorldImGuiDelegate should be only called from a valid world."));
int32 Index; int32 Index;
FImGuiContextProxy& Proxy = ModuleManager->GetContextManager().GetWorldContextProxy(*WorldContext->World(), Index); FImGuiContextProxy& Proxy = ImGuiModuleManager->GetContextManager().GetWorldContextProxy(*WorldContext->World(), Index);
#else #else
const int32 Index = Utilities::STANDALONE_GAME_CONTEXT_INDEX; const int32 Index = Utilities::STANDALONE_GAME_CONTEXT_INDEX;
FImGuiContextProxy& Proxy = ModuleManager->GetContextManager().GetWorldContextProxy(); FImGuiContextProxy& Proxy = ImGuiModuleManager->GetContextManager().GetWorldContextProxy();
#endif #endif
return{ Proxy.OnDraw().Add(Delegate), EDelegateCategory::Default, Index }; return{ Proxy.OnDraw().Add(Delegate), EDelegateCategory::Default, Index };
@ -77,20 +77,20 @@ FImGuiDelegateHandle FImGuiModule::AddWorldImGuiDelegate(const FImGuiDelegate& D
FImGuiDelegateHandle FImGuiModule::AddMultiContextImGuiDelegate(const FImGuiDelegate& Delegate) FImGuiDelegateHandle FImGuiModule::AddMultiContextImGuiDelegate(const FImGuiDelegate& Delegate)
{ {
checkf(ModuleManager, TEXT("Null pointer to internal module implementation. Is module available?")); checkf(ImGuiModuleManager, TEXT("Null pointer to internal module implementation. Is module available?"));
return { ModuleManager->GetContextManager().OnDrawMultiContext().Add(Delegate), EDelegateCategory::MultiContext }; return { ImGuiModuleManager->GetContextManager().OnDrawMultiContext().Add(Delegate), EDelegateCategory::MultiContext };
} }
void FImGuiModule::RemoveImGuiDelegate(const FImGuiDelegateHandle& Handle) void FImGuiModule::RemoveImGuiDelegate(const FImGuiDelegateHandle& Handle)
{ {
if (ModuleManager) if (ImGuiModuleManager)
{ {
if (Handle.Category == EDelegateCategory::MultiContext) if (Handle.Category == EDelegateCategory::MultiContext)
{ {
ModuleManager->GetContextManager().OnDrawMultiContext().Remove(Handle.Handle); ImGuiModuleManager->GetContextManager().OnDrawMultiContext().Remove(Handle.Handle);
} }
else if (auto* Proxy = ModuleManager->GetContextManager().GetContextProxy(Handle.Index)) else if (auto* Proxy = ImGuiModuleManager->GetContextManager().GetContextProxy(Handle.Index))
{ {
Proxy->OnDraw().Remove(Handle.Handle); Proxy->OnDraw().Remove(Handle.Handle);
} }
@ -101,12 +101,12 @@ void FImGuiModule::StartupModule()
{ {
// Create managers that implements module logic. // Create managers that implements module logic.
checkf(!ModuleManager, TEXT("Instance of the Module Manager already exists. Instance should be created only during module startup.")); checkf(!ImGuiModuleManager, TEXT("Instance of the ImGui Module Manager already exists. Instance should be created only during module startup."));
ModuleManager = new FImGuiModuleManager(); ImGuiModuleManager = new FImGuiModuleManager();
#if WITH_EDITOR #if WITH_EDITOR
checkf(!ModuleEditor, TEXT("Instance of the Module Editor already exists. Instance should be created only during module startup.")); checkf(!ImGuiEditor, TEXT("Instance of the ImGui Editor already exists. Instance should be created only during module startup."));
ModuleEditor = new FImGuiEditor(); ImGuiEditor = new FImGuiEditor();
#endif #endif
} }
@ -115,14 +115,14 @@ void FImGuiModule::ShutdownModule()
// Before we shutdown we need to delete managers that will do all the necessary cleanup. // Before we shutdown we need to delete managers that will do all the necessary cleanup.
#if WITH_EDITOR #if WITH_EDITOR
checkf(ModuleEditor, TEXT("Null Module Editor. Module editor instance should be deleted during module shutdown.")); checkf(ImGuiEditor, TEXT("Null ImGui Editor. ImGui editor instance should be deleted during module shutdown."));
delete ModuleEditor; delete ImGuiEditor;
ModuleEditor = nullptr; ImGuiEditor = nullptr;
#endif #endif
checkf(ModuleManager, TEXT("Null Module Manager. Module manager instance should be deleted during module shutdown.")); checkf(ImGuiModuleManager, TEXT("Null ImGui Module Manager. Module manager instance should be deleted during module shutdown."));
delete ModuleManager; delete ImGuiModuleManager;
ModuleManager = nullptr; ImGuiModuleManager = nullptr;
} }
bool FImGuiModule::IsInputMode() const bool FImGuiModule::IsInputMode() const