From ccd36e9413d68f6357383d89d84f74a12a4f3722 Mon Sep 17 00:00:00 2001 From: Alexei Kotov Date: Sat, 1 Jun 2024 13:38:11 +0300 Subject: [PATCH 1/2] Support light fade settings in legacy lighting method This doesn't change launcher descriptions because the launcher settings are going to be omitted --- components/sceneutil/lightmanager.cpp | 48 +++++++++---------- .../reference/modding/settings/shaders.rst | 15 +++--- files/data/l10n/OMWEngine/de.yaml | 2 +- files/data/l10n/OMWEngine/en.yaml | 6 +-- files/data/l10n/OMWEngine/fr.yaml | 2 +- files/data/l10n/OMWEngine/ru.yaml | 2 +- files/data/l10n/OMWEngine/sv.yaml | 2 +- 7 files changed, 37 insertions(+), 40 deletions(-) diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp index 66fe231e11..178ea087c0 100644 --- a/components/sceneutil/lightmanager.cpp +++ b/components/sceneutil/lightmanager.cpp @@ -830,32 +830,33 @@ namespace SceneUtil if (settings.mLightingMethod == LightingMethod::FFP) { initFFP(ffpMaxLights); - return; } - - static bool hasLoggedWarnings = false; - - if (settings.mLightingMethod == LightingMethod::SingleUBO && !hasLoggedWarnings) - { - if (!supportsUBO) - Log(Debug::Warning) - << "GL_ARB_uniform_buffer_object not supported: switching to shader compatibility lighting mode"; - if (!supportsGPU4) - Log(Debug::Warning) - << "GL_EXT_gpu_shader4 not supported: switching to shader compatibility lighting mode"; - hasLoggedWarnings = true; - } - - if (!supportsUBO || !supportsGPU4 || settings.mLightingMethod == LightingMethod::PerObjectUniform) - initPerObjectUniform(settings.mMaxLights); else - initSingleUBO(settings.mMaxLights); + { + static bool hasLoggedWarnings = false; + + if (settings.mLightingMethod == LightingMethod::SingleUBO && !hasLoggedWarnings) + { + if (!supportsUBO) + Log(Debug::Warning) << "GL_ARB_uniform_buffer_object not supported: switching to shader " + "compatibility lighting mode"; + if (!supportsGPU4) + Log(Debug::Warning) + << "GL_EXT_gpu_shader4 not supported: switching to shader compatibility lighting mode"; + hasLoggedWarnings = true; + } + + if (!supportsUBO || !supportsGPU4 || settings.mLightingMethod == LightingMethod::PerObjectUniform) + initPerObjectUniform(settings.mMaxLights); + else + initSingleUBO(settings.mMaxLights); + + getOrCreateStateSet()->addUniform(new osg::Uniform("PointLightCount", 0)); + + addCullCallback(new LightManagerCullCallback(this)); + } updateSettings(settings.mLightBoundsMultiplier, settings.mMaximumLightDistance, settings.mLightFadeStart); - - getOrCreateStateSet()->addUniform(new osg::Uniform("PointLightCount", 0)); - - addCullCallback(new LightManagerCullCallback(this)); } LightManager::LightManager(const LightManager& copy, const osg::CopyOp& copyop) @@ -942,9 +943,6 @@ namespace SceneUtil void LightManager::updateSettings(float lightBoundsMultiplier, float maximumLightDistance, float lightFadeStart) { - if (getLightingMethod() == LightingMethod::FFP) - return; - mPointLightRadiusMultiplier = lightBoundsMultiplier; mPointLightFadeEnd = maximumLightDistance; if (mPointLightFadeEnd > 0) diff --git a/docs/source/reference/modding/settings/shaders.rst b/docs/source/reference/modding/settings/shaders.rst index 22ceb34f44..808fb2932a 100644 --- a/docs/source/reference/modding/settings/shaders.rst +++ b/docs/source/reference/modding/settings/shaders.rst @@ -148,13 +148,13 @@ lighting method Sets the internal handling of light sources. -'legacy' is restricted to 8 lights per object and emulates fixed function -pipeline compatible lighting. +'legacy' is restricted to 8 lights per object and it is the method closest to +fixed function pipeline lighting. 'shaders compatibility' removes the light limit controllable through :ref:`max lights` and follows a modified attenuation formula which can drastically reduce -light popping and seams. This mode also enables lighting on groundcover and a -configurable light fade. It is recommended to use this with older hardware and a +light popping and seams. This mode also enables lighting on groundcover. +It is recommended to use this with older hardware and a light limit closer to 8. Because of its wide range of compatibility it is set as the default. @@ -189,7 +189,7 @@ increase in :ref:`max lights` and thus carries a performance penalty. This especially helps with abrupt light popping with handheld light sources such as torches and lanterns. -This setting has no effect if :ref:`lighting method` is 'legacy'. +In Morrowind, this multiplier is non-existent, i.e. it is always 1.0. maximum light distance ---------------------- @@ -202,7 +202,7 @@ The maximum distance from the camera that lights will be illuminated, applies to both interiors and exteriors. A lower distance will improve performance. Set this to a non-positive value to disable fading. -This setting has no effect if :ref:`lighting method` is 'legacy'. +In Morrowind, there is no distance-based light fading. light fade start ---------------- @@ -214,8 +214,7 @@ light fade start The fraction of the maximum distance at which lights will begin to fade away. Tweaking it will make the transition proportionally more or less smooth. -This setting has no effect if the :ref:`maximum light distance` is non-positive -or :ref:`lighting method` is 'legacy'. +This setting has no effect if the :ref:`maximum light distance` is non-positive. max lights ---------- diff --git a/files/data/l10n/OMWEngine/de.yaml b/files/data/l10n/OMWEngine/de.yaml index 151905f6b9..94398c00b2 100644 --- a/files/data/l10n/OMWEngine/de.yaml +++ b/files/data/l10n/OMWEngine/de.yaml @@ -125,7 +125,7 @@ LightsFadeStartMultiplier: "Multiplikator für Startwert der Lichtabblendung" LightsFadeStartMultiplierTooltip: "Standard: 0,85\nBruchteil der maximalen Lichtreichweite, bei der Lichtquellen langsam zu verblassen beginnen.\n\nKleinere Werte führen zu einem sanfteren Übergang, der allerdings bereits bei geringerer Entfernung startet; größere Werte machen den Übergang abrupter, betreffen aber nur weiter entfernte Lichtquellen." LightsLightingMethodTooltip: "Legt die interne Behandlung von Lichtquellen fest.\n\n „Veraltet“ verwendet immer bis zu 8 Lichtquellen pro Objekt und führt zu Ergebnissen, die denen der Original-Engine am ähnlichsten sind.\n\n - „Shader (Kompatibilitätsmodus)“ entfernt das Maximum von 8 Lichtquellen pro Objekt; Bodenvegetation wird von Lichtquellen beleuchtet und das sanfte Abblenden von Lichtquellen wird aktiviert. Es wird empfohlen, diese Option für ältere Hardware und Maximalwerte für Lichtquellen nahe 8 zu verwenden.\n\n + „Shader (Kompatibilitätsmodus)“ entfernt das Maximum von 8 Lichtquellen pro Objekt; Bodenvegetation wird von Lichtquellen beleuchtet. Es wird empfohlen, diese Option für ältere Hardware und Maximalwerte für Lichtquellen nahe 8 zu verwenden.\n\n „Shader“ bietet alle Vorteile von „Shader (Kompatibilitätsmodus)“, nutzt aber einen moderneren Ansatz, der größere Maximalwerte für Lichtquellen bei geringen bis keinen Leistungseinbußen ermöglicht. Funktioniert möglicherweise nicht auf älterer Hardware." LightsMaximumDistance: "Maximale Lichtreichweite" LightsMaximumDistanceTooltip: "Standard: 8192 (1 Zelle)\nMaximale Entfernung, bis zu der Lichtquellen noch dargestellt werden (gemessen in In-Game-Einheiten).\n\nEin Wert von 0 entspricht einer unbegrenzten Reichweite." diff --git a/files/data/l10n/OMWEngine/en.yaml b/files/data/l10n/OMWEngine/en.yaml index 3379f946a3..80718b67c7 100644 --- a/files/data/l10n/OMWEngine/en.yaml +++ b/files/data/l10n/OMWEngine/en.yaml @@ -120,12 +120,12 @@ LightingMethodShadersCompatibility: "Shaders (compatibility)" LightingResetToDefaults: "Resets to default values, would you like to continue? Changes to lighting method will require a restart." Lights: "Lights" LightsBoundingSphereMultiplier: "Bounding Sphere Multiplier" -LightsBoundingSphereMultiplierTooltip: "Default: 1.65\nMultipler for bounding sphere of lights.\nHigher numbers allows for smooth falloff but require an increase in number of max lights.\n\nDoes not effect the illumination or strength of lights." +LightsBoundingSphereMultiplierTooltip: "Default: 1.65\nMultiplier for bounding sphere of lights.\nHigher numbers allows for smooth falloff but require an increase in number of max lights.\n\nDoes not effect the illumination or strength of lights." LightsFadeStartMultiplier: "Fade Start Multiplier" LightsFadeStartMultiplierTooltip: "Default: 0.85\nFraction of maximum distance at which lights will start to fade.\n\nSet this to a low value for slower transitions or a high value for quicker transitions." LightsLightingMethodTooltip: "Set the internal handling of light sources.\n\n - \"Legacy\" always uses 8 lights per object and provides a lighting closest to an original game.\n\n - \"Shaders (compatibility)\" removes the 8 light limit. This mode also enables lighting on groundcover and a configurable light fade. It is recommended to use this with older hardware and a light limit closer to 8.\n\n + \"Legacy\" always uses 8 lights per object. It provides results most similar to Morrowind's lighting.\n\n + \"Shaders (compatibility)\" removes the 8 light limit. This mode also enables lighting on groundcover. It is recommended to use this with older hardware and a light limit closer to 8.\n\n \"Shaders\" carries all of the benefits that \"Shaders (compatibility)\" does, but uses a modern approach that allows for a higher max lights count with little to no performance penalties on modern hardware." LightsMaximumDistance: "Maximum Light Distance" LightsMaximumDistanceTooltip: "Default: 8192\nMaximum distance at which lights will appear (measured in units).\n\nSet this to 0 to use an unlimited distance." diff --git a/files/data/l10n/OMWEngine/fr.yaml b/files/data/l10n/OMWEngine/fr.yaml index 0829f042d0..ed18410274 100644 --- a/files/data/l10n/OMWEngine/fr.yaml +++ b/files/data/l10n/OMWEngine/fr.yaml @@ -125,7 +125,7 @@ LightsFadeStartMultiplier: "Seuil de perte d'éclat lumineux" LightsFadeStartMultiplierTooltip: "valeur par défaut: 0.85\nFraction de la distance maximale d'une source à partir de laquelle l'intensité lumineuse commence à décroître.\n\nSélectionnez une valeur basse pour une transition douce ou une valeur plus élevée pour une transition plus abrupte." LightsLightingMethodTooltip: "Définit la gestion des sources lumineuses :\n\n \"Traditionnelle\" Chaque objet est éclairé par 8 sources lumineuses. Cet méthode est la plus proche du jeu original.\n\n - \"Shaders (mode de compatibilité)\" supprime la limite des 8 sources lumineuses. Cette méthode permet d'éclairer la végétation au sol, mais aussi de configurer à quel distance une source lumineuse s'estompe. Ce choix est recommandé pour les ordinateurs plus anciens avec un nombre de sources lumineuses proche de 8.\n\n + \"Shaders (mode de compatibilité)\" supprime la limite des 8 sources lumineuses. Cette méthode permet d'éclairer la végétation au sol. Ce choix est recommandé pour les ordinateurs plus anciens avec un nombre de sources lumineuses proche de 8.\n\n \"Shaders\" offre tous les bénéfices apportés par \"Shaders (mode de compatibilité)\", mais utilise une approche moderne. Celle-ci permet, sur du matériel moderne, d'augmenter le nombre de sources lumineuses par objet sans perte de performance." LightsMaximumDistance: "Distance maximale des sources lumineuses" LightsMaximumDistanceTooltip: "valeur par défaut: 8192\nDistance maximale d'affichage des sources lumineuses (en unité de distance).\n\nMettez cette valeur à 0 pour une distance d'affichage infinie." diff --git a/files/data/l10n/OMWEngine/ru.yaml b/files/data/l10n/OMWEngine/ru.yaml index 76f4076862..ffaba85859 100644 --- a/files/data/l10n/OMWEngine/ru.yaml +++ b/files/data/l10n/OMWEngine/ru.yaml @@ -125,7 +125,7 @@ LightsFadeStartMultiplier: "Множитель начала затухания" LightsFadeStartMultiplierTooltip: "Значение по умолчанию: 0.85\nДоля расстояния (относительно дальности отображения источников света), на которой свет начинает затухать.\n\nНизкие значения ведут к плавному затуханию, высокие - к резкому." LightsLightingMethodTooltip: "Задает способ обработки источников света.\n\n \"Устаревший\" всегда использует 8 источников света на объект и выдает освещение, наиболее близкое к таковому в оригинальной игре.\n\n - \"Шейдеры (режим совместимости)\" убирает ограничение в 8 источников света. Этот режим также позволяет освещению влиять на анимированную траву и позволяет настроить угасание света на расстоянии. Рекомендуется использовать этот режим на устаревшем аппаратном обеспечении и с количеством источников света на объект около 8.\n\n + \"Шейдеры (режим совместимости)\" убирает ограничение в 8 источников света. Этот режим также позволяет освещению влиять на анимированную траву. Рекомендуется использовать этот режим на устаревшем аппаратном обеспечении и с количеством источников света на объект около 8.\n\n \"Шейдеры\" работает аналогично режиму \"Шейдеры (режим совместимости)\", но использует более современный подход, позволяющий использовать большее количество источников света с минимальным влиянием на производительность на современном аппаратном обеспечении." LightsMaximumDistance: "Дальность отображения источников света" LightsMaximumDistanceTooltip: "Значение по умолчанию: 8192\nМаксимальное расстояние, на котором будут отображаться источники света (во внутриигровых единицах измерения).\n\nЕсли 0, то расстояние не ограничено." diff --git a/files/data/l10n/OMWEngine/sv.yaml b/files/data/l10n/OMWEngine/sv.yaml index dcd5a9033c..5103db9ed3 100644 --- a/files/data/l10n/OMWEngine/sv.yaml +++ b/files/data/l10n/OMWEngine/sv.yaml @@ -126,7 +126,7 @@ LightsFadeStartMultiplier: "Blekningsstartmultiplikator" LightsFadeStartMultiplierTooltip: "Förvalt: 0.85\nFraktion av det maximala avståndet från vilket ljuskällor börjar blekna.\n\nVälj lågt värde för långsammare övergång eller högre värde för snabbare övergång." LightsLightingMethodTooltip: "Välj intern hantering av ljuskällor.\n\n \"Gammaldags\" använder alltid max 8 ljuskällor per objekt och ger ljussättning likt ett gammaldags spel.\n\n - \"Shader (kompatibilitet)\" tar bort begränsningen med max 8 ljuskällor per objekt. Detta läge aktiverar också ljus på marktäckning och ett konfigurerbart ljusbleknande. Rekommenderas för äldre hårdvara tillsammans med en ljusbegränsning nära 8.\n\n + \"Shader (kompatibilitet)\" tar bort begränsningen med max 8 ljuskällor per objekt. Detta läge aktiverar också ljus på marktäckning. Rekommenderas för äldre hårdvara tillsammans med en ljusbegränsning nära 8.\n\n \"Shader\" har alla fördelar som \"Shader (kompatibilitet)\" har, med med ett modernt förhållningssätt som möjliggör fler maximalt antal ljuskällor med liten eller ingen prestandaförlust på modern hårdvara." LightsMaximumDistance: "Maximalt ljusavstånd" LightsMaximumDistanceTooltip: "Förvalt: 8192\nMaximala avståndet där ljuskällor syns (mätt i enheter).\n\nVärdet 0 ger oändligt avstånd." From 6ad914919b50f749a02210b50aa6fcae9ae9b3ff Mon Sep 17 00:00:00 2001 From: Alexei Kotov Date: Sat, 1 Jun 2024 14:13:00 +0300 Subject: [PATCH 2/2] Remove launcher lighting settings that support runtime changes Also update lighting method descriptions --- apps/launcher/settingspage.cpp | 25 ------ apps/launcher/settingspage.hpp | 1 - apps/launcher/ui/settingspage.ui | 128 ++----------------------------- files/lang/launcher_de.ts | 40 +--------- files/lang/launcher_en.ts | 40 +--------- files/lang/launcher_fr.ts | 42 +--------- files/lang/launcher_ru.ts | 42 +--------- files/lang/launcher_sv.ts | 42 +--------- 8 files changed, 18 insertions(+), 342 deletions(-) diff --git a/apps/launcher/settingspage.cpp b/apps/launcher/settingspage.cpp index ee160c74ca..d336ab4f17 100644 --- a/apps/launcher/settingspage.cpp +++ b/apps/launcher/settingspage.cpp @@ -254,15 +254,6 @@ bool Launcher::SettingsPage::loadSettings() connect(shadowDistanceCheckBox, &QCheckBox::toggled, this, &SettingsPage::slotShadowDistLimitToggled); - lightsMaxLightsSpinBox->setValue(Settings::shaders().mMaxLights); - lightsMaximumDistanceSpinBox->setValue(Settings::shaders().mMaximumLightDistance); - lightFadeMultiplierSpinBox->setValue(Settings::shaders().mLightFadeStart); - lightsBoundingSphereMultiplierSpinBox->setValue(Settings::shaders().mLightBoundsMultiplier); - lightsMinimumInteriorBrightnessSpinBox->setValue(Settings::shaders().mMinimumInteriorBrightness); - - connect(lightingMethodComboBox, qOverload(&QComboBox::currentIndexChanged), this, - &SettingsPage::slotLightTypeCurrentIndexChanged); - int lightingMethod = 1; switch (Settings::shaders().mLightingMethod) { @@ -277,7 +268,6 @@ bool Launcher::SettingsPage::loadSettings() break; } lightingMethodComboBox->setCurrentIndex(lightingMethod); - slotLightTypeCurrentIndexChanged(lightingMethod); } // Audio @@ -472,12 +462,6 @@ void Launcher::SettingsPage::saveSettings() Settings::shadows().mComputeSceneBounds.set("primitives"); else Settings::shadows().mComputeSceneBounds.set("none"); - - Settings::shaders().mMaxLights.set(lightsMaxLightsSpinBox->value()); - Settings::shaders().mMaximumLightDistance.set(lightsMaximumDistanceSpinBox->value()); - Settings::shaders().mLightFadeStart.set(lightFadeMultiplierSpinBox->value()); - Settings::shaders().mLightBoundsMultiplier.set(lightsBoundingSphereMultiplierSpinBox->value()); - Settings::shaders().mMinimumInteriorBrightness.set(lightsMinimumInteriorBrightnessSpinBox->value()); } // Audio @@ -595,12 +579,3 @@ void Launcher::SettingsPage::slotDistantLandToggled(bool checked) activeGridObjectPagingCheckBox->setEnabled(checked); objectPagingMinSizeComboBox->setEnabled(checked); } - -void Launcher::SettingsPage::slotLightTypeCurrentIndexChanged(int index) -{ - lightsMaximumDistanceSpinBox->setEnabled(index != 0); - lightFadeMultiplierSpinBox->setEnabled(index != 0); - lightsMaxLightsSpinBox->setEnabled(index != 0); - lightsBoundingSphereMultiplierSpinBox->setEnabled(index != 0); - lightsMinimumInteriorBrightnessSpinBox->setEnabled(index != 0); -} diff --git a/apps/launcher/settingspage.hpp b/apps/launcher/settingspage.hpp index 652b8ce82d..d2bb80d86a 100644 --- a/apps/launcher/settingspage.hpp +++ b/apps/launcher/settingspage.hpp @@ -34,7 +34,6 @@ namespace Launcher void slotSkyBlendingToggled(bool checked); void slotShadowDistLimitToggled(bool checked); void slotDistantLandToggled(bool checked); - void slotLightTypeCurrentIndexChanged(int index); private: Config::GameSettings& mGameSettings; diff --git a/apps/launcher/ui/settingspage.ui b/apps/launcher/ui/settingspage.ui index 14aa0118cb..758e08481e 100644 --- a/apps/launcher/ui/settingspage.ui +++ b/apps/launcher/ui/settingspage.ui @@ -1027,17 +1027,7 @@ - - - - <html><head/><body><p>Maximum distance at which lights will appear (measured in units).</p><p>Set this to 0 to use an unlimited distance.</p></body></html> - - - Maximum Light Distance - - - - + Qt::Vertical @@ -1050,32 +1040,12 @@ - - - - <html><head/><body><p>Maximum number of lights per object.</p><p>A low number near default will cause light popping similar to what you would see with legacy lighting.</p></body></html> - - - Max Lights - - - - - - - <html><head/><body><p>Fraction of maximum distance at which lights will start to fade.</p><p>Set this to a low value for slower transitions or a high value for quicker transitions.</p></body></html> - - - Fade Start Multiplier - - - - + <html><head/><body><p>Set the internal handling of light sources.</p> -<p> "Legacy" always uses 8 lights per object and provides a lighting closest to an original game.</p> -<p>"Shaders (compatibility)" removes the 8 light limit. This mode also enables lighting on groundcover and a configurable light fade. It is recommended to use this with older hardware and a light limit closer to 8.</p> +<p> "Legacy" always uses 8 lights per object. It provides results most similar to Morrowind's lighting.</p> +<p>"Shaders (compatibility)" removes the 8 light limit. This mode also enables lighting on groundcover. It is recommended to use this with older hardware and a light limit closer to 8.</p> <p> "Shaders" carries all of the benefits that "Shaders (compatibility)" does, but uses a modern approach that allows for a higher max lights count with little to no performance penalties on modern hardware.</p></body></html> @@ -1083,7 +1053,7 @@ - + @@ -1102,94 +1072,6 @@ - - - - <html><head/><body><p>Multipler for bounding sphere of lights.</p><p>Higher numbers allows for smooth falloff but require an increase in number of max lights.</p><p>Does not effect the illumination or strength of lights.</p></body></html> - - - Bounding Sphere Multiplier - - - - - - - <html><head/><body><p>Minimum ambient interior brightness.</p><p>Increase this if you feel interiors are too dark.</p></body></html> - - - Minimum Interior Brightness - - - - - - - 5.000000000000000 - - - 0.050000000000000 - - - 1.650000000000000 - - - - - - - 1.000000000000000 - - - 0.010000000000000 - - - 0.850000000000000 - - - - - - - 1.000000000000000 - - - 0.010000000000000 - - - 0.080000000000000 - - - - - - - unit(s) - - - 8192 - - - 128 - - - 8192 - - - - - - - 2 - - - 64 - - - 2 - - - diff --git a/files/lang/launcher_de.ts b/files/lang/launcher_de.ts index e6ce031ac7..a39a3de4fd 100644 --- a/files/lang/launcher_de.ts +++ b/files/lang/launcher_de.ts @@ -1060,22 +1060,10 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov <html><head/><body><p>Effects of reflected Absorb spells are not mirrored - like in Morrowind.</p></body></html> - - <html><head/><body><p>Maximum distance at which lights will appear (measured in units).</p><p>Set this to 0 to use an unlimited distance.</p></body></html> - - - - <html><head/><body><p>Maximum number of lights per object.</p><p>A low number near default will cause light popping similar to what you would see with legacy lighting.</p></body></html> - - - - <html><head/><body><p>Fraction of maximum distance at which lights will start to fade.</p><p>Set this to a low value for slower transitions or a high value for quicker transitions.</p></body></html> - - <html><head/><body><p>Set the internal handling of light sources.</p> -<p> "Legacy" always uses 8 lights per object and provides a lighting closest to an original game.</p> -<p>"Shaders (compatibility)" removes the 8 light limit. This mode also enables lighting on groundcover and a configurable light fade. It is recommended to use this with older hardware and a light limit closer to 8.</p> +<p> "Legacy" always uses 8 lights per object. It provides results most similar to Morrowind's lighting.</p> +<p>"Shaders (compatibility)" removes the 8 light limit. This mode also enables lighting on groundcover. It is recommended to use this with older hardware and a light limit closer to 8.</p> <p> "Shaders" carries all of the benefits that "Shaders (compatibility)" does, but uses a modern approach that allows for a higher max lights count with little to no performance penalties on modern hardware.</p></body></html> @@ -1087,14 +1075,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov Shaders (compatibility) - - <html><head/><body><p>Multipler for bounding sphere of lights.</p><p>Higher numbers allows for smooth falloff but require an increase in number of max lights.</p><p>Does not effect the illumination or strength of lights.</p></body></html> - - - - <html><head/><body><p>Minimum ambient interior brightness.</p><p>Increase this if you feel interiors are too dark.</p></body></html> - - In third-person view, use the camera as the sound listener instead of the player character. @@ -1315,26 +1295,10 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov Enable Terrain Shadows - - Maximum Light Distance - - - - Max Lights - - Lighting Method - - Bounding Sphere Multiplier - - - - Minimum Interior Brightness - - Audio Device diff --git a/files/lang/launcher_en.ts b/files/lang/launcher_en.ts index b18803ff2f..de20f743e8 100644 --- a/files/lang/launcher_en.ts +++ b/files/lang/launcher_en.ts @@ -1196,30 +1196,10 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov Lighting - - <html><head/><body><p>Maximum distance at which lights will appear (measured in units).</p><p>Set this to 0 to use an unlimited distance.</p></body></html> - - - - Maximum Light Distance - - - - <html><head/><body><p>Maximum number of lights per object.</p><p>A low number near default will cause light popping similar to what you would see with legacy lighting.</p></body></html> - - - - Max Lights - - - - <html><head/><body><p>Fraction of maximum distance at which lights will start to fade.</p><p>Set this to a low value for slower transitions or a high value for quicker transitions.</p></body></html> - - <html><head/><body><p>Set the internal handling of light sources.</p> -<p> "Legacy" always uses 8 lights per object and provides a lighting closest to an original game.</p> -<p>"Shaders (compatibility)" removes the 8 light limit. This mode also enables lighting on groundcover and a configurable light fade. It is recommended to use this with older hardware and a light limit closer to 8.</p> +<p> "Legacy" always uses 8 lights per object. It provides results most similar to Morrowind's lighting.</p> +<p>"Shaders (compatibility)" removes the 8 light limit. This mode also enables lighting on groundcover. It is recommended to use this with older hardware and a light limit closer to 8.</p> <p> "Shaders" carries all of the benefits that "Shaders (compatibility)" does, but uses a modern approach that allows for a higher max lights count with little to no performance penalties on modern hardware.</p></body></html> @@ -1235,22 +1215,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov Shaders (compatibility) - - <html><head/><body><p>Multipler for bounding sphere of lights.</p><p>Higher numbers allows for smooth falloff but require an increase in number of max lights.</p><p>Does not effect the illumination or strength of lights.</p></body></html> - - - - Bounding Sphere Multiplier - - - - <html><head/><body><p>Minimum ambient interior brightness.</p><p>Increase this if you feel interiors are too dark.</p></body></html> - - - - Minimum Interior Brightness - - Audio diff --git a/files/lang/launcher_fr.ts b/files/lang/launcher_fr.ts index cb8c675c0f..688726cf96 100644 --- a/files/lang/launcher_fr.ts +++ b/files/lang/launcher_fr.ts @@ -1060,26 +1060,14 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov <html><head/><body><p>Effects of reflected Absorb spells are not mirrored - like in Morrowind.</p></body></html> <html><body><p>L'effet réfléchi des sorts d'absorption n'est pas appliqué, comme dans le moteur original.</p></body></html> - - <html><head/><body><p>Maximum distance at which lights will appear (measured in units).</p><p>Set this to 0 to use an unlimited distance.</p></body></html> - <html><body><p>Distance maximale d'affichage des sources lumineuses (en unité de distance).</p><p>Mettez cette valeur à 0 pour une distance d'affichage infinie.</p></body></html> - - - <html><head/><body><p>Maximum number of lights per object.</p><p>A low number near default will cause light popping similar to what you would see with legacy lighting.</p></body></html> - <html><body><p>Nombre maximum de sources lumineuses par objet.</p><p>Une valeur faible mène à des apparitions tardives des sources lumineuses similaires à celles obtenues avec la méthode d'éclairage traditionnelle.</p></body></html> - - - <html><head/><body><p>Fraction of maximum distance at which lights will start to fade.</p><p>Set this to a low value for slower transitions or a high value for quicker transitions.</p></body></html> - <html><body><p>Fraction de la distance maximale d'une source à partir de laquelle l'intensité lumineuse commence à décroître.</p><p>Sélectionnez une valeur basse pour une transition douce ou une valeur plus élevée pour une transition plus abrupte.</p></body></html> - <html><head/><body><p>Set the internal handling of light sources.</p> -<p> "Legacy" always uses 8 lights per object and provides a lighting closest to an original game.</p> -<p>"Shaders (compatibility)" removes the 8 light limit. This mode also enables lighting on groundcover and a configurable light fade. It is recommended to use this with older hardware and a light limit closer to 8.</p> +<p> "Legacy" always uses 8 lights per object. It provides results most similar to Morrowind's lighting.</p> +<p>"Shaders (compatibility)" removes the 8 light limit. This mode also enables lighting on groundcover. It is recommended to use this with older hardware and a light limit closer to 8.</p> <p> "Shaders" carries all of the benefits that "Shaders (compatibility)" does, but uses a modern approach that allows for a higher max lights count with little to no performance penalties on modern hardware.</p></body></html> <html><body><p>Définit la gestion des sources lumineuses :</p> <p>"Traditionnelle" Chaque objet est éclairé par 8 sources lumineuses. Cet méthode est la plus proche du jeu original.</p> -<p>"Shaders (mode de compatibilité)" supprime la limite des 8 sources lumineuses. Cette méthode permet d'éclairer la végétation au sol, mais aussi de configurer à quel distance une source lumineuse s'estompe. Ce choix est recommandé pour les ordinateurs plus anciens avec un nombre de sources lumineuses proche de 8.</p> +<p>"Shaders (mode de compatibilité)" supprime la limite des 8 sources lumineuses. Cette méthode permet d'éclairer la végétation au sol. Ce choix est recommandé pour les ordinateurs plus anciens avec un nombre de sources lumineuses proche de 8.</p> <p>"Shaders" offre tous les bénéfices apportés par "Shaders (mode de compatibilité)", mais utilise une approche moderne. Celle-ci permet, sur du matériel moderne, d'augmenter le nombre de sources lumineuses par objet sans perte de performance."</p></body></html> @@ -1090,14 +1078,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov Shaders (compatibility) Shaders (mode de compatibilité) - - <html><head/><body><p>Multipler for bounding sphere of lights.</p><p>Higher numbers allows for smooth falloff but require an increase in number of max lights.</p><p>Does not effect the illumination or strength of lights.</p></body></html> - <html><body><p>Multiplicateur pour le rayon de la sphère incluant les sources lumineuses.</p><p>Un multiplicateur plus élevé permet une extinction plus douce, mais applique un plus grand nombre de sources lumineuses sur chaque objet.</p><p>Ce paramètre ne modifie ni l'intensité ni la luminance des lumières.</body></html> - - - <html><head/><body><p>Minimum ambient interior brightness.</p><p>Increase this if you feel interiors are too dark.</p></body></html> - <html><head/><body><p>Luminosité ambiante minimale en intérieur.</p><p>Augmentez cette valeur si les intérieurs vous semblent trop sombres.</p></body></html> - In third-person view, use the camera as the sound listener instead of the player character. En vue à la troisième personne, le jeu reproduit le son reçu par la caméra au lieu de celui reçu par tête du personnage joueur. @@ -1318,26 +1298,10 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov Enable Terrain Shadows Ombre des terrains - - Maximum Light Distance - Portée maximale des sources lumineuse - - - Max Lights - Nombre maximum de sources lumineuses - Lighting Method Méthode d'illumination - - Bounding Sphere Multiplier - Multiplicateur de portée des sphères lumineuses - - - Minimum Interior Brightness - Luminosité intérieure minimale - Audio Device Périphérique audio diff --git a/files/lang/launcher_ru.ts b/files/lang/launcher_ru.ts index 6330fadfd2..a64eae38a3 100644 --- a/files/lang/launcher_ru.ts +++ b/files/lang/launcher_ru.ts @@ -1424,34 +1424,14 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov Screenshot Format Формат снимков экрана - - <html><head/><body><p>Maximum distance at which lights will appear (measured in units).</p><p>Set this to 0 to use an unlimited distance.</p></body></html> - <html><head/><body><p>Максимальное расстояние, на котором будут отображаться источники света (во внутриигровых единицах измерения).</p><p>Если 0, то расстояние не ограничено.</p></body></html> - - - Maximum Light Distance - Дальность отображения источников света - - - <html><head/><body><p>Maximum number of lights per object.</p><p>A low number near default will cause light popping similar to what you would see with legacy lighting.</p></body></html> - <html><head/><body><p>Максимальное количество источников света для каждого объекта.</p><p>Низкие числа (близкие к значению по умолчанию) приводят к резким перепадам освещения, как при устаревшем методе освещения.</p></body></html> - - - Max Lights - Макс. кол-во источников света - - - <html><head/><body><p>Fraction of maximum distance at which lights will start to fade.</p><p>Set this to a low value for slower transitions or a high value for quicker transitions.</p></body></html> - <html><head/><body><p>Доля расстояния (относительно дальности отображения источников света), на которой свет начинает затухать.</p><p>Низкие значения ведут к плавному затуханию, высокие - к резкому.</p></body></html> - <html><head/><body><p>Set the internal handling of light sources.</p> -<p> "Legacy" always uses 8 lights per object and provides a lighting closest to an original game.</p> -<p>"Shaders (compatibility)" removes the 8 light limit. This mode also enables lighting on groundcover and a configurable light fade. It is recommended to use this with older hardware and a light limit closer to 8.</p> +<p> "Legacy" always uses 8 lights per object. It provides results most similar to Morrowind's lighting.</p> +<p>"Shaders (compatibility)" removes the 8 light limit. This mode also enables lighting on groundcover. It is recommended to use this with older hardware and a light limit closer to 8.</p> <p> "Shaders" carries all of the benefits that "Shaders (compatibility)" does, but uses a modern approach that allows for a higher max lights count with little to no performance penalties on modern hardware.</p></body></html> <html><head/><body><p>Задает способ обработки источников света.</p> <p> "Устаревший" всегда использует 8 источников света на объект и выдает освещение, наиболее близкое к таковому в оригинальной игре.</p> -<p>"Шейдеры (режим совместимости)" убирает ограничение в 8 источников света. Этот режим также позволяет освещению влиять на анимированную траву и позволяет настроить угасание света на расстоянии. Рекомендуется использовать этот режим на устаревшем аппаратном обеспечении и с количеством источников света на объект около 8.</p> +<p>"Шейдеры (режим совместимости)" убирает ограничение в 8 источников света. Этот режим также позволяет освещению влиять на анимированную траву. Рекомендуется использовать этот режим на устаревшем аппаратном обеспечении и с количеством источников света на объект около 8.</p> <p> "Шейдеры" работает аналогично режиму "Шейдеры (режим совместимости)" но использует более современный подход, позволяющий использовать большее количество источников света с минимальным влиянием на производительность на современном аппаратном обеспечении.</p></body></html> @@ -1462,18 +1442,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov Shaders (compatibility) Шейдеры (режим совместимости) - - <html><head/><body><p>Multipler for bounding sphere of lights.</p><p>Higher numbers allows for smooth falloff but require an increase in number of max lights.</p><p>Does not effect the illumination or strength of lights.</p></body></html> - <html><head/><body><p>Множитель размера ограничивающей сферы источников света.</p><p>Высокие значения делают затухание света плавнее, но требуют более высокого максимального количества источников света.</p><p>Настройка не влияет на уровень освещения или мощность источников света.</p></body></html> - - - Bounding Sphere Multiplier - Множитель размера ограничивающей сферы - - - <html><head/><body><p>Minimum ambient interior brightness.</p><p>Increase this if you feel interiors are too dark.</p></body></html> - <html><head/><body><p>Минимальный уровень фонового освещения в помещениях.</p><p>Увеличьте значение, если помещения в игре кажутся слишком темными.</p></body></html> - In third-person view, use the camera as the sound listener instead of the player character. Использовать в виде от третьего лица положение камеры, а не персонажа игрока для прослушивания звуков. @@ -1482,9 +1450,5 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov Use the Camera as the Sound Listener Использовать камеру как слушателя - - Minimum Interior Brightness - Минимальный уровень освещения в помещениях - diff --git a/files/lang/launcher_sv.ts b/files/lang/launcher_sv.ts index 3d65d8c240..59d076b79c 100644 --- a/files/lang/launcher_sv.ts +++ b/files/lang/launcher_sv.ts @@ -1073,26 +1073,14 @@ de ordinarie fonterna i Morrowind. Bocka denna ruta om du ändå föredrar ordin <html><head/><body><p>Effects of reflected Absorb spells are not mirrored - like in Morrowind.</p></body></html> <html><head/><body><p>Effekter av reflekterade "Absorb"-besvärjelser speglas inte – såsom i Morrowind.</p></body></html> - - <html><head/><body><p>Maximum distance at which lights will appear (measured in units).</p><p>Set this to 0 to use an unlimited distance.</p></body></html> - <html><head/><body><p>Maximala avståndet där ljuskällor syns (mätt i enheter).</p><p>Värdet 0 ger oändligt avstånd.</p></body></html> - - - <html><head/><body><p>Maximum number of lights per object.</p><p>A low number near default will cause light popping similar to what you would see with legacy lighting.</p></body></html> - <html><head/><body><p>Maximalt antal ljuskällor per objekt.</p><p>Ett lågt tal nära det förvalda kommer orsaka att ljuskällor poppar upp som vid ljussättningsmetoden Gammaldags.</p></body></html> - - - <html><head/><body><p>Fraction of maximum distance at which lights will start to fade.</p><p>Set this to a low value for slower transitions or a high value for quicker transitions.</p></body></html> - <html><head/><body><p>Fraktion av det maximala avståndet från vilket ljuskällor börjar blekna.</p><p>Välj ett lågt värde för långsammare övergång eller högre värde för snabbare övergång.</p></body></html> - <html><head/><body><p>Set the internal handling of light sources.</p> -<p> "Legacy" always uses 8 lights per object and provides a lighting closest to an original game.</p> -<p>"Shaders (compatibility)" removes the 8 light limit. This mode also enables lighting on groundcover and a configurable light fade. It is recommended to use this with older hardware and a light limit closer to 8.</p> +<p> "Legacy" always uses 8 lights per object. It provides results most similar to Morrowind's lighting.</p> +<p>"Shaders (compatibility)" removes the 8 light limit. This mode also enables lighting on groundcover. It is recommended to use this with older hardware and a light limit closer to 8.</p> <p> "Shaders" carries all of the benefits that "Shaders (compatibility)" does, but uses a modern approach that allows for a higher max lights count with little to no performance penalties on modern hardware.</p></body></html> <html><head/><body><p>Välj intern hantering av ljuskällor.</p> <p> "Gammaldags" använder alltid max 8 ljuskällor per objekt och ger ljussättning likt ett gammaldags spel.</p> -<p>"Shader (kompatibilitet)" tar bort begränsningen med max 8 ljuskällor per objekt. Detta läge aktiverar också ljus på marktäckning och ett konfigurerbart ljusbleknande. Rekommenderas för äldre hårdvara tillsammans med en ljusbegränsning nära 8.</p> +<p>"Shader (kompatibilitet)" tar bort begränsningen med max 8 ljuskällor per objekt. Detta läge aktiverar också ljus på marktäckning. Rekommenderas för äldre hårdvara tillsammans med en ljusbegränsning nära 8.</p> <p> "Shader" har alla fördelar som "Shader (kompatibilitet)" har, men med ett modernt förhållningssätt som möjliggör fler maximalt antal ljuskällor med liten eller ingen prestandaförlust på modern hårdvara.</p></body></html> @@ -1103,14 +1091,6 @@ de ordinarie fonterna i Morrowind. Bocka denna ruta om du ändå föredrar ordin Shaders (compatibility) Shader (kompatibilitet) - - <html><head/><body><p>Multipler for bounding sphere of lights.</p><p>Higher numbers allows for smooth falloff but require an increase in number of max lights.</p><p>Does not effect the illumination or strength of lights.</p></body></html> - <html><head/><body><p>Multiplikator för ljusens gränssfär.</p><p>Högre värden ger mjukare minskning av gränssfären, men kräver högre värde i Max antal ljuskällor.</p><p>Påverkar inte ljusstyrkan.</p></body></html> - - - <html><head/><body><p>Minimum ambient interior brightness.</p><p>Increase this if you feel interiors are too dark.</p></body></html> - <html><head/><body><p>Minsta omgivande ljusstyrka i interiörer.</p><p>Öka värdet om du anser att interiörer är för mörka.</p></body></html> - In third-person view, use the camera as the sound listener instead of the player character. Använd kameran som ljudlyssnare istället för spelarrollfiguren i tredjepersonsperspektivet. @@ -1334,26 +1314,10 @@ de ordinarie fonterna i Morrowind. Bocka denna ruta om du ändå föredrar ordin Enable Terrain Shadows Aktivera terrängskuggor - - Maximum Light Distance - Maximalt ljusavstånd - - - Max Lights - Max antal ljuskällor - Lighting Method Ljussättningsmetod - - Bounding Sphere Multiplier - Gränssfärsmultiplikator - - - Minimum Interior Brightness - Minsta ljusstyrka i interiörer - Audio Device Ljudenhet