From 53869495fd6444127bf0fd3da181f40684f061d9 Mon Sep 17 00:00:00 2001 From: Areloch Date: Mon, 4 Sep 2023 22:28:49 -0500 Subject: [PATCH 1/2] From Nils' UI Update work. Tweaks some of the handling for timestamp stuff, and adds some utility console functions for getting/resetting said timestamp stuffs. --- Engine/source/console/console.cpp | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/Engine/source/console/console.cpp b/Engine/source/console/console.cpp index 0f761301a5..1fe026a13d 100644 --- a/Engine/source/console/console.cpp +++ b/Engine/source/console/console.cpp @@ -307,6 +307,9 @@ bool alwaysUseDebugOutput = true; bool useTimestamp = false; bool useRealTimestamp = false; +static U32 initTime = Platform::getRealMilliseconds(); +U32 startTime = initTime; + ConsoleFunctionGroupBegin( Clipboard, "Miscellaneous functions to control the clipboard and clear the console."); DefineEngineFunction( cls, void, (), , "()" @@ -327,7 +330,7 @@ DefineEngineFunction( getClipboard, const char*, (), , "()" }; DefineEngineFunction( setClipboard, bool, (const char* text), , "(string text)" - "@brief Set the system clipboard.\n\n" + "@brief Set the system clipboard.\n\n" "@internal") { return Platform::setClipboard(text); @@ -335,6 +338,20 @@ DefineEngineFunction( setClipboard, bool, (const char* text), , "(string text)" ConsoleFunctionGroupEnd( Clipboard ); +DefineEngineFunction( resetTimeStamp, void, (), , "()" + "@brief Reset the timestamp to 0 ms.\n\n" + "@ingroup Console") +{ + startTime = Platform::getRealMilliseconds(); +}; + +DefineEngineFunction( getInitTime, int, (), , "()" + "@brief Get the initialization time in miliseconds.\n\n" + "@internal") +{ + return initTime; +}; + void postConsoleInput( RawData data ); @@ -644,7 +661,7 @@ static void _printf(ConsoleLogEntry::Level level, ConsoleLogEntry::Type type, co { if (!active) return; - Con::active = false; + Con::active = false; char buffer[8192] = {}; U32 offset = 0; @@ -664,16 +681,15 @@ static void _printf(ConsoleLogEntry::Level level, ConsoleLogEntry::Type type, co if (useTimestamp) { - static U32 startTime = Platform::getRealMilliseconds(); U32 curTime = Platform::getRealMilliseconds() - startTime; - offset += dSprintf(buffer + offset, sizeof(buffer) - offset, "[+%4d.%03d]", U32(curTime * 0.001), curTime % 1000); + offset += dSprintf(buffer + offset, sizeof(buffer) - offset, "[ms %4d %03d]", U32(curTime * 0.001), curTime % 1000); } - if (useTimestamp || useRealTimestamp) { + if (useTimestamp || useRealTimestamp) + { offset += dSprintf(buffer + offset, sizeof(buffer) - offset, " "); } - dVsprintf(buffer + offset, sizeof(buffer) - offset, fmt, argptr); for(S32 i = 0; i < gConsumers.size(); i++) @@ -2652,3 +2668,5 @@ void ConsoleStackFrameSaver::restore() gCallStack.popFrame(); } } + +//------------------------------------------------------------------------------ From 2a7965dd71ad2f88ce76ec02f00b0eed5f471985 Mon Sep 17 00:00:00 2001 From: Areloch Date: Tue, 5 Sep 2023 00:09:44 -0500 Subject: [PATCH 2/2] Removed the extra timestamp formatting change --- Engine/source/console/console.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engine/source/console/console.cpp b/Engine/source/console/console.cpp index 1fe026a13d..5d7ab3f69e 100644 --- a/Engine/source/console/console.cpp +++ b/Engine/source/console/console.cpp @@ -682,7 +682,7 @@ static void _printf(ConsoleLogEntry::Level level, ConsoleLogEntry::Type type, co if (useTimestamp) { U32 curTime = Platform::getRealMilliseconds() - startTime; - offset += dSprintf(buffer + offset, sizeof(buffer) - offset, "[ms %4d %03d]", U32(curTime * 0.001), curTime % 1000); + offset += dSprintf(buffer + offset, sizeof(buffer) - offset, "[+%4d.%03d]", U32(curTime * 0.001), curTime % 1000); } if (useTimestamp || useRealTimestamp)