diff --git a/src/blackgui/components/settingscomponent.ui b/src/blackgui/components/settingscomponent.ui
index 3d37da70e..4babb426a 100644
--- a/src/blackgui/components/settingscomponent.ui
+++ b/src/blackgui/components/settingscomponent.ui
@@ -10,12 +10,6 @@
337
-
-
- 0
- 0
-
-
Settings
@@ -36,76 +30,6 @@
20
- -
-
-
- Network
-
-
-
- -
-
-
- Audio
-
-
-
- -
-
-
- Servers
-
-
-
- -
-
-
- Advanced
-
-
-
- -
-
-
- GUI
-
-
-
- -
-
-
- Simulator (basics)
-
-
-
- -
-
-
- Hotkeys
-
-
-
- -
-
-
- Simulator
-
-
-
- -
-
-
- Data load and caches
-
-
-
- -
-
-
- Simulator (messages)
-
-
-
-
@@ -119,6 +43,136 @@
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Network
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Servers
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Advanced
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Audio
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ GUI
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Simulator (basics)
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Simulator
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Data load and caches
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Hotkeys
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Simulator (messages)
+
+
+
-
diff --git a/src/blackgui/components/settingssimulatorcomponent.cpp b/src/blackgui/components/settingssimulatorcomponent.cpp
index 7b60d5c4f..450da1d9b 100644
--- a/src/blackgui/components/settingssimulatorcomponent.cpp
+++ b/src/blackgui/components/settingssimulatorcomponent.cpp
@@ -102,7 +102,7 @@ namespace BlackGui
void CSettingsSimulatorComponent::setGuiValues()
{
- const CInterpolationAndRenderingSetup setup = sGui->getIContextSimulator()->getInterpolationAndRenderingSetup();
+ const CInterpolationAndRenderingSetupGlobal setup = sGui->getIContextSimulator()->getInterpolationAndRenderingSetupGlobal();
// time sync
ui->cb_TimeSync->setEnabled(m_pluginLoaded);
@@ -181,17 +181,17 @@ namespace BlackGui
void CSettingsSimulatorComponent::onApplyMaxRenderedAircraft()
{
// get initial aircraft to render
- CInterpolationAndRenderingSetup setup = sGui->getIContextSimulator()->getInterpolationAndRenderingSetup();
+ CInterpolationAndRenderingSetupGlobal setup = sGui->getIContextSimulator()->getInterpolationAndRenderingSetupGlobal();
const int noRequested = ui->le_MaxAircraft->text().isEmpty() ? setup.InfiniteAircraft() : ui->le_MaxAircraft->text().toInt();
const int oldValue = setup.getMaxRenderedAircraft();
if (oldValue == noRequested) { return; }
// set value
setup.setMaxRenderedAircraft(noRequested);
- sGui->getIContextSimulator()->setInterpolationAndRenderingSetup(setup);
+ sGui->getIContextSimulator()->setInterpolationAndRenderingSetupGlobal(setup);
// re-read real value
- setup = sGui->getIContextSimulator()->getInterpolationAndRenderingSetup();
+ setup = sGui->getIContextSimulator()->getInterpolationAndRenderingSetupGlobal();
const int noRendered = setup.getMaxRenderedAircraft();
if (noRequested == noRendered)
{
@@ -208,7 +208,7 @@ namespace BlackGui
void CSettingsSimulatorComponent::onApplyMaxRenderedDistance()
{
// get initial aircraft to render
- CInterpolationAndRenderingSetup setup = sGui->getIContextSimulator()->getInterpolationAndRenderingSetup();
+ CInterpolationAndRenderingSetupGlobal setup = sGui->getIContextSimulator()->getInterpolationAndRenderingSetupGlobal();
CLength newDistance(0, nullptr);
if (!ui->le_MaxDistance->text().isEmpty())
{
@@ -224,16 +224,16 @@ namespace BlackGui
{
CLogMessage(this).info("Max.distance requested: %1") << newDistance.valueRoundedWithUnit(2, true);
setup.setMaxRenderedDistance(newDistance);
- sGui->getIContextSimulator()->setInterpolationAndRenderingSetup(setup);
+ sGui->getIContextSimulator()->setInterpolationAndRenderingSetupGlobal(setup);
this->setGuiValues();
}
}
void CSettingsSimulatorComponent::onApplyDisableRendering()
{
- CInterpolationAndRenderingSetup setup = sGui->getIContextSimulator()->getInterpolationAndRenderingSetup();
+ CInterpolationAndRenderingSetupGlobal setup = sGui->getIContextSimulator()->getInterpolationAndRenderingSetupGlobal();
setup.disableRendering();
- sGui->getIContextSimulator()->setInterpolationAndRenderingSetup(setup);
+ sGui->getIContextSimulator()->setInterpolationAndRenderingSetupGlobal(setup);
this->setGuiValues();
}
@@ -258,9 +258,9 @@ namespace BlackGui
void CSettingsSimulatorComponent::clearRestricedRendering()
{
- CInterpolationAndRenderingSetup setup;
+ CInterpolationAndRenderingSetupGlobal setup;
setup.clearAllRenderingRestrictions();
- sGui->getIContextSimulator()->setInterpolationAndRenderingSetup(setup);
+ sGui->getIContextSimulator()->setInterpolationAndRenderingSetupGlobal(setup);
this->setGuiValues();
}