feat: enb post processing

CMakeLists.txt

@@ -43,6 +43,8 @@ find_package(cppwinrt CONFIG REQUIRED)
 find_package(unordered_dense CONFIG REQUIRED)
 find_package(efsw CONFIG REQUIRED)
 find_package(Tracy CONFIG REQUIRED)
+find_package(effects11 CONFIG REQUIRED)
+
 add_subdirectory(${CMAKE_SOURCE_DIR}/cmake/Streamline)
 include(FidelityFX-SDK)
 
@@ -92,6 +94,8 @@ target_link_libraries(
 	Tracy::TracyClient
 	Streamline
 	d3d12.lib
+	Microsoft::Effects11
+	windowsapp
 )
 
 # https://gitlab.kitware.com/cmake/cmake/-/issues/24922#note_1371990

features/ENBPostProcessing/Shaders/Features/ENBPostProcessing.ini

@@ -0,0 +1,2 @@
+[Info]
+Version = 1-0-0

package/Shaders/Common/SharedData.hlsli

@@ -6,8 +6,6 @@
 
 namespace SharedData
 {
-
-#if defined(PSHADER) || defined(CSHADER) || defined(COMPUTESHADER)
 	cbuffer SharedData : register(b5)
 	{
 		float4 WaterData[25];
@@ -195,6 +193,81 @@ namespace SharedData
 		float Strength;      // [0, 1.0] The inverse blend weight of the effect
 	};
 
+	struct ENBSettings
+	{
+		float GradientIntensity;
+		float GradientDesaturation;
+		float GradientTopIntensity;
+		float GradientTopCurve;
+
+		float3 GradientTopColorFilter;
+		float pad0;
+
+		float GradientMiddleIntensity;
+		float GradientMiddleCurve;
+		float2 pad1;
+
+		float3 GradientMiddleColorFilter;
+		float pad2;
+
+		float GradientHorizonIntensity;
+		float GradientHorizonCurve;
+		float2 pad3;
+
+		float3 GradientHorizonColorFilter;
+		float pad4;
+
+		float CloudsIntensity;
+		float CloudsCurve;
+		float CloudsDesaturation;
+		float CloudsOpacity;
+
+		float3 CloudsColorFilter;
+		float pad5;
+
+		float DirectLightingIntensity;
+		float DirectLightingCurve;
+		float DirectLightingDesaturation;
+		float pad6;
+
+		float3 DirectLightingColorFilter;
+		float pad6_1;
+
+		float AmbientLightingIntensity;
+		float AmbientLightingDesaturation;
+		float2 pad7;
+
+		float ColorPow;
+		float3 pad8;
+
+		float FogColorMultiplier;
+		float FogColorCurve;
+		float FogAmountMultiplier;
+		float FogCurveMultiplier;
+
+		float3 FogColorFilter;
+		float pad8_1;
+
+		float IBLMultiplicativeAmount;
+		float3 pad9;
+
+		float VolumetricFogIntensity;
+		float VolumetricFogCurve;
+		float VolumetricFogOpacity;
+		float pad10;
+
+		float3 VolumetricFogColorFilter;
+		float pad11;
+
+		float VolumetricRaysIntensity;
+		float VolumetricRaysRangeFactor;
+		float VolumetricRaysDesaturation;
+		float pad12;
+
+		float3 VolumetricRaysColorFilter;
+		float pad13;
+	};
+
 	cbuffer FeatureData : register(b6)
 	{
 		GrassLightingSettings grassLightingSettings;
@@ -210,6 +283,7 @@ namespace SharedData
 		TerrainVariationSettings terrainVariationSettings;
 		IBLSettings iblSettings;
 		ExtendedTranslucencySettings extendedTranslucencySettings;
+		ENBSettings enbSettings;
 	};
 
 	Texture2D<float4> DepthTexture : register(t17);
@@ -263,7 +337,5 @@ namespace SharedData
 			waterData = WaterData[waterTile];
 		return waterData;
 	}
-
-#endif  // PSHADER
 }
 #endif  // __SHARED_DATA_DEPENDENCY_HLSL__

package/Shaders/Effect.hlsl

@@ -736,6 +736,12 @@ PS_OUTPUT main(PS_INPUT input)
 	baseColor = baseColorMul * baseColor;
 	baseColor.w *= softMul;
 
