1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-30 19:36:43 +00:00

Loading screen should now be visible.

This commit is contained in:
Mads Buvik Sandvei 2020-10-25 17:02:25 +01:00
parent fdea94d84e
commit 5ffd884b14

View file

@ -451,7 +451,7 @@ namespace MWVR
{ {
} }
static const LayerConfig createDefaultConfig(int priority, bool background = true, SizingMode sizingMode = SizingMode::Auto) static const LayerConfig createDefaultConfig(int priority, bool background = true, SizingMode sizingMode = SizingMode::Auto, std::string extraLayers = "Popup")
{ {
return LayerConfig{ return LayerConfig{
priority, priority,
@ -465,12 +465,12 @@ namespace MWVR
osg::Vec2(1,1), osg::Vec2(1,1),
sizingMode, sizingMode,
TrackingMode::Menu, TrackingMode::Menu,
"Popup" extraLayers
}; };
} }
LayerConfig gDefaultConfig = createDefaultConfig(1); LayerConfig gDefaultConfig = createDefaultConfig(1);
LayerConfig gVideoPlayerConfig = createDefaultConfig(1, true, SizingMode::Fixed); LayerConfig gVideoPlayerConfig = createDefaultConfig(1, true, SizingMode::Fixed);
LayerConfig gLoadingScreenConfig = createDefaultConfig(1, true, SizingMode::Fixed); LayerConfig gLoadingScreenConfig = createDefaultConfig(1, true, SizingMode::Fixed, "Menu");
LayerConfig gMainMenuConfig = createDefaultConfig(1, true); LayerConfig gMainMenuConfig = createDefaultConfig(1, true);
LayerConfig gJournalBooksConfig = createDefaultConfig(2, false, SizingMode::Fixed); LayerConfig gJournalBooksConfig = createDefaultConfig(2, false, SizingMode::Fixed);
LayerConfig gDefaultWindowsConfig = createDefaultConfig(3, true); LayerConfig gDefaultWindowsConfig = createDefaultConfig(3, true);
@ -554,6 +554,7 @@ namespace MWVR
{"MainMenu", gMainMenuConfig}, {"MainMenu", gMainMenuConfig},
{"Notification", gNotificationConfig}, {"Notification", gNotificationConfig},
{"InputBlocker", gVideoPlayerConfig}, {"InputBlocker", gVideoPlayerConfig},
{"Menu", gVideoPlayerConfig},
{"LoadingScreen", gLoadingScreenConfig}, {"LoadingScreen", gLoadingScreenConfig},
}; };