Merge branch 'telvanni-photon-magic' into 'master'

Project Magnus (Volume Tiled Forward Shading)

Closes #6900

See merge request OpenMW/openmw!5212

Author: Capostrophic

.gitlab-ci.yml

@@ -88,7 +88,7 @@ Ubuntu_GCC_preprocess:
     - if [[ "${BUILD_TESTS_ONLY}" && ! "${BUILD_WITH_CODE_COVERAGE}" ]]; then ./openmw_settings_access_benchmark; fi
     - ccache -svv
     - df -h
-    - if [[ "${BUILD_WITH_CODE_COVERAGE}" ]]; then ~/.local/bin/gcovr --xml-pretty --exclude-unreachable-branches --gcov-ignore-parse-errors=negative_hits.warn_once_per_file --print-summary --root "${CI_PROJECT_DIR}" -j $(nproc) -o ../coverage.xml; fi
+    - if [[ "${BUILD_WITH_CODE_COVERAGE}" ]]; then ~/.local/bin/gcovr --merge-mode-functions merge-use-line-max --xml-pretty --exclude-unreachable-branches --gcov-ignore-parse-errors=negative_hits.warn_once_per_file --print-summary --root "${CI_PROJECT_DIR}" -j $(nproc) -o ../coverage.xml; fi
     # this line must be updated when artifacts are added or they'll be deleted, but if we get rid of it, we run out of disk space while archiving
     - find * -type f | grep -v -e '^extern/' -e '^install/' -e 'CMakeCache\.txt$' -e '^components-tests.xml$' -e '^openmw-tests.xml$' -e '^openmw-cs-tests.xml$' | xargs rm -f
     - cd ..
@@ -425,7 +425,7 @@ Ubuntu_Clang:
     CTCACHE_CLANG_TIDY: /usr/bin/clang-tidy-19
     CTCACHE_SAVE_OUTPUT: 1
     CTCACHE_DIR: $CI_PROJECT_DIR/ctcache
-    
+
     CMAKE_CXX_CLANG_TIDY: 'clang_tidy_cache.py;$CTCACHE_CLANG_TIDY'
   script:
     - mkdir -pv "${CCACHE_DIR}"

apps/components_tests/resource/testresourcesystem.cpp

@@ -27,7 +27,8 @@ namespace
 
         auto shadowDefines = SceneUtil::ShadowManager::getShadowsDisabledDefines();
 
-        osg::ref_ptr<SceneUtil::LightManager> lightManager = new SceneUtil::LightManager(SceneUtil::LightSettings{});
+        osg::ref_ptr<SceneUtil::LightManager> lightManager
+            = new SceneUtil::LightManager(SceneUtil::LightSettings{}, &resourceSystem);
         auto lightDefines = lightManager->getLightDefines();
 
         for (const auto& define : shadowDefines)

apps/launcher/settingspage.cpp

@@ -330,18 +330,6 @@ bool Launcher::SettingsPage::loadSettings()
         }
 
         connect(shadowDistanceCheckBox, &QCheckBox::toggled, this, &SettingsPage::slotShadowDistLimitToggled);
-
-        int lightingMethod = 0;
-        switch (Settings::shaders().mLightingMethod)
-        {
-            case SceneUtil::LightingMethod::PerObjectUniform:
-                lightingMethod = 0;
-                break;
-            case SceneUtil::LightingMethod::SingleUBO:
-                lightingMethod = 1;
-                break;
-        }
-        lightingMethodComboBox->setCurrentIndex(lightingMethod);
     }
 
     // Audio
@@ -584,12 +572,6 @@ void Launcher::SettingsPage::saveSettings()
         saveSettingBool(*skyBlendingCheckBox, Settings::fog().mSkyBlending);
         Settings::fog().mSkyBlendingStart.set(skyBlendingStartComboBox->value());
 
-        static constexpr std::array<SceneUtil::LightingMethod, 2> lightingMethodMap = {
-            SceneUtil::LightingMethod::PerObjectUniform,
-            SceneUtil::LightingMethod::SingleUBO,
-        };
-        Settings::shaders().mLightingMethod.set(lightingMethodMap[lightingMethodComboBox->currentIndex()]);
-
         const int cShadowDist
             = shadowDistanceCheckBox->checkState() != Qt::Unchecked ? shadowDistanceSpinBox->value() : 0;
         Settings::shadows().mMaximumShadowMapDistance.set(cShadowDist);

