Merge branch 'water_level' into 'master'

[Postprocessing] Improve water level handling

See merge request OpenMW/openmw!2217

apps/openmw/mwrender/renderingmanager.cpp

@@ -1005,6 +1005,8 @@ namespace MWRender
     {
         mWater->setEnabled(enabled);
         mSky->setWaterEnabled(enabled);
+
+        mPostProcessor->getStateUpdater()->setIsWaterEnabled(enabled);
     }
 
     void RenderingManager::setWaterHeight(float height)

components/fx/stateupdater.hpp

@@ -81,6 +81,8 @@ namespace fx
 
         void setWaterHeight(float height) { mData.get<WaterHeight>() = height; }
 
+        void setIsWaterEnabled(bool enabled) { mData.get<IsWaterEnabled>() = enabled; }
+
         void setSimulationTime(float time) { mData.get<SimulationTime>() = time; }
 
         void setDeltaSimulationTime(float time) { mData.get<DeltaSimulationTime>() = time; }
@@ -145,6 +147,8 @@ namespace fx
 
         struct WaterHeight : std140::Float { static constexpr std::string_view sName = "waterHeight"; };
 
+        struct IsWaterEnabled : std140::Bool { static constexpr std::string_view sName = "isWaterEnabled"; };
+
         struct SimulationTime : std140::Float { static constexpr std::string_view sName = "simulationTime"; };
 
         struct DeltaSimulationTime : std140::Float { static constexpr std::string_view sName = "deltaSimulationTime"; };
@@ -182,6 +186,7 @@ namespace fx
             GameHour,
             SunVis,
             WaterHeight,
+            IsWaterEnabled,
             SimulationTime,
             DeltaSimulationTime,
             WindSpeed,

docs/source/reference/postprocessing/omwfx.rst

@@ -95,7 +95,9 @@ Builtin Uniforms
 +-------------+------------------------------+--------------------------------------------------+
 | float       | ``omw.waterHeight``          | The water height of current cell                 |
 |             |                              |                                                  |
-|             |                              | Exterior water level is always zero              |
+|             |                              | Exterior water level is always rendered at -1.0  |
++-------------+------------------------------+--------------------------------------------------+
+| bool        | ``omw.isWaterEnabled``       | True if water is enabled for current cell        |
 +-------------+------------------------------+--------------------------------------------------+
 | float       | ``omw.simulationTime``       | The time in milliseconds since simulation began  |
 +-------------+------------------------------+--------------------------------------------------+