+#if defined(SOFT) && defined(FALLOFF) && !defined(MEMBRANE)
+	baseColor.w = saturate(baseColor.w * SharedData::enbSettings.VolumetricFogOpacity);
+	baseColor.xyz = pow(baseColor, SharedData::enbSettings.VolumetricFogCurve);
+	baseColor.xyz = baseColor.xyz * SharedData::enbSettings.VolumetricFogIntensity * SharedData::enbSettings.VolumetricFogColorFilter;
+#endif
+
 #	if defined(SOFT) && !(defined(FALLOFF) && defined(MULTBLEND))
 	if (baseColor.w - 0.003 < 0) {
 		discard;

package/Shaders/ISSAOComposite.hlsl

@@ -179,6 +179,11 @@ PS_OUTPUT main(PS_INPUT input)
 		fogColor = ImageBasedLighting::GetFogIBLColor(fogColor);
 	}
 #		endif
+
+	fogColor = pow(fogColor, SharedData::enbSettings.FogColorCurve) * SharedData::enbSettings.FogColorMultiplier * lerp(1.0, SharedData::enbSettings.FogColorFilter, SharedData::enbSettings.FogColorFilterAmount);
+
+	fogFactor = saturate(lerp(0.0, pow(fogFactor, SharedData::enbSettings.FogCurveMultiplier), SharedData::enbSettings.FogAmountMultiplier));
+
 	if (depth < 0.999999) {
 		composedColor.xyz = FogNearColor.w * lerp(composedColor.xyz, fogColor, fogFactor);
 	}

package/Shaders/Lighting.hlsl

@@ -2300,6 +2300,9 @@ PS_OUTPUT main(PS_INPUT input, bool frontFace : SV_IsFrontFace)
 #	endif
 
 	float3 dirLightColor = Color::Light(DirLightColor.xyz);
+
+	dirLightColor = lerp(dirLightColor, Color::RGBToLuminance(dirLightColor), SharedData::enbSettings.DirectLightingDesaturation) * SharedData::enbSettings.DirectLightingIntensity * SharedData::enbSettings.DirectLightingColorFilter;
+
 	float3 dirLightColorMultiplier = 1;
 
 #	if defined(WATER_EFFECTS)

package/Shaders/Sky.hlsl

@@ -1,5 +1,7 @@
 #include "Common/FrameBuffer.hlsli"
 #include "Common/VR.hlsli"