apps/launcher/ui/settingspage.ui

@@ -1022,56 +1022,6 @@
              </item>
             </layout>
            </widget>
-           <widget class="QWidget" name="lightingTab">
-            <attribute name="title">
-             <string>Lighting</string>
-            </attribute>
-            <layout class="QHBoxLayout" name="horizontalLightingLayout">
-             <item>
-              <layout class="QGridLayout" name="lightingLayout" columnstretch="0,0">
-               <item row="2" column="1">
-                <spacer name="verticalSpacer_10">
-                 <property name="orientation">
-                  <enum>Qt::Vertical</enum>
-                 </property>
-                 <property name="sizeHint" stdset="0">
-                  <size>
-                   <width>20</width>
-                   <height>40</height>
-                  </size>
-                 </property>
-                </spacer>
-               </item>
-               <item row="1" column="0">
-                <widget class="QLabel" name="lightingMethodLabel">
-                 <property name="toolTip">
-                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set the internal handling of light sources.&lt;/p&gt;
-&lt;p&gt;&quot;Shaders (compatibility)&quot; It is recommended to use this with older hardware and a light limit closer to 8.&lt;/p&gt;
-&lt;p&gt; &quot;Shaders&quot; carries all of the benefits that &quot;Shaders (compatibility)&quot; does, but uses a modern approach that allows for a higher max lights count with little to no performance penalties on modern hardware.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                 </property>
-                 <property name="text">
-                  <string>Lighting Method</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="1">
-                <widget class="QComboBox" name="lightingMethodComboBox">
-                 <item>
-                  <property name="text">
-                   <string>Shaders (compatibility)</string>
-                  </property>
-                 </item>
-                 <item>
-                  <property name="text">
-                   <string>Shaders</string>
-                  </property>
-                 </item>
-                </widget>
-               </item>
-              </layout>
-             </item>
-            </layout>
-           </widget>
           </widget>
          </item>
         </layout>

apps/opencs/model/world/data.cpp

@@ -158,7 +158,8 @@ CSMWorld::Data::Data(ToUTF8::FromType encoding, const Files::PathContainer& data
 
     auto shadowDefines = SceneUtil::ShadowManager::getShadowsDisabledDefines();
 
-    osg::ref_ptr<SceneUtil::LightManager> lightManager = new SceneUtil::LightManager(SceneUtil::LightSettings{});
+    osg::ref_ptr<SceneUtil::LightManager> lightManager
+        = new SceneUtil::LightManager(SceneUtil::LightSettings{}, mResourceSystem.get());
     auto lightDefines = lightManager->getLightDefines();
 
     for (const auto& define : shadowDefines)

apps/opencs/view/render/scenewidget.cpp

@@ -22,8 +22,6 @@
 #include <osg/GraphicsContext>
 #include <osg/Group>
 #include <osg/Light>
-#include <osg/LightModel>
-#include <osg/LightSource>
 #include <osg/Material>
 #include <osg/Matrix>
 #include <osg/PrimitiveSet>
@@ -147,22 +145,17 @@ namespace CSVRender
 
         mView->getCamera()->setGraphicsContext(window);
 
-        osg::ref_ptr<SceneUtil::LightManager> lightMgr = new SceneUtil::LightManager(SceneUtil::LightSettings{});
-        lightMgr->setStartLight(1);
+        osg::ref_ptr<SceneUtil::LightManager> lightMgr
+            = new SceneUtil::LightManager(SceneUtil::LightSettings{}, resourceSystem.get());
         lightMgr->setLightingMask(Mask_Lighting);
 
-        osg::ref_ptr<osg::LightSource> source = new osg::LightSource;
-        source->setNodeMask(Mask_Lighting);
         mSunLight = new osg::Light;
-        source->setLight(mSunLight);
         mSunLight->setDiffuse(osg::Vec4f(0, 0, 0, 1));
         mSunLight->setAmbient(osg::Vec4f(0, 0, 0, 1));
         mSunLight->setSpecular(osg::Vec4f(0, 0, 0, 0));
         mSunLight->setConstantAttenuation(1.f);
         lightMgr->setSunlight(mSunLight);
 
-        lightMgr->addChild(source);
-
         mRootNode = std::move(lightMgr);
 
         mStateUpdater = new SceneUtil::StateUpdater();

apps/openmw/mwgui/settingswindow.cpp

@@ -62,23 +62,6 @@ namespace
         return "#{OMWEngine:TextureFilteringOther}";
     }
 
