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

Added code that moves module properties to hot-reloaded modules.

Browse Source
This commit is contained in:
Sebastian 2018-11-25 21:26:06 +00:00
parent 209a594616
commit a8ba10d074
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,6 +130,12 @@ void FImGuiModule::StartupModule()
void FImGuiModule::ShutdownModule() void FImGuiModule::ShutdownModule()
{ {
// In editor store data that we want to move to hot-reloaded module.
#if WITH_EDITOR
TOptional<FImGuiModuleProperties> PropertiesToMove = ImGuiModuleManager->GetProperties();
#endif
// 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
@ -147,7 +153,7 @@ void FImGuiModule::ShutdownModule()
// deleted. This can cause troubles after hot-reload when code in other modules calls ImGui interface functions // deleted. This can cause troubles after hot-reload when code in other modules calls ImGui interface functions
// which are statically bound to the obsolete module. To keep ImGui code functional we can redirect context handle // which are statically bound to the obsolete module. To keep ImGui code functional we can redirect context handle
// to point to the new module. // to point to the new module.
FModuleManager::Get().OnModulesChanged().AddLambda([this](FName Name, EModuleChangeReason Reason) FModuleManager::Get().OnModulesChanged().AddLambda([this, PropertiesToMove] (FName Name, EModuleChangeReason Reason) mutable
{ {
if (Reason == EModuleChangeReason::ModuleLoaded && Name == "ImGui") if (Reason == EModuleChangeReason::ModuleLoaded && Name == "ImGui")
{ {
@ -155,6 +161,12 @@ void FImGuiModule::ShutdownModule()
if (&LoadedModule != this) if (&LoadedModule != this)
{ {
ImGuiImplementation::SetImGuiContextHandle(LoadedModule.GetImGuiContextHandle()); ImGuiImplementation::SetImGuiContextHandle(LoadedModule.GetImGuiContextHandle());
if (PropertiesToMove.IsSet())
{
LoadedModule.SetProperties(PropertiesToMove.GetValue());
PropertiesToMove.Reset();
}
} }
} }
}); });
@ -162,6 +174,11 @@ void FImGuiModule::ShutdownModule()
} }
#if WITH_EDITOR #if WITH_EDITOR
void FImGuiModule::SetProperties(const FImGuiModuleProperties& Properties)
{
ImGuiModuleManager->GetProperties() = Properties;
}
ImGuiContext** FImGuiModule::GetImGuiContextHandle() ImGuiContext** FImGuiModule::GetImGuiContextHandle()
{ {
return ImGuiImplementation::GetImGuiContextHandle(); return ImGuiImplementation::GetImGuiContextHandle();

1
Source/ImGui/Public/ImGuiModule.h
View File

@ -148,6 +148,7 @@ public:
private: private:
#if WITH_EDITOR #if WITH_EDITOR
virtual void SetProperties(const class FImGuiModuleProperties& Properties);
virtual struct ImGuiContext** GetImGuiContextHandle(); virtual struct ImGuiContext** GetImGuiContextHandle();
#endif #endif
}; };