- Replaced lerp usage from hlsl.

dumbie · Apr 19, 2022 · 3fc5def · 3fc5def
1 parent 283873b
commit 3fc5def
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 18 deletions.
diff --git a/ScreenCapture/CaptureClasses.h b/ScreenCapture/CaptureClasses.h
@@ -11,7 +11,7 @@ namespace
 		BOOL HDRtoSDR;
 		FLOAT HDRBrightness;
 		FLOAT Vibrance;
-		FLOAT Saturate;
+		FLOAT Saturation;
 		FLOAT RedChannel;
 		FLOAT GreenChannel;
 		FLOAT BlueChannel;
@@ -37,7 +37,7 @@ namespace
 		FLOAT HDRBrightness;
 		FLOAT SDRWhiteLevel;
 		FLOAT Vibrance;
-		FLOAT Saturate;
+		FLOAT Saturation;
 		FLOAT RedChannel;
 		FLOAT GreenChannel;
 		FLOAT BlueChannel;

diff --git a/ScreenCapture/CaptureInitialize.cpp b/ScreenCapture/CaptureInitialize.cpp
@@ -306,7 +306,7 @@ namespace
 			shaderVariables.HDRBrightness = vCaptureSettings.HDRBrightness;
 			shaderVariables.SDRWhiteLevel = vCaptureDetails.SDRWhiteLevel;
 			shaderVariables.Vibrance = vCaptureSettings.Vibrance;
-			shaderVariables.Saturate = vCaptureSettings.Saturate;
+			shaderVariables.Saturation = vCaptureSettings.Saturation;
 			shaderVariables.RedChannel = vCaptureSettings.RedChannel;
 			shaderVariables.GreenChannel = vCaptureSettings.GreenChannel;
 			shaderVariables.BlueChannel = vCaptureSettings.BlueChannel;

diff --git a/ScreenCapture/Shaders/PixelShader.hlsl b/ScreenCapture/Shaders/PixelShader.hlsl
@@ -6,7 +6,7 @@ cbuffer _shaderVariables : register(b0)
 	float HDRBrightness;
 	float SDRWhiteLevel;
 	float Vibrance;
-	float Saturate;
+	float Saturation;
 	float RedChannel;
 	float GreenChannel;
 	float BlueChannel;
@@ -32,15 +32,17 @@ float4 AdjustVibrance(float4 color)
 	if (Vibrance == 0.0F) { return color; }
 	float maxColor = max(color.r, max(color.g, color.b));
 	float minColor = min(color.r, min(color.g, color.b));
-	return lerp(minColor, color, 1.0F / pow(maxColor, Vibrance));
+	float powColor = 1.0F / pow(maxColor, Vibrance);
+	float adjustPow = 1.0F - powColor;
+	return minColor * adjustPow + color * powColor;
 }
 
-float4 AdjustSaturate(float4 color)
+float4 AdjustSaturation(float4 color)
 {
-	if (Saturate == 1.0F) { return color; }
-	float adjustSaturate = 1.0F - Saturate;
+	if (Saturation == 1.0F) { return color; }
+	float adjustSaturation = 1.0F - Saturation;
 	float adjustLuminance = (color.r + color.g + color.b) / 3.0F;
-	return color * Saturate + adjustSaturate * adjustLuminance;
+	return color * Saturation + adjustSaturation * adjustLuminance;
 }
 
 float4 AdjustColorChannels(float4 color)
@@ -100,8 +102,8 @@ float4 main(PS_INPUT input) : SV_TARGET
 	//Adjust vibrance
 	color = AdjustVibrance(color);
 
-	//Adjust saturate
-	color = AdjustSaturate(color);
+	//Adjust saturation
+	color = AdjustSaturation(color);
 
 	//Adjust color channels
 	color = AdjustColorChannels(color);

diff --git a/ScreenCapturePreview/CaptureClasses.cs b/ScreenCapturePreview/CaptureClasses.cs
@@ -9,7 +9,7 @@ public CaptureSettings()
             HDRtoSDR = true;
             HDRBrightness = 70.0F;
             Vibrance = 0.0F;
