Skip to content

Better support PIE server processes #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dislogical wants to merge 2 commits into
base: Main
Choose a base branch
from
Open

Better support PIE server processes #12

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8601401
Better support PIE server processes
dislogical May 8, 2024
cfe937f
Merge branch 'Main' into pie-server
dislogical Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 12 additions & 14 deletions Source/ImGui/Private/ImGuiModule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,15 @@ TSharedPtr<FImGuiContext> FImGuiModule::FindOrCreateSessionContext(const int32 P
Port += PieSessionId + 1;
}

#if WITH_ENGINE
const FWorldContext* WorldContext = GEngine->GetWorldContextFromPIEInstance(PIEInstance);
UGameViewportClient* GameViewport = WorldContext ? WorldContext->GameViewport : GEngine->GameViewport;
if (IsValid(GameViewport))
{
Context = CreateViewportContext(GameViewport);
}
#if WITH_EDITOR
if (GIsEditor && PieSessionId == INDEX_NONE)
else if (GIsEditor)
{
const IMainFrameModule* MainFrameModule = FModuleManager::GetModulePtr<IMainFrameModule>("MainFrame");
const TSharedPtr<SWindow> MainFrameWindow = MainFrameModule ? MainFrameModule->GetParentWindow() : nullptr;
Expand All @@ -72,21 +79,12 @@ TSharedPtr<FImGuiContext> FImGuiModule::FindOrCreateSessionContext(const int32 P
Context = CreateWindowContext(MainFrameWindow.ToSharedRef());
}
}
else
#endif
{
#if WITH_ENGINE
const FWorldContext* WorldContext = GEngine->GetWorldContextFromPIEInstance(PieSessionId);
UGameViewportClient* GameViewport = WorldContext ? WorldContext->GameViewport : GEngine->GameViewport;
if (IsValid(GameViewport))
{
Context = CreateViewportContext(GameViewport);
}
else
{
Context = FImGuiContext::Create();
}
#endif

if (!Context.IsValid())
{
Context = FImGuiContext::Create();
}

if (Context.IsValid())
Expand Down