remove legacy negative conversion from real time pipeline

CyberTimon · CyberTimon · commit 494bb2e1f372 · 2026-02-06T22:27:20.000+01:00
diff --git a/src-tauri/src/image_processing.rs b/src-tauri/src/image_processing.rs
@@ -831,16 +831,7 @@ pub struct GlobalAdjustments {
     pub chromatic_aberration_blue_yellow: f32,
     pub show_clipping: u32,
     pub is_raw_image: u32,
-
-    pub enable_negative_conversion: u32,
-    pub film_base_r: f32,
-    pub film_base_g: f32,
-    pub film_base_b: f32,
-    pub negative_red_balance: f32,
-    pub negative_green_balance: f32,
-    pub negative_blue_balance: f32,
-    _pad_neg1: f32,
-    _pad_neg2: f32,
+    _pad_ca1: f32, 
 
     pub has_lut: u32,
     pub lut_intensity: f32,
@@ -1277,21 +1268,6 @@ fn get_global_adjustments_from_json(
         ColorCalibrationSettings::default()
     };
 
-    let neg_conv_enabled = js_adjustments["enableNegativeConversion"]
-        .as_bool()
-        .unwrap_or(false);
-    let film_base_hex = js_adjustments["filmBaseColor"]
-        .as_str()
-        .unwrap_or("#ff8800");
-    let film_base_rgb = if film_base_hex.starts_with('#') && film_base_hex.len() == 7 {
-        let r = u8::from_str_radix(&film_base_hex[1..3], 16).unwrap_or(255) as f32 / 255.0;
-        let g = u8::from_str_radix(&film_base_hex[3..5], 16).unwrap_or(136) as f32 / 255.0;
-        let b = u8::from_str_radix(&film_base_hex[5..7], 16).unwrap_or(0) as f32 / 255.0;
-        [r, g, b]
-    } else {
-        [1.0, 0.53, 0.0] // Default orange
-    };
-
     let tone_mapper = js_adjustments["toneMapper"].as_str().unwrap_or("basic");
     let (pipe_to_rendering, rendering_to_pipe) = calculate_agx_matrices();
 
@@ -1373,23 +1349,7 @@ fn get_global_adjustments_from_json(
             0
         },
         is_raw_image: if is_raw { 1 } else { 0 },
-
-        enable_negative_conversion: if neg_conv_enabled { 1 } else { 0 },
-        film_base_r: film_base_rgb[0],
-        film_base_g: film_base_rgb[1],
-        film_base_b: film_base_rgb[2],
-        negative_red_balance: js_adjustments["negativeRedBalance"].as_f64().unwrap_or(0.0) as f32
-            / 100.0,
-        negative_green_balance: js_adjustments["negativeGreenBalance"]
-            .as_f64()
-            .unwrap_or(0.0) as f32
-            / 100.0,
-        negative_blue_balance: js_adjustments["negativeBlueBalance"]
-            .as_f64()
-            .unwrap_or(0.0) as f32
-            / 100.0,
-        _pad_neg1: 0.0,
-        _pad_neg2: 0.0,
+        _pad_ca1: 0.0,
 
         has_lut: if js_adjustments["lutPath"].is_string() {
             1
diff --git a/src-tauri/src/shaders/shader.wgsl b/src-tauri/src/shaders/shader.wgsl
@@ -62,16 +62,7 @@ struct GlobalAdjustments {
     chromatic_aberration_blue_yellow: f32,
     show_clipping: u32,
     is_raw_image: u32,
-
-    enable_negative_conversion: u32,
-    film_base_r: f32,
-    film_base_g: f32,
-    film_base_b: f32,
-    negative_red_balance: f32,
-    negative_green_balance: f32,
-    negative_blue_balance: f32,
-    _pad_neg1: f32,
-    _pad_neg2: f32,
+    _pad_ca1: f32,
 
     has_lut: u32,
     lut_intensity: f32,
@@ -1261,15 +1252,6 @@ fn main(@builtin(global_invocation_id) id: vec3<u32>) {
         initial_linear_rgb = color_from_texture;
     }
 
-    if (adjustments.global.enable_negative_conversion == 1u) {
-        initial_linear_rgb = vec3<f32>(1.0) - initial_linear_rgb;
-        let film_base_color = vec3<f32>(adjustments.global.film_base_r, adjustments.global.film_base_g, adjustments.global.film_base_b);
-        initial_linear_rgb -= film_base_color;
-        let balance_mult = vec3<f32>(1.0 + adjustments.global.negative_red_balance, 1.0 + adjustments.global.negative_green_balance, 1.0 + adjustments.global.negative_blue_balance);
-        initial_linear_rgb *= balance_mult;
-        initial_linear_rgb = max(initial_linear_rgb, vec3<f32>(0.0));
-    }
-
     let sharpness_blurred = textureLoad(sharpness_blur_texture, id.xy, 0).rgb;
     let clarity_blurred = textureLoad(clarity_blur_texture, id.xy, 0).rgb;
     let structure_blurred = textureLoad(structure_blur_texture, id.xy, 0).rgb;
diff --git a/src/components/adjustments/Effects.tsx b/src/components/adjustments/Effects.tsx
@@ -101,62 +101,6 @@ export default function EffectsPanel({
             />
           </div>
 
-          {adjustmentVisibility.negativeConversion !== false && (
-            <div className="mb-4 p-2 bg-bg-tertiary rounded-md">
-              <p className="text-md font-semibold mb-2 text-primary">Negative Conversion</p>
-              <div className="mb-2">
-                <Switch
-                  label="Enable"
-                  checked={!!adjustments.enableNegativeConversion}
-                  onChange={(checked: boolean) => handleCheckedChange(Effect.EnableNegativeConversion, checked)}
-                />
-              </div>
-              {adjustments.enableNegativeConversion && (
-                <div className="space-y-2 mt-2 pt-2 border-t border-bg-secondary">
-                  <div className="flex items-center justify-between">
-                    <label htmlFor="filmBaseColor" className="text-sm font-medium text-text-primary">
-                      Film Base Color
-                    </label>
-                    <input
-                      className="p-0 h-8 w-12 border-none rounded-md cursor-pointer bg-bg-secondary"
-                      id="filmBaseColor"
-                      onChange={(e: any) => handleColorChange(Effect.FilmBaseColor, e.target.value)}
-                      type="color"
-                      value={adjustments.filmBaseColor || '#ff8800'}
-                    />
-                  </div>
-                  <Slider
-                    label="Red Balance"
-                    max={100}
-                    min={-100}
-                    onChange={(e: any) => handleAdjustmentChange(Effect.NegativeRedBalance, e.target.value)}
-                    step={1}
-                    value={adjustments.negativeRedBalance || 0}
-                    onDragStateChange={onDragStateChange}
-                  />
-                  <Slider
-                    label="Green Balance"
-                    max={100}
-                    min={-100}
-                    onChange={(e: any) => handleAdjustmentChange(Effect.NegativeGreenBalance, e.target.value)}
-                    step={1}
-                    value={adjustments.negativeGreenBalance || 0}
-                    onDragStateChange={onDragStateChange}
-                  />
-                  <Slider
-                    label="Blue Balance"
-                    max={100}
-                    min={-100}
-                    onChange={(e: any) => handleAdjustmentChange(Effect.NegativeBlueBalance, e.target.value)}
-                    step={1}
-                    value={adjustments.negativeBlueBalance || 0}
-                    onDragStateChange={onDragStateChange}
-                  />
-                </div>
-              )}
-            </div>
-          )}
-
           {adjustmentVisibility.vignette !== false && (
             <div className="mb-4 p-2 bg-bg-tertiary rounded-md">
               <p className="text-md font-semibold mb-2 text-primary">Vignette</p>
diff --git a/src/components/panel/SettingsPanel.tsx b/src/components/panel/SettingsPanel.tsx
@@ -87,7 +87,6 @@ const adjustmentVisibilityDefaults = {
   presence: true,
   noiseReduction: true,
   chromaticAberration: false,
-  negativeConversion: false,
   vignette: true,
   colorCalibration: false,
   grain: true,
@@ -713,19 +712,6 @@ export default function SettingsPanel({
                         })
                       }
                     />
-                    <Switch
-                      label="Negative Conversion"
-                      checked={appSettings?.adjustmentVisibility?.negativeConversion ?? false}
-                      onChange={(checked) =>
-                        onSettingsChange({
-                          ...appSettings,
-                          adjustmentVisibility: {
-                            ...(appSettings?.adjustmentVisibility || adjustmentVisibilityDefaults),
-                            negativeConversion: checked,
-                          },
-                        })
-                      }
-                    />
                   </div>
                 </div>
 
diff --git a/src/utils/adjustments.tsx b/src/utils/adjustments.tsx
@@ -70,15 +70,10 @@ export enum DetailsAdjustment {
 }
 
 export enum Effect {
-  EnableNegativeConversion = 'enableNegativeConversion',
-  FilmBaseColor = 'filmBaseColor',
   GrainAmount = 'grainAmount',
   GrainRoughness = 'grainRoughness',
   GrainSize = 'grainSize',
   LutIntensity = 'lutIntensity',
-  NegativeBlueBalance = 'negativeBlueBalance',
-  NegativeGreenBalance = 'negativeGreenBalance',
-  NegativeRedBalance = 'negativeRedBalance',
   VignetteAmount = 'vignetteAmount',
   VignetteFeather = 'vignetteFeather',
   VignetteMidpoint = 'vignetteMidpoint',
@@ -141,9 +136,7 @@ export interface Adjustments {
   curves: Curves;
   crop: Crop | null;
   dehaze: number;
-  enableNegativeConversion: boolean;
   exposure: number;
-  filmBaseColor: string;
   flipHorizontal: boolean;
   flipVertical: boolean;
   flareAmount: number;
@@ -180,9 +173,6 @@ export interface Adjustments {
   lutPath?: string | null;
   lutSize?: number;
   masks: Array<MaskContainer>;
-  negativeBlueBalance: number;
-  negativeGreenBalance: number;
-  negativeRedBalance: number;
   orientationSteps: number;
   rating: number;
   rotation: number;
@@ -451,9 +441,7 @@ export const INITIAL_ADJUSTMENTS: Adjustments = {
     ],
   },
   dehaze: 0,
-  enableNegativeConversion: false,
   exposure: 0,
-  filmBaseColor: '#ff8800',
   flipHorizontal: false,
   flipVertical: false,
   flareAmount: 0,
@@ -489,9 +477,6 @@ export const INITIAL_ADJUSTMENTS: Adjustments = {
   lutPath: null,
   lutSize: 0,
   masks: [],
-  negativeBlueBalance: 0,
-  negativeGreenBalance: 0,
-  negativeRedBalance: 0,
   orientationSteps: 0,
   rating: 0,
   rotation: 0,
@@ -623,9 +608,7 @@ export const COPYABLE_ADJUSTMENT_KEYS: Array<string> = [
   BasicAdjustment.Contrast,
   'curves',
   DetailsAdjustment.Dehaze,
-  Effect.EnableNegativeConversion,
   BasicAdjustment.Exposure,
-  Effect.FilmBaseColor,
   CreativeAdjustment.FlareAmount,
   CreativeAdjustment.GlowAmount,
   Effect.GrainAmount,
@@ -639,9 +622,6 @@ export const COPYABLE_ADJUSTMENT_KEYS: Array<string> = [
   'lutPath',
   'lutSize',
   DetailsAdjustment.LumaNoiseReduction,
-  Effect.NegativeBlueBalance,
-  Effect.NegativeGreenBalance,
-  Effect.NegativeRedBalance,
   ColorAdjustment.Saturation,
   'sectionVisibility',
   BasicAdjustment.Shadows,
@@ -692,18 +672,13 @@ export const ADJUSTMENT_SECTIONS: Sections = {
     DetailsAdjustment.ChromaticAberrationBlueYellow,
   ],
   effects: [
-    Effect.EnableNegativeConversion,
-    Effect.FilmBaseColor,
     CreativeAdjustment.GlowAmount,
     CreativeAdjustment.HalationAmount,
     CreativeAdjustment.FlareAmount,
     Effect.GrainAmount,
     Effect.GrainRoughness,
     Effect.GrainSize,
     Effect.LutIntensity,
-    Effect.NegativeBlueBalance,
-    Effect.NegativeGreenBalance,
-    Effect.NegativeRedBalance,
     Effect.VignetteAmount,
     Effect.VignetteFeather,
     Effect.VignetteMidpoint,