-            Saturate = 1.0F;
+            Saturation = 1.0F;
             RedChannel = 1.0F;
             GreenChannel = 1.0F;
             BlueChannel = 1.0F;
@@ -22,7 +22,7 @@ public CaptureSettings()
         public bool HDRtoSDR { get; set; }
         public float HDRBrightness { get; set; }
         public float Vibrance { get; set; }
-        public float Saturate { get; set; }
+        public float Saturation { get; set; }
         public float RedChannel { get; set; }
         public float GreenChannel { get; set; }
         public float BlueChannel { get; set; }

diff --git a/ScreenCapturePreview/MainWindow.xaml b/ScreenCapturePreview/MainWindow.xaml
@@ -21,8 +21,8 @@
                 <TextBlock x:Name="text_Vibrance" Tag="Vibrance:" Foreground="White" Margin="0,5,0,0"/>
                 <Slider x:Name="slider_Vibrance" Value="0.00" Minimum="-2.00" Maximum="2.00" ValueChanged="slider_ValueChanged"/>
 
-                <TextBlock x:Name="text_Saturate" Tag="Saturate:" Foreground="White" Margin="0,5,0,0"/>
-                <Slider x:Name="slider_Saturate" Value="1.00" Minimum="0.00" Maximum="2.00" ValueChanged="slider_ValueChanged"/>
+                <TextBlock x:Name="text_Saturation" Tag="Saturation:" Foreground="White" Margin="0,5,0,0"/>
+                <Slider x:Name="slider_Saturation" Value="1.00" Minimum="0.00" Maximum="2.00" ValueChanged="slider_ValueChanged"/>
 
                 <TextBlock x:Name="text_RedChannel" Tag="Red channel:" Foreground="White" Margin="0,5,0,0"/>
                 <Slider x:Name="slider_RedChannel" Value="1.00" Minimum="0.00" Maximum="2.00" ValueChanged="slider_ValueChanged"/>

diff --git a/ScreenCapturePreview/MainWindow.xaml.cs b/ScreenCapturePreview/MainWindow.xaml.cs
@@ -31,7 +31,7 @@ private async Task<bool> InitializeScreenCapture(int delayTime)
                     HDRtoSDR = true,
                     HDRBrightness = (float)slider_HDRBrightness.Value,
                     Vibrance = (float)slider_Vibrance.Value,
-                    Saturate = (float)slider_Saturate.Value,
+                    Saturation = (float)slider_Saturation.Value,
                     RedChannel = (float)slider_RedChannel.Value,
                     GreenChannel = (float)slider_GreenChannel.Value,
                     BlueChannel = (float)slider_BlueChannel.Value,
@@ -181,7 +181,7 @@ private void slider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<d
                 //Update slider text
                 text_HDRBrightness.Text = text_HDRBrightness.Tag + " " + slider_HDRBrightness.Value.ToString("0.0000");
                 text_Vibrance.Text = text_Vibrance.Tag + " " + slider_Vibrance.Value.ToString("0.0000");
-                text_Saturate.Text = text_Saturate.Tag + " " + slider_Saturate.Value.ToString("0.0000");
+                text_Saturation.Text = text_Saturation.Tag + " " + slider_Saturation.Value.ToString("0.0000");
                 text_RedChannel.Text = text_RedChannel.Tag + " " + slider_RedChannel.Value.ToString("0.0000");
                 text_GreenChannel.Text = text_GreenChannel.Tag + " " + slider_GreenChannel.Value.ToString("0.0000");
                 text_BlueChannel.Text = text_BlueChannel.Tag + " " + slider_BlueChannel.Value.ToString("0.0000");
@@ -197,7 +197,7 @@ private void slider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<d
                     HDRtoSDR = true,
                     HDRBrightness = (float)slider_HDRBrightness.Value,
                     Vibrance = (float)slider_Vibrance.Value,
-                    Saturate = (float)slider_Saturate.Value,
+                    Saturation = (float)slider_Saturation.Value,
                     RedChannel = (float)slider_RedChannel.Value,
                     GreenChannel = (float)slider_GreenChannel.Value,
                     BlueChannel = (float)slider_BlueChannel.Value,