-    MyGUI::UString lightingMethodToStr(SceneUtil::LightingMethod method)
-    {
-        std::string_view result;
-        switch (method)
-        {
-            case SceneUtil::LightingMethod::PerObjectUniform:
-                result = "#{OMWEngine:LightingMethodShadersCompatibility}";
-                break;
-            case SceneUtil::LightingMethod::SingleUBO:
-            default:
-                result = "#{OMWEngine:LightingMethodShaders}";
-                break;
-        }
-
-        return MyGUI::LanguageManager::getInstance().replaceTags(MyGUI::UString(result));
-    }
-
     bool sortResolutions(std::pair<int, int> left, std::pair<int, int> right)
     {
         if (left.first == right.first)
@@ -281,7 +264,7 @@ namespace MWGui
         getWidget(mSecondaryLanguage, "SecondaryLanguage");
         getWidget(mGmstOverridesL10n, "GmstOverridesL10nButton");
         getWidget(mWindowModeHint, "WindowModeHint");
-        getWidget(mLightingMethodButton, "LightingMethodButton");
+        getWidget(mClusteredLightingButton, "ClusteredLightingButton");
         getWidget(mLightsResetButton, "LightsResetButton");
         getWidget(mMaxLights, "MaxLights");
         getWidget(mScriptFilter, "ScriptFilter");
@@ -290,6 +273,9 @@ namespace MWGui
         getWidget(mScriptView, "ScriptView");
         getWidget(mScriptAdapter, "ScriptAdapter");
         getWidget(mScriptDisabled, "ScriptDisabled");
+        getWidget(mClassicFalloffWidget, "ClassicFalloffWidget");
+        getWidget(mMinimumBrightnessText, "MinimumBrightnessText");
+        getWidget(mMinimumBrightnessScroll, "MinimumBrightnessScroll");
 
 #ifndef WIN32
         // hide gamma controls since it currently does not work under Linux
@@ -323,8 +309,6 @@ namespace MWGui
         mWaterRainRippleDetail->eventComboChangePosition
             += MyGUI::newDelegate(this, &SettingsWindow::onWaterRainRippleDetailChanged);
 
-        mLightingMethodButton->eventComboChangePosition
-            += MyGUI::newDelegate(this, &SettingsWindow::onLightingMethodButtonChanged);
         mLightsResetButton->eventMouseButtonClick
             += MyGUI::newDelegate(this, &SettingsWindow::onLightsResetButtonClicked);
         mMaxLights->eventComboChangePosition += MyGUI::newDelegate(this, &SettingsWindow::onMaxLightsChanged);
@@ -554,21 +538,6 @@ namespace MWGui
         apply();
     }
 
-    void SettingsWindow::onLightingMethodButtonChanged(MyGUI::ComboBox* sender, size_t pos)
-    {
-        if (pos == MyGUI::ITEM_NONE)
-            return;
-
-        sender->setCaptionWithReplacing(sender->getItemNameAt(sender->getIndexSelected()));
-
-        MWBase::Environment::get().getWindowManager()->interactiveMessageBox(
-            "#{OMWEngine:ChangeRequiresRestart}", { "#{Interface:OK}" }, true);
-
-        Settings::shaders().mLightingMethod.set(
-            Settings::parseLightingMethod(*sender->getItemDataAt<std::string>(pos)));
-        apply();
-    }
-
     void SettingsWindow::onLanguageChanged(size_t langPriority, MyGUI::ComboBox* sender, size_t pos)
     {
         if (pos == MyGUI::ITEM_NONE)
@@ -658,11 +627,8 @@ namespace MWGui
         Settings::shaders().mLightFadeStart.reset();
         Settings::shaders().mMinimumInteriorBrightness.reset();
         Settings::shaders().mMaxLights.reset();
-        Settings::shaders().mLightingMethod.reset();
+        Settings::shaders().mClusteredLighting.reset();
 
-        const SceneUtil::LightingMethod lightingMethod = Settings::shaders().mLightingMethod;
-        const std::size_t lightIndex = mLightingMethodButton->findItemIndexWith(lightingMethodToStr(lightingMethod));
-        mLightingMethodButton->setIndexSelected(lightIndex);
         updateMaxLightsComboBox(mMaxLights);
 
         apply();
@@ -779,6 +745,8 @@ namespace MWGui
         MWBase::Environment::get().getInputManager()->processChangedSettings(changed);
         MWBase::Environment::get().getMechanicsManager()->processChangedSettings(changed);
         Settings::Manager::resetPendingChanges();
+
+        updateLightSettings();
     }
 
     void SettingsWindow::onKeyboardSwitchClicked(MyGUI::Widget* /*sender*/)
