Merge branch 'sorry_ffp_you_smell' into 'master'

Remove exclusive FFP mode

Closes #7595 and #9001

See merge request OpenMW/openmw!4771

Author: Sarah Sunday

apps/components_tests/nifosg/testnifloader.cpp

@@ -137,7 +137,7 @@ osg::Group {
       UserDataContainer TRUE {
         osg::DefaultUserDataContainer {
           UniqueID 5
-          UDC_UserObjects 3 {
+          UDC_UserObjects 2 {
             osg::UIntValueObject {
               UniqueID 6
               Name "recordIndex"
@@ -149,17 +149,12 @@ osg::Group {
               Value ")"
             << shaderPrefix << R"("
             }
-            osg::BoolValueObject {
-              UniqueID 8
-              Name "shaderRequired"
-              Value TRUE
-            }
           }
         }
       }
       StateSet TRUE {
         osg::StateSet {
-          UniqueID 9
+          UniqueID 8
         }
       }
     }
@@ -194,7 +189,7 @@ osg::Group {
       UserDataContainer TRUE {
         osg::DefaultUserDataContainer {
           UniqueID 5
-          UDC_UserObjects 3 {
+          UDC_UserObjects 2 {
             osg::UIntValueObject {
               UniqueID 6
               Name "recordIndex"
@@ -206,23 +201,18 @@ osg::Group {
               Value ")"
             << shaderPrefix << R"("
             }
-            osg::BoolValueObject {
-              UniqueID 8
-              Name "shaderRequired"
-              Value TRUE
-            }
           }
         }
       }
       StateSet TRUE {
         osg::StateSet {
-          UniqueID 9
+          UniqueID 8
           ModeList 1 {
             GL_DEPTH_TEST ON
           }
           AttributeList 1 {
             osg::Depth {
-              UniqueID 10
+              UniqueID 9
               Function LEQUAL
             }
             Value OFF

apps/components_tests/resource/testresourcesystem.cpp

@@ -1,5 +1,6 @@
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
+#include <components/sceneutil/shadow.hpp>
 #include <components/toutf8/toutf8.hpp>
 #include <components/vfs/manager.hpp>
 
@@ -18,6 +19,21 @@ namespace
         const ToUTF8::Utf8Encoder encoder(ToUTF8::WINDOWS_1252);
         Resource::ResourceSystem resourceSystem(&vfsManager, 1.0, &encoder.getStatelessEncoder());
         Resource::SceneManager* sceneManager = resourceSystem.getSceneManager();
+        sceneManager->setShaderPath("resources/shaders");
+
+        auto defines = Shader::getDefaultDefines();
+
+        auto shadowDefines = SceneUtil::ShadowManager::getShadowsDisabledDefines();
+
+        osg::ref_ptr<SceneUtil::LightManager> lightManager = new SceneUtil::LightManager(SceneUtil::LightSettings{});
+        auto lightDefines = lightManager->getLightDefines();
+
+        for (const auto& define : shadowDefines)
+            defines[define.first] = define.second;
+        for (const auto& define : lightDefines)
+            defines[define.first] = define.second;
+
+        sceneManager->getShaderManager().setGlobalDefines(defines);
 
         constexpr VFS::Path::NormalizedView noSuchPath("meshes/whatever.nif");
         std::vector<std::thread> threads;

apps/launcher/settingspage.cpp

@@ -331,17 +331,14 @@ bool Launcher::SettingsPage::loadSettings()
 
         connect(shadowDistanceCheckBox, &QCheckBox::toggled, this, &SettingsPage::slotShadowDistLimitToggled);
 
-        int lightingMethod = 1;
+        int lightingMethod = 0;
         switch (Settings::shaders().mLightingMethod)
         {
-            case SceneUtil::LightingMethod::FFP:
-                lightingMethod = 0;
-                break;
             case SceneUtil::LightingMethod::PerObjectUniform:
-                lightingMethod = 1;
+                lightingMethod = 0;
                 break;
             case SceneUtil::LightingMethod::SingleUBO:
-                lightingMethod = 2;
+                lightingMethod = 1;
                 break;
         }
         lightingMethodComboBox->setCurrentIndex(lightingMethod);
@@ -587,8 +584,7 @@ void Launcher::SettingsPage::saveSettings()
         saveSettingBool(*skyBlendingCheckBox, Settings::fog().mSkyBlending);
         Settings::fog().mSkyBlendingStart.set(skyBlendingStartComboBox->value());
 
-        static constexpr std::array<SceneUtil::LightingMethod, 3> lightingMethodMap = {
-            SceneUtil::LightingMethod::FFP,
+        static constexpr std::array<SceneUtil::LightingMethod, 2> lightingMethodMap = {
             SceneUtil::LightingMethod::PerObjectUniform,
             SceneUtil::LightingMethod::SingleUBO,
         };

apps/launcher/ui/settingspage.ui

@@ -536,7 +536,6 @@
                    <property name="toolTip">
                     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Normally environment map reflections aren't affected by lighting, which makes environment-mapped (and thus bump-mapped objects) glow in the dark.
                   Morrowind Code Patch includes an option to remedy that by doing environment-mapping before applying lighting, this is the equivalent of that option.
-                  Affected objects will use shaders.
                   &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                    </property>
                    <property name="text">
@@ -1047,8 +1046,7 @@
                 <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;Legacy&quot; always uses 8 lights per object. It provides results most similar to Morrowind's lighting.&lt;/p&gt;
-&lt;p&gt;&quot;Shaders (compatibility)&quot; 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.&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">
@@ -1058,11 +1056,6 @@
                </item>
                <item row="1" column="1">
                 <widget class="QComboBox" name="lightingMethodComboBox">
-                 <item>
-                  <property name="text">
-                   <string>Legacy</string>
-                  </property>
-                 </item>
                  <item>
                   <property name="text">
                    <string>Shaders (compatibility)</string>

apps/opencs/CMakeLists.txt

@@ -92,8 +92,7 @@ opencs_units (view/render
     )
 
 opencs_units (view/render
-    lighting lightingday lightingnight lightingbright object cell terrainstorage
-    cellarrow cellmarker cellborder pathgrid
+    object cell terrainstorage cellarrow cellmarker cellborder pathgrid
     )
 
 opencs_hdrs (view/render

apps/opencs/model/world/data.cpp

@@ -152,18 +152,17 @@ CSMWorld::Data::Data(ToUTF8::FromType encoding, const Files::PathContainer& data
     mResourceSystem
         = std::make_unique<Resource::ResourceSystem>(mVFS.get(), expiryDelay, &mEncoder.getStatelessEncoder());
 
-    Shader::ShaderManager::DefineMap defines
-        = mResourceSystem->getSceneManager()->getShaderManager().getGlobalDefines();
-    Shader::ShaderManager::DefineMap shadowDefines = SceneUtil::ShadowManager::getShadowsDisabledDefines();
-    defines["forcePPL"] = "0"; // Don't force per-pixel lighting
-    defines["clamp"] = "1"; // Clamp lighting
-    defines["preLightEnv"] = "0"; // Apply environment maps after lighting like Morrowind
-    defines["radialFog"] = "0";
-    defines["lightingModel"] = "0";
-    defines["reverseZ"] = "0";
-    defines["waterRefraction"] = "0";
+    auto defines = Shader::getDefaultDefines();
+
+    auto shadowDefines = SceneUtil::ShadowManager::getShadowsDisabledDefines();
+
+    osg::ref_ptr<SceneUtil::LightManager> lightManager = new SceneUtil::LightManager(SceneUtil::LightSettings{});
+    auto lightDefines = lightManager->getLightDefines();
+
     for (const auto& define : shadowDefines)
         defines[define.first] = define.second;
+    for (const auto& define : lightDefines)
+        defines[define.first] = define.second;
     mResourceSystem->getSceneManager()->getShaderManager().setGlobalDefines(defines);
 
     mResourceSystem->getSceneManager()->setShaderPath(resDir / "shaders");

apps/opencs/view/render/brushdraw.cpp

@@ -259,8 +259,6 @@ void CSVRender::BrushDraw::update(osg::Vec3d point, int brushSize, CSVWidget::Br
             break;
     }
 
-    mGeometry->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
-
     mBrushDrawNode->addChild(mGeometry);
 }
 

apps/opencs/view/render/cellarrow.cpp

@@ -194,8 +194,6 @@ void CSVRender::CellArrow::buildShape()
 
     geometry->setColorArray(colours, osg::Array::BIND_PER_VERTEX);
 
-    geometry->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
-
     mBaseNode->addChild(geometry);
 }
 

apps/opencs/view/render/cellborder.cpp

@@ -115,7 +115,6 @@ void CSVRender::CellBorder::buildShape(const ESM::Land& esmLand)
     primitives->setElement(VertexCount, 0);
 
     mBorderGeometry->addPrimitiveSet(primitives);
-    mBorderGeometry->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
 
     mBaseNode->addChild(mBorderGeometry);
 }

apps/opencs/view/render/instanceselectionmode.cpp

@@ -194,7 +194,6 @@ namespace CSVRender
 
         geometry->setColorArray(colours, osg::Array::BIND_PER_VERTEX);
 
-        geometry->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
         geometry->getOrCreateStateSet()->setMode(GL_BLEND, osg::StateAttribute::ON);
         geometry->getOrCreateStateSet()->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
         geometry->getOrCreateStateSet()->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
@@ -292,7 +291,6 @@ namespace CSVRender
 
         geometry->setColorArray(colours, osg::Array::BIND_PER_VERTEX);
 
-        geometry->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
         geometry->getOrCreateStateSet()->setMode(GL_BLEND, osg::StateAttribute::ON);
         geometry->getOrCreateStateSet()->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
         geometry->getOrCreateStateSet()->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
@@ -393,7 +391,6 @@ namespace CSVRender
 
         geometry->setColorArray(colours, osg::Array::BIND_PER_VERTEX);
 
-        geometry->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
         geometry->getOrCreateStateSet()->setMode(GL_BLEND, osg::StateAttribute::ON);
         geometry->getOrCreateStateSet()->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
         geometry->getOrCreateStateSet()->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);