cEnsor: Added color mode, cImageSharpening: Added mask mode

Author: papadanku

shaders/cEnsor.fx

@@ -11,29 +11,30 @@ namespace cEnsor
         ui_max = 7;
     > = 3;
 
-    uniform float _Threshold <
-        ui_label = "Search Threshold";
-        ui_type = "slider";
-        ui_min = 0.0;
-        ui_max = 1.0;
-    > = 0.1;
-
-    uniform int _Select <
-        ui_label = "Search Feature";
+    uniform int _DetectionMode <
+        ui_label = "Search Mode";
         ui_type = "combo";
-        ui_items = "HSV: Hue\0HSV: Saturation\0HSV: Value\0HSL: Hue\0HSL: Saturation\0HSL: Lightness\0HSI: Hue\0HSI: Saturation\0HSI: Intensity\0";
-    > = 2;
+        ui_items = "Color\0\HSV: Hue\0HSV: Saturation\0HSV: Value\0HSL: Hue\0HSL: Saturation\0HSL: Lightness\0HSI: Hue\0HSI: Saturation\0HSI: Intensity\0";
+    > = 0;
 
     uniform int _Comparison <
         ui_label = "Search Operator";
         ui_type = "combo";
-        ui_items = "Less Than\0Greater Than\0Equal\0Not Equal\0Less Than of Equal\0Greater Than or Equal\0";
+        ui_items = "Less Than\0Greater Than\0Equal\0Not Equal\0Less Than or Equal\0Greater Than or Equal\0";
     > = 1;
 
-    uniform bool _DisplayMask <
-        ui_label = "Display Mask";
+    uniform float _Threshold <
+        ui_label = "Search Threshold";
+        ui_type = "slider";
+        ui_min = 0.0;
+        ui_max = 1.0;
+    > = 0.1;
+
+    uniform int _DisplayMode <
+        ui_label = "Display Mode";
         ui_type = "radio";
-    > = false;
+        ui_items = "Output\0Mask\0";
+    > = 0;
 
     CREATE_TEXTURE_POOLED(TempTex0_RGBA8, BUFFER_SIZE_0, RGBA8, 8)
     CREATE_SRGB_SAMPLER(SampleTempTex0, TempTex0_RGBA8, POINT, MIRROR)
@@ -49,36 +50,39 @@ namespace cEnsor
         float4 Pixel = tex2Dlod(SampleTempTex0, float4(Input.Tex0, 0.0, _Blockiness));
 
         // Initialize variables
-        float Feature = 0.0;
-        bool Mask = false;
+        float4 Feature = 0.0;
+        bool4 Mask = false;
 
-        switch(_Select)
+        switch(_DetectionMode)
         {
             case 0:
-                Feature = CColor_GetHSVfromRGB(Pixel.rgb).r;
+                Feature = Pixel;
                 break;
             case 1:
-                Feature = CColor_GetHSVfromRGB(Pixel.rgb).g;
+                Feature = CColor_GetHSVfromRGB(Pixel.rgb).r;
                 break;
             case 2:
-                Feature = CColor_GetHSVfromRGB(Pixel.rgb).b;
+                Feature = CColor_GetHSVfromRGB(Pixel.rgb).g;
                 break;
             case 3:
-                Feature = CColor_GetHSLfromRGB(Pixel.rgb).r;
+                Feature = CColor_GetHSVfromRGB(Pixel.rgb).b;
                 break;
             case 4:
-                Feature = CColor_GetHSLfromRGB(Pixel.rgb).g;
+                Feature = CColor_GetHSLfromRGB(Pixel.rgb).r;
                 break;
             case 5:
-                Feature = CColor_GetHSLfromRGB(Pixel.rgb).b;
+                Feature = CColor_GetHSLfromRGB(Pixel.rgb).g;
                 break;
             case 6:
-                Feature = CColor_GetHSIfromRGB(Pixel.rgb).r;
+                Feature = CColor_GetHSLfromRGB(Pixel.rgb).b;
                 break;
             case 7:
-                Feature = CColor_GetHSIfromRGB(Pixel.rgb).g;
+                Feature = CColor_GetHSIfromRGB(Pixel.rgb).r;
                 break;
             case 8:
+                Feature = CColor_GetHSIfromRGB(Pixel.rgb).g;
+                break;
+            case 9:
                 Feature = CColor_GetHSIfromRGB(Pixel.rgb).b;
                 break;
             default:
@@ -108,7 +112,7 @@ namespace cEnsor
                 break;
         }
 
-        if(_DisplayMask)
+        if (_DisplayMode == 1)
         {
             return Mask;
         }

shaders/cImageSharpening.fx

@@ -56,17 +56,31 @@ uniform float _Sharpening <
     ui_max = 1.0;
 > = 1.0;
 
+uniform int _DisplayMode <
+    ui_label = "Display Mode";
+    ui_type = "radio";
+    ui_items = "Output\0Mask\0";
+> = 0;
+
 float4 PS_CasFilterNoScaling(CShade_VS2PS_Quad Input): SV_TARGET0
 {
     float4 OutputColor = 1.0;
+    float4 OutputMask = 1.0;
     FFX_CAS_FilterNoScaling(
         OutputColor,
+        OutputMask,
         Input,
         _Detection,
         _Kernel,
         _Contrast,
         _Sharpening
     );
+
+    if (_DisplayMode == 1)
+    {
+        return OutputMask;
+    }
+
     return OutputColor;
 }
 

shaders/shared/fidelityfx/cCas.fxh

@@ -33,6 +33,7 @@
 
     void FFX_CAS_FilterNoScaling(
         inout float4 FilterShape,
+        out float4 FilterMask,
         in CShade_VS2PS_Quad Input,
         in int Detection,
         in int Kernel,
@@ -134,6 +135,8 @@
         FilterShape += Sample[4] * Weight;
         FilterShape = saturate(FilterShape * ReciprocalWeight);
         FilterShape = lerp(Sample[0], FilterShape, Sharpening);
+
+        FilterMask = AmplifyRGB;
     }
 
 #endif