izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Console Variables Editor:

Browse Source 
-Logging verbosity pass
-Fix for MU implementation sending variables back and forth in a feedback loop
-Fix for Global Search does not crawl help text or source

#rb Jason.Walter

#lockdown Alejandro.Arango

#jira UE-141801
#jira UE-141843
#jira UE-142034

#preflight 6202e704e85c7a08bbfb423e

#ROBOMERGE-AUTHOR: jared.therriault
#ROBOMERGE-SOURCE: CL 18925268 in //UE5/Release-5.0/... via CL 18931051 via CL 18931187
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v916-18915374)

[CL 18931211 by jared therriault in ue5-main branch]
This commit is contained in:
jared therriault
2022-02-09 22:44:16 -05:00
parent fbbb99998b
commit f4cda208b0
6 changed files with 43 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Engine/Plugins/Editor/ConsoleVariablesEditor/Source/ConsoleVariablesEditor/Private/ConsoleVariablesAsset.cpp
View File

@@ -41,7 +41,7 @@ void UConsoleVariablesAsset::AddOrSetConsoleObjectSavedData(const FConsoleVariab
if (AsVariable && AsVariable->TestFlags(ECVF_RenderThreadSafe))
{
UE_LOG(LogConsoleVariablesEditor, Warning,
UE_LOG(LogConsoleVariablesEditor, Verbose,
TEXT("The console variable named %s is flagged as ECVF_RenderThreadSafe. The value on the render thread will lag behind the value on the main thread by one frame if r.OneFrameThreadLag is 1."),
*InData.CommandName
);

36
Engine/Plugins/Editor/ConsoleVariablesEditor/Source/ConsoleVariablesEditor/Private/ConsoleVariablesEditorModule.cpp
View File

@@ -162,6 +162,7 @@ TArray<TWeakPtr<FConsoleVariablesEditorCommandInfo>> FConsoleVariablesEditorModu
for (const TSharedPtr<FConsoleVariablesEditorCommandInfo>& CommandInfo : ConsoleObjectsMasterReference)
{
FString CommandSearchableText = CommandInfo->Command + " " + CommandInfo->GetHelpText() + " " + CommandInfo->GetSourceAsText().ToString();
// Match any
for (const FString& Token : InTokens)
{
@@ -172,14 +173,14 @@ TArray<TWeakPtr<FConsoleVariablesEditorCommandInfo>> FConsoleVariablesEditorModu
TArray<FString> OutSpacedArray;
if (Token.Contains(SpaceDelimiter) && Token.ParseIntoArray(OutSpacedArray, *SpaceDelimiter, true) > 1)
{
bMatchFound = Algo::AllOf(OutSpacedArray, [&CommandInfo, InSearchCase](const FString& Comparator)
bMatchFound = Algo::AllOf(OutSpacedArray, [&CommandSearchableText, InSearchCase](const FString& Comparator)
{
return CommandInfo->Command.Contains(Comparator, InSearchCase);
return CommandSearchableText.Contains(Comparator, InSearchCase);
});
}
else
{
bMatchFound = CommandInfo->Command.Contains(Token, InSearchCase);
bMatchFound = CommandSearchableText.Contains(Token, InSearchCase);
}
if (bMatchFound)
@@ -263,7 +264,9 @@ void FConsoleVariablesEditorModule::SendMultiUserConsoleVariableChange(const FSt
void FConsoleVariablesEditorModule::OnRemoteCvarChanged(const FString InName, const FString InValue)
{
UE_LOG(LogConsoleVariablesEditor, Display, TEXT("Remote set console variable %s = %s"), *InName, *InValue);
UE_LOG(LogConsoleVariablesEditor, VeryVerbose, TEXT("Remote set console variable %s = %s"), *InName, *InValue);
CommandsRecentlyReceivedFromMultiUser.Add(InName, InValue);
if (GetDefault<UConcertCVarSynchronization>()->bSyncCVarTransactions)
{
@@ -343,7 +346,7 @@ void FConsoleVariablesEditorModule::OnConsoleVariableChanged(IConsoleVariable* C
const FString& Key = PinnedCommand->Command;
FConsoleVariablesEditorAssetSaveData FoundData;
const bool bIsVariableCurrentlyTracked = EditingPresetAsset->FindSavedDataByCommandString(Key, FoundData);
bool bIsVariableCurrentlyTracked = EditingPresetAsset->FindSavedDataByCommandString(Key, FoundData);
const UConsoleVariablesEditorProjectSettings* Settings = GetDefault<UConsoleVariablesEditorProjectSettings>();
check(Settings);
@@ -367,18 +370,35 @@ void FConsoleVariablesEditorModule::OnConsoleVariableChanged(IConsoleVariable* C
ChangedVariable->GetString() : "",
true
);
}
SendMultiUserConsoleVariableChange(Key, ChangedVariable->GetString());
bIsVariableCurrentlyTracked = true;
}
}
}
else // If it's already being tracked, refreshed the list to update show filters and other possibly stale elements
// If the variable is already tracked or was just added to tracking, run the following code
if (bIsVariableCurrentlyTracked)
{
if (MainPanel.IsValid())
{
MainPanel->RefreshList();
}
/**
* Here we check the map of recently received variables from other nodes
* If the command is in the map and the value is similar, we won't send the value to other nodes
* because we can assume that this value came from another node.
* This prevents a feedback loop.
*/
if (const FString* MatchedValue = CommandsRecentlyReceivedFromMultiUser.Find(Key))
{
if (MatchedValue->Equals(ChangedVariable->GetString()))
{
CommandsRecentlyReceivedFromMultiUser.Remove(Key);
return;
}
}
SendMultiUserConsoleVariableChange(Key, ChangedVariable->GetString());
}
}

10
Engine/Plugins/Editor/ConsoleVariablesEditor/Source/ConsoleVariablesEditor/Private/ConsoleVariablesEditorModule.h
View File

@@ -110,7 +110,7 @@ private:
static const FName ConsoleVariablesToolkitPanelTabId;
/* Lives for as long as the module is loaded. */
/** Lives for as long as the module is loaded. */
TSharedPtr<FConsoleVariablesEditorMainPanel> MainPanel;
/** Transient preset that's being edited so we don't affect the reference asset unless we save it */
@@ -120,4 +120,12 @@ private:
/** All tracked variables and their default, startup, and current values */
TArray<TSharedPtr<FConsoleVariablesEditorCommandInfo>> ConsoleObjectsMasterReference;
/**
* A list of CommandName/ValueAsString pairs of commands received from MU.
* When this node receives a command and value from another node, it will be added to this list.
* This list will be checked against detected local cvar changes and,
* if the command and value match an item in this map, the change will not be propagated to other nodes.
*/
TMap<FString, FString> CommandsRecentlyReceivedFromMultiUser;
};

4
Engine/Plugins/Editor/ConsoleVariablesEditor/Source/ConsoleVariablesEditor/Private/MultiUser/ConsoleVariableSync.cpp
View File

@@ -124,7 +124,7 @@ struct FManagerImpl
void ConnectToSession(IConcertClientSession& InSession)
{
UE_LOG(LogConsoleVariablesEditor, Display, TEXT("Multi-user Console Variable Editor listening to session: %s"), *InSession.GetSessionInfo().SessionName);
UE_LOG(LogConsoleVariablesEditor, VeryVerbose, TEXT("Multi-user Console Variable Editor listening to session: %s"), *InSession.GetSessionInfo().SessionName);
ClientChangeDelegate = InSession.OnSessionClientChanged().AddRaw(this, &FManagerImpl::OnSessionClientChanged);
@@ -229,7 +229,7 @@ struct FManagerImpl
check(WeakSession.IsValid());
{
TSharedPtr<IConcertClientSession> Session = WeakSession.Pin();
UE_LOG(LogConsoleVariablesEditor, Display, TEXT("Multi-user Console Variable Editor disconnecting from Session: %s"), *Session->GetSessionInfo().SessionName);
UE_LOG(LogConsoleVariablesEditor, VeryVerbose, TEXT("Multi-user Console Variable Editor disconnecting from Session: %s"), *Session->GetSessionInfo().SessionName);
Session->OnSessionClientChanged().Remove(ClientChangeDelegate);
}
}

2
Engine/Plugins/Editor/ConsoleVariablesEditor/Source/ConsoleVariablesEditor/Private/Views/List/SConsoleVariablesEditorList.cpp
View File

@@ -275,7 +275,7 @@ FReply SConsoleVariablesEditorList::TryEnterGlobalSearch(const FString& SearchSt
// Can't enter global search if there are no active global searches or a search string from which to parse new searches
if (SearchString.IsEmpty() && CurrentGlobalSearches.Num() == 0)
{
UE_LOG(LogConsoleVariablesEditor, Log,
UE_LOG(LogConsoleVariablesEditor, Verbose,
TEXT("%hs: Global search request is empty. Exiting Global Search."),
__FUNCTION__, *SearchString);

4
Engine/Plugins/Editor/ConsoleVariablesEditor/Source/ConsoleVariablesEditor/Private/Views/MainPanel/ConsoleVariablesEditorMainPanel.cpp
View File

@@ -280,10 +280,10 @@ void FConsoleVariablesEditorMainPanel::OnConnectionChanged(EConcertConnectionSta
switch (Status)
{
case EConcertConnectionStatus::Connected:
UE_LOG(LogConsoleVariablesEditor, Display, TEXT("Multi-user has connected to a session."));
UE_LOG(LogConsoleVariablesEditor, VeryVerbose, TEXT("Multi-user has connected to a session."));
break;
case EConcertConnectionStatus::Disconnected:
UE_LOG(LogConsoleVariablesEditor, Display, TEXT("Multi-user has disconnected from session."));
UE_LOG(LogConsoleVariablesEditor, VeryVerbose, TEXT("Multi-user has disconnected from session."));
break;
default:
break;