fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-20 03:18:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Implement the correct Brightness/Contrast node algorithm (#1130)

Browse Source 
Implement correct brightness/contrast algorithm
This commit is contained in:
Keavon Chambers
2023-04-15 05:15:58 -07:00
committed by GitHub
parent e60e621aae
commit b133fc7feb
8 changed files with 398 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
node-graph/gcore/src/raster/adjustments.rs
View File

@@ -285,6 +285,7 @@ pub use hue_shift::HueSaturationNode;
#[cfg(not(target_arch = "spirv"))]
mod hue_shift {
use super::*;
#[derive(Debug)]
pub struct HueSaturationNode<Hue, Saturation, Lightness> {
hue_shift: Hue,
@@ -461,21 +462,6 @@ fn vibrance_node(color: Color, vibrance: f64) -> Color {
altered_color.to_gamma_srgb()
}
#[derive(Debug, Clone, Copy)]
pub struct BrightnessContrastNode<Brightness, Contrast> {
brightness: Brightness,
contrast: Contrast,
}
// From https://stackoverflow.com/questions/2976274/adjust-bitmap-image-brightness-contrast-using-c
#[node_macro::node_fn(BrightnessContrastNode)]
fn adjust_image_brightness_and_contrast(color: Color, brightness: f64, contrast: f64) -> Color {
let (brightness, contrast) = (brightness as f32, contrast as f32);
let factor = (259. * (contrast + 255.)) / (255. * (259. - contrast));
let channel = |channel: f32| ((factor * (channel * 255. + brightness - 128.) + 128.) / 255.).clamp(0., 1.);
color.map_rgb(channel)
}
#[derive(Debug, Clone, Copy)]
pub struct OpacityNode<O> {
opacity_multiplier: O,
@@ -524,5 +510,6 @@ fn exposure(color: Color, exposure: f64, offset: f64, gamma_correction: f64) ->
.gamma(gamma_correction as f32)
.map_rgb(|c: f32| c.clamp(0., 1.));
// TODO: Remove conversion to linear when the whole node graph uses linear color
result.to_gamma_srgb()
}