+#include "Common/SharedData.hlsli"
+#include "Common/Color.hlsli"
 
 struct VS_INPUT
 {
@@ -124,10 +126,20 @@ VS_OUTPUT main(VS_INPUT input)
 	vsout.TexCoord1.xy = TexCoordOff + input.TexCoord;
 #		endif  // TEXLERP
 
-	float3 skyColor = BlendColor[0].xyz * input.Color.xxx + BlendColor[1].xyz * input.Color.yyy +
-	                  BlendColor[2].xyz * input.Color.zzz;
+	float3 horizonColor = BlendColor[0].xyz;
+	float3 middleColor = BlendColor[1].xyz;
+	float3 topColor = BlendColor[2].xyz;
 
-	vsout.Color.xyz = VParams * skyColor;
+	horizonColor = pow(horizonColor, SharedData::enbSettings.GradientHorizonCurve) * SharedData::enbSettings.GradientHorizonIntensity * SharedData::enbSettings.GradientHorizonColorFilter;
+	middleColor = pow(middleColor, SharedData::enbSettings.GradientMiddleCurve) * SharedData::enbSettings.GradientMiddleIntensity * SharedData::enbSettings.GradientMiddleColorFilter;
+	topColor = pow(topColor, SharedData::enbSettings.GradientTopCurve) * SharedData::enbSettings.GradientTopIntensity * SharedData::enbSettings.GradientTopColorFilter;
+
+	float3 skyColor = horizonColor * input.Color.x + middleColor * input.Color.y + topColor * input.Color.z;
+	skyColor *= VParams;
+
+	skyColor = lerp(skyColor, Color::RGBToLuminance(skyColor), SharedData::enbSettings.GradientDesaturation) * SharedData::enbSettings.GradientIntensity;
+
+	vsout.Color.xyz = skyColor;
 	vsout.Color.w = BlendColor[0].w * input.Color.w;
 
 #	endif  // OCCLUSION MOONMASK HORIZFADE
@@ -201,15 +213,35 @@ PS_OUTPUT main(PS_INPUT input)
 #	ifndef OCCLUSION
 #		ifndef TEXLERP
 	float4 baseColor = TexBaseSampler.Sample(SampBaseSampler, input.TexCoord0.xy);
+
+#		if defined(CLOUDS)
+	baseColor.w = saturate(baseColor.w * SharedData::enbSettings.CloudsOpacity);
+	baseColor.xyz = pow(baseColor.xyz, SharedData::enbSettings.CloudsCurve);
+	baseColor.xyz = lerp(baseColor.xyz, Color::RGBToLuminance(baseColor.xyz), SharedData::enbSettings.CloudsDesaturation) * SharedData::enbSettings.CloudsIntensity * SharedData::enbSettings.CloudsColorFilter;
+#		endif
+
 #			ifdef TEXFADE
 	baseColor.w *= PParams.x;
 #			endif
 #		else
 	float4 blendColor = TexBlendSampler.Sample(SampBlendSampler, input.TexCoord1.xy);
 	float4 baseColor = TexBaseSampler.Sample(SampBaseSampler, input.TexCoord0.xy);
+
+#		if defined(CLOUDS)
+	blendColor.w = saturate(blendColor.w * SharedData::enbSettings.CloudsOpacity);
+	blendColor.xyz = pow(blendColor.xyz, SharedData::enbSettings.CloudsCurve);
+	blendColor.xyz = lerp(blendColor.xyz, Color::RGBToLuminance(blendColor.xyz), SharedData::enbSettings.CloudsDesaturation) * SharedData::enbSettings.CloudsIntensity * SharedData::enbSettings.CloudsColorFilter;
+
+	baseColor.w = saturate(baseColor.w * SharedData::enbSettings.CloudsOpacity);
+	baseColor.xyz = pow(baseColor.xyz, SharedData::enbSettings.CloudsCurve);
+	baseColor.xyz = lerp(baseColor.xyz, Color::RGBToLuminance(baseColor.xyz), SharedData::enbSettings.CloudsDesaturation) * SharedData::enbSettings.CloudsIntensity * SharedData::enbSettings.CloudsColorFilter;
+#		endif
+
 	baseColor = PParams.xxxx * (-baseColor + blendColor) + baseColor;
 #		endif
 
+
+
 #		if defined(DITHER)
 	float2 noiseGradUv = float2(0.125, 0.125) * input.Position.xy;
 	float noiseGrad =

src/Deferred.cpp

@@ -900,6 +900,7 @@ void Deferred::Hooks::Renderer_ResetState::thunk(void* This)
 	ID3D11Buffer* buffers[3] = { state->permutationCB->CB(), state->sharedDataCB->CB(), state->featureDataCB->CB() };
 	context->PSSetConstantBuffers(4, 3, buffers);
 	context->CSSetConstantBuffers(5, 2, buffers + 1);
+	context->VSSetConstantBuffers(5, 2, buffers + 1);
 
 	auto* singleton = globals::truePBR;
 	singleton->SetupFrame();

src/Feature.cpp

@@ -4,6 +4,7 @@
 #include "FeatureVersions.h"
 #include "Features/CloudShadows.h"
 #include "Features/DynamicCubemaps.h"
+#include "Features/ENBPostProcessing.h"
 #include "Features/ExtendedMaterials.h"
 #include "Features/ExtendedTranslucency.h"
 #include "Features/GrassCollision.h"
@@ -29,6 +30,7 @@
 #include "Features/WaterEffects.h"
 #include "Features/WeatherPicker.h"
 #include "Features/WetnessEffects.h"
+
 #include "Menu.h"
 #include "SettingsOverrideManager.h"
 #include "Utils/Format.h"
@@ -223,7 +225,8 @@ const std::vector<Feature*>& Feature::GetFeatureList()
 		&globals::features::interiorSun,
 		&globals::features::terrainVariation,
 		&globals::features::ibl,
-		&globals::features::extendedTranslucency
+		&globals::features::extendedTranslucency,
+		&globals::features::enbPostProcessing
 	};
 
 	if (REL::Module::IsVR()) {

src/FeatureBuffer.cpp

@@ -2,6 +2,7 @@
 
 #include "Features/CloudShadows.h"
 #include "Features/DynamicCubemaps.h"
+#include "Features/ENBPostProcessing.h"
 #include "Features/ExtendedMaterials.h"
 #include "Features/ExtendedTranslucency.h"
 #include "Features/GrassLighting.h"
@@ -47,5 +48,6 @@ std::pair<unsigned char*, size_t> GetFeatureBufferData(bool a_inWorld)
 		globals::features::hairSpecular.settings,
 		globals::features::terrainVariation.settings,
 		globals::features::ibl.settings,
-		globals::features::extendedTranslucency.GetCommonBufferData());
+		globals::features::extendedTranslucency.GetCommonBufferData(),
+		globals::features::enbPostProcessing.GetCommonBufferData());
 }