mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-28 17:39:42 +00:00
Code Issues Releases Wiki Activity

Merge branch 'track_debug_window' into 'master'

Browse source 
Track debug window

See merge request OpenMW/openmw!3504
This commit is contained in:
Evil Eye 2023-10-22 08:41:56 +00:00
commit 418c3d26c7
5 changed files with 41 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
apps/openmw/mwgui/settings.cpp
View file

@ -99,6 +99,25 @@ namespace MWGui
};
}
WindowSettingValues makeDebugWindowSettingValues()
{
return WindowSettingValues{
.mRegular = WindowRectSettingValues {
.mX = Settings::windows().mDebugX,
.mY = Settings::windows().mDebugY,
.mW = Settings::windows().mDebugW,
.mH = Settings::windows().mDebugH,
},
.mMaximized = WindowRectSettingValues {
.mX = Settings::windows().mDebugMaximizedX,
.mY = Settings::windows().mDebugMaximizedY,
.mW = Settings::windows().mDebugMaximizedW,
.mH = Settings::windows().mDebugMaximizedH,
},
.mIsMaximized = Settings::windows().mDebugMaximized,
};
}
WindowSettingValues makeDialogueWindowSettingValues()
{
return WindowSettingValues{

1
apps/openmw/mwgui/settings.hpp
View file

@ -25,6 +25,7 @@ namespace MWGui
WindowSettingValues makeCompanionWindowSettingValues();
WindowSettingValues makeConsoleWindowSettingValues();
WindowSettingValues makeContainerWindowSettingValues();
WindowSettingValues makeDebugWindowSettingValues();
WindowSettingValues makeDialogueWindowSettingValues();
WindowSettingValues makeInventoryWindowSettingValues();
WindowSettingValues makeInventoryBarterWindowSettingValues();

1
apps/openmw/mwgui/windowmanagerimp.cpp
View file

@ -498,6 +498,7 @@ namespace MWGui
auto debugWindow = std::make_unique<DebugWindow>();
mDebugWindow = debugWindow.get();
mWindows.push_back(std::move(debugWindow));
trackWindow(mDebugWindow, makeDebugWindowSettingValues());
auto postProcessorHud = std::make_unique<PostProcessorHud>();
mPostProcessorHud = postProcessorHud.get();

9
components/settings/categories/windows.hpp
View file

@ -161,6 +161,15 @@ namespace Settings
SettingValue<float> mPostprocessorMaximizedW{ mIndex, "Windows", "postprocessor maximized w" };
SettingValue<float> mPostprocessorMaximizedH{ mIndex, "Windows", "postprocessor maximized h" };
SettingValue<bool> mPostprocessorMaximized{ mIndex, "Windows", "postprocessor maximized" };
SettingValue<float> mDebugX{ mIndex, "Windows", "debug x" };
SettingValue<float> mDebugY{ mIndex, "Windows", "debug y" };
SettingValue<float> mDebugW{ mIndex, "Windows", "debug w" };
SettingValue<float> mDebugH{ mIndex, "Windows", "debug h" };
SettingValue<float> mDebugMaximizedX{ mIndex, "Windows", "debug maximized x" };
SettingValue<float> mDebugMaximizedY{ mIndex, "Windows", "debug maximized y" };
SettingValue<float> mDebugMaximizedW{ mIndex, "Windows", "debug maximized w" };
SettingValue<float> mDebugMaximizedH{ mIndex, "Windows", "debug maximized h" };
SettingValue<bool> mDebugMaximized{ mIndex, "Windows", "debug maximized" };
};
}

11
files/settings-default.cfg
View file

@ -847,6 +847,17 @@ postprocessor maximized w = 0.97
postprocessor maximized h = 0.875
postprocessor maximized = false
# Debug window for viewing logs and profiling
debug x = 0.70
debug y = 0.00
debug w = 0.30
debug h = 1.00
debug maximized x = 0.015
debug maximized y = 0.02
debug maximized w = 0.97
debug maximized h = 0.875
debug maximized = false
[Navigator]
# Enable navigator (true, false). When enabled background threads are started to build navmesh for world geometry.