ed/Cog
1
0
Fork 0
mirror of https://github.com/Ed94/Cog.git synced 2026-08-04 22:58:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

CogWindow: Change the way Cog shortcuts are treated

Browse Source 
Shortcuts to enable imgui (F1), enable actor selection (F5), loading and saving layouts, used to be handled by registering console commands with shortcuts. Now console commands can still be executed, but the shortcuts are handled by directly checking if the corresponding key is pressed from the UPlayerInput when imgui do not need Text input.
This should fix cases where the console shortcuts were not executed (typically with CommonUI menus)
This commit is contained in:
Arnaud Jamin
2025-01-24 01:19:18 -05:00
parent 980fe16f6e
commit 4f8d969ce5
11 changed files with 365 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_CommandBindings.cpp
+3 -10
View File
@@ -50,17 +50,11 @@ void FCogEngineWindow_CommandBindings::RenderContent()
ImGui::SameLine();
if (FCogWindowWidgets::ButtonWithTooltip(
"Register Default Commands",
"Register the default commands used to control Cog:\n\n"
"[Tab] Cog.ToggleInput\n"
"[F1] Cog.LoadLayout 1\n"
"[F2] Cog.LoadLayout 2\n"
"[F3] Cog.LoadLayout 3\n"
"[F4] Cog.LoadLayout 4\n"
"[F5] Cog.ToggleSelectionMode\n"
"Disable Conflicting Commands",
"Disable the existing Unreal command shortcuts mapped to same shortcuts Cog is using. Typically, if the F1 shortcut is used to toggle Inputs, the Unreal wireframe command will get disabled."
))
{
GetOwner()->RegisterDefaultCommandBindings();
GetOwner()->DisableConflictingCommands();
}
for (FKeyBind& KeyBind : PlayerInput->DebugExecBindings)
@@ -79,7 +73,6 @@ void FCogEngineWindow_CommandBindings::RenderContent()
PlayerInput->SaveConfig();
}
ImGui::PopID();
Index++;
}
Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Selection.cpp
+10 -47
View File
@@ -9,6 +9,7 @@
#include "CogWindowConsoleCommandManager.h"
#include "CogWindowManager.h"
#include "CogWindowWidgets.h"
#include "CogWindow_Settings.h"
#include "Components/PrimitiveComponent.h"
#include "EngineUtils.h"
#include "GameFramework/Character.h"
@@ -35,7 +36,7 @@ void FCogEngineWindow_Selection::Initialize()
GetWorld(),
FCogWindowConsoleCommandDelegate::CreateLambda([this](const TArray<FString>& InArgs, UWorld* InWorld)
{
ToggleSelectionMode();
GetOwner()->SetActivateSelectionMode(!GetOwner()->GetActivateSelectionMode());
}));
TryReapplySelection();
@@ -122,49 +123,11 @@ TSubclassOf<AActor> FCogEngineWindow_Selection::GetSelectedActorClass() const
}
//--------------------------------------------------------------------------------------------------------------------------
void FCogEngineWindow_Selection::ToggleSelectionMode()
{
if (bSelectionModeActive)
{
DeactivateSelectionMode();
}
else
{
ActivateSelectionMode();
}
}
//--------------------------------------------------------------------------------------------------------------------------
void FCogEngineWindow_Selection::ActivateSelectionMode()
{
bSelectionModeActive = true;
bIsInputEnabledBeforeEnteringSelectionMode = GetOwner()->GetContext().GetEnableInput();
GetOwner()->GetContext().SetEnableInput(true);
GetOwner()->SetActivateSelectionMode(true);
}
//--------------------------------------------------------------------------------------------------------------------------
void FCogEngineWindow_Selection::HackWaitInputRelease()
{
WaitInputReleased = 1;
}
//--------------------------------------------------------------------------------------------------------------------------
void FCogEngineWindow_Selection::DeactivateSelectionMode()
{
bSelectionModeActive = false;
//--------------------------------------------------------------------------------------------
// We can enter selection mode by a command, and ImGui might not have the input focus
// When in selection mode we need ImGui to have the input focus
// When leaving selection mode we want to leave it as it was before
//--------------------------------------------------------------------------------------------
GetOwner()->GetContext().SetEnableInput(bIsInputEnabledBeforeEnteringSelectionMode);
GetOwner()->SetActivateSelectionMode(false);
}
//--------------------------------------------------------------------------------------------------------------------------
void FCogEngineWindow_Selection::RenderTick(float DeltaTime)
{
@@ -175,7 +138,7 @@ void FCogEngineWindow_Selection::RenderTick(float DeltaTime)
SetGlobalSelection(GetLocalPlayerPawn());
}
if (bSelectionModeActive)
if (GetOwner()->GetActivateSelectionMode())
{
TickSelectionMode();
}
@@ -198,7 +161,7 @@ void FCogEngineWindow_Selection::RenderContent()
{
if (ImGui::MenuItem("Pick"))
{
ActivateSelectionMode();
GetOwner()->SetActivateSelectionMode(true);
//HackWaitInputRelease();
}
@@ -242,14 +205,14 @@ void FCogEngineWindow_Selection::TickSelectionMode()
{
if (ImGui::IsMouseClicked(ImGuiMouseButton_Right))
{
DeactivateSelectionMode();
GetOwner()->SetActivateSelectionMode(false);
return;
}
APlayerController* PlayerController = GetLocalPlayerController();
if (PlayerController == nullptr)
{
DeactivateSelectionMode();
GetOwner()->SetActivateSelectionMode(false);
return;
}
@@ -309,7 +272,7 @@ void FCogEngineWindow_Selection::TickSelectionMode()
FCogWindowWidgets::ActorFrame(*HoveredActor);
}
if (bSelectionModeActive)
if (GetOwner()->GetActivateSelectionMode())
{
if (ImGui::IsMouseReleased(ImGuiMouseButton_Left))
{
@@ -320,7 +283,7 @@ void FCogEngineWindow_Selection::TickSelectionMode()
SetGlobalSelection(HoveredActor);
}
DeactivateSelectionMode();
GetOwner()->SetActivateSelectionMode(false);
}
else
{
@@ -357,7 +320,7 @@ void FCogEngineWindow_Selection::RenderMainMenuWidget(int32 SubWidgetIndex, floa
if (ImGui::Button("Pick", ImVec2(Width, 0)))
{
ActivateSelectionMode();
GetOwner()->SetActivateSelectionMode(true);
HackWaitInputRelease();
}
RenderPickButtonTooltip();
@@ -422,7 +385,7 @@ void FCogEngineWindow_Selection::RenderPickButtonTooltip()
{
if (ImGui::IsItemHovered(ImGuiHoveredFlags_Stationary))
{
const FString Shortcut = FCogImguiInputHelper::CommandToString(*GetWorld(), ToggleSelectionModeCommand);
const FString Shortcut = FCogImguiInputHelper::KeyInfoToString(GetOwner()->GetSettings()->ToggleSelectionShortcut);
ImGui::SetTooltip("Enter picking mode to pick an actor on screen. %s", TCHAR_TO_ANSI(*Shortcut));
}
}