Game-Decompilation/2ship2harkinian
1
0
Fork 0
mirror of https://github.com/HarbourMasters/2ship2harkinian.git synced 2024-12-17 18:47:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add log level combo box (#286)

Browse Source
This commit is contained in:
Garrett Cox 2024-05-02 09:21:46 -05:00
parent cdeb6eaa16
commit 7f08698d76
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mm/2s2h/BenGui/BenMenuBar.cpp
View File

@ -349,6 +349,16 @@ extern std::shared_ptr<ActorViewerWindow> mActorViewerWindow;
extern std::shared_ptr<CollisionViewerWindow> mCollisionViewerWindow;
extern std::shared_ptr<EventLogWindow> mEventLogWindow;
const char* logLevels[] = {
"trace",
"debug",
"info",
"warn",
"error",
"critical",
"off",
};
void DrawDeveloperToolsMenu() {
if (UIWidgets::BeginMenu("Developer Tools", UIWidgets::Colors::Yellow)) {
UIWidgets::CVarCheckbox("Debug Mode", "gDeveloperTools.DebugEnabled", {
@ -365,6 +375,12 @@ void DrawDeveloperToolsMenu() {
if (UIWidgets::CVarCheckbox("Prevent Actor Init", "gDeveloperTools.PreventActorInit")) {
RegisterPreventActorInitHooks();
}
if (UIWidgets::CVarCombobox("Log Level", "gDeveloperTools.LogLevel", logLevels, {
.tooltip = "The log level determines which messages are printed to the console. This does not affect the log file output",
.defaultIndex = 1,
})) {
LUS::Context::GetInstance()->GetLogger()->set_level((spdlog::level::level_enum)CVarGetInteger("gDeveloperTools.LogLevel", 1));
}
if (gPlayState != NULL) {
ImGui::Separator();

5
mm/2s2h/BenPort.cpp
View File

@ -130,6 +130,11 @@ OTRGlobals::OTRGlobals() {
OOT_PAL_GC, OOT_PAL_GC_DBG1, OOT_PAL_GC_DBG2 };
// tell LUS to reserve 3 SoH specific threads (Game, Audio, Save)
context = LUS::Context::CreateInstance("2 Ship 2 Harkinian", appShortName, "shipofharkinian.json", OTRFiles, {}, 3);
// Override LUS defaults
LUS::Context::GetInstance()->GetLogger()->set_level((spdlog::level::level_enum)CVarGetInteger("gDeveloperTools.LogLevel", 1));
LUS::Context::GetInstance()->GetLogger()->set_pattern("[%H:%M:%S.%e] [%s:%#] [%l] %v");
//context = LUS::Context::CreateUninitializedInstance("Ship of Harkinian", appShortName, "shipofharkinian.json");
auto loader = context->GetResourceManager()->GetResourceLoader();
loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryBinaryAnimationV0>(), RESOURCE_FORMAT_BINARY,

4
mm/src/audio/lib/thread.c
View File

@ -270,8 +270,6 @@ void AudioThread_QueueCmd(AudioCmd cmdData) {
AudioCmd* cmd = &gAudioCtx.threadCmdBuf[gAudioCtx.threadCmdWritePos & 0xFF];
*cmd = cmdData;
LUSLOG_TRACE("Queueing Command: %s", cmd_op_to_str(cmd->op));
gAudioCtx.threadCmdWritePos++;
if (gAudioCtx.threadCmdWritePos == gAudioCtx.threadCmdReadPos) {
@ -467,7 +465,7 @@ void AudioThread_ProcessCmds(u32 msg) {
}
cmd = &gAudioCtx.threadCmdBuf[sCurCmdRdPos++ & 0xFF];
LUSLOG_TRACE("Process Command: %s", cmd_op_to_str(cmd->op));
if (cmd->op == AUDIOCMD_OP_GLOBAL_STOP_AUDIOCMDS) {
gAudioCtx.threadCmdQueueFinished = true;
break;