@@ -848,25 +816,15 @@ namespace MWGui
 
     void SettingsWindow::updateLightSettings()
     {
-        auto lightingMethod = MWBase::Environment::get().getResourceSystem()->getSceneManager()->getLightingMethod();
-        MyGUI::UString lightingMethodStr = lightingMethodToStr(lightingMethod);
-
-        mLightingMethodButton->removeAllItems();
+        mClusteredLightingButton->setEnabled(
+            MWBase::Environment::get().getResourceSystem()->getSceneManager()->isClusteredLightingSupported());
 
-        std::array<SceneUtil::LightingMethod, 2> methods = {
-            SceneUtil::LightingMethod::PerObjectUniform,
-            SceneUtil::LightingMethod::SingleUBO,
-        };
+        const bool isClustered = Settings::shaders().mClusteredLighting;
+        const bool isClassic = !isClustered && Settings::shaders().mClassicFalloff;
 
-        for (const auto& method : methods)
-        {
-            if (!MWBase::Environment::get().getResourceSystem()->getSceneManager()->isSupportedLightingMethod(method))
-                continue;
-
-            mLightingMethodButton->addItem(
-                lightingMethodToStr(method), SceneUtil::LightManager::getLightingMethodString(method));
-        }
-        mLightingMethodButton->setIndexSelected(mLightingMethodButton->findItemIndexWith(lightingMethodStr));
+        mClassicFalloffWidget->setVisible(!isClustered);
+        mMinimumBrightnessText->setVisible(!isClassic);
+        mMinimumBrightnessScroll->setVisible(!isClassic);
     }
 
     void SettingsWindow::updateWindowModeSettings()

apps/openmw/mwgui/settingswindow.hpp

@@ -50,8 +50,11 @@ namespace MWGui
         MyGUI::ComboBox* mWaterRainRippleDetail;
 
         MyGUI::ComboBox* mMaxLights;
-        MyGUI::ComboBox* mLightingMethodButton;
+        MyGUI::Button* mClusteredLightingButton;
+        MyGUI::Widget* mClassicFalloffWidget;
         MyGUI::Button* mLightsResetButton;
+        MyGUI::Widget* mMinimumBrightnessText;
+        MyGUI::Widget* mMinimumBrightnessScroll;
 
         MyGUI::ComboBox* mPrimaryLanguage;
         MyGUI::ComboBox* mSecondaryLanguage;
@@ -89,7 +92,6 @@ namespace MWGui
         void onWaterReflectionDetailChanged(MyGUI::ComboBox* sender, size_t pos);
         void onWaterRainRippleDetailChanged(MyGUI::ComboBox* sender, size_t pos);
 
-        void onLightingMethodButtonChanged(MyGUI::ComboBox* sender, size_t pos);
         void onLightsResetButtonClicked(MyGUI::Widget* sender);
         void onMaxLightsChanged(MyGUI::ComboBox* sender, size_t pos);
 

apps/openmw/mwrender/animation.cpp

@@ -1,16 +1,15 @@
 #include "animation.hpp"
 
 #include <algorithm>
-#include <iomanip>
 #include <limits>
 
 #include <osg/BlendFunc>
-#include <osg/LightModel>
 #include <osg/Material>
 #include <osg/Matrix>
 #include <osg/MatrixTransform>
 #include <osg/Switch>
 
+#include <osg/Vec4f>
 #include <osgParticle/ParticleProcessor>
 #include <osgParticle/ParticleSystem>
 
@@ -1775,8 +1774,7 @@ namespace MWRender
         if (useAmbientLight)
         {
             // Morrowind has a white ambient light attached to the root VFX node of the scenegraph
-            node->getOrCreateStateSet()->setAttributeAndModes(
-                getVFXLightModelInstance(), osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
+            SceneUtil::configureSunAmbientOverride(osg::Vec4f(1, 1, 1, 1), node->getOrCreateStateSet());
         }
 
         mResourceSystem->getSceneManager()->setUpNormalsRTForStateSet(node->getOrCreateStateSet(), false);