Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 22:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

style: Do hue interpolations in degrees rather than radians. r=barret

Browse source 
This gives us a bit more precision.

Differential Revision: https://phabricator.services.mozilla.com/D147007
This commit is contained in:
Emilio Cobos Álvarez 2023-08-15 00:52:44 +02:00 • committed by Martin Robinson
parent bc1845a8f8
commit 079fce37d2
1 changed files with 21 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

47
components/style/values/animated/color.rs
View file

@ -9,7 +9,7 @@ use crate::values::distance::{ComputeSquaredDistance, SquaredDistance};
use crate::values::generics::color::{Color as GenericColor, ComplexColorRatios};
use crate::values::specified::color::{ColorInterpolationMethod, ColorSpace, HueInterpolationMethod};
use euclid::default::{Transform3D, Vector3D};
use std::f32::consts::{PI, TAU};
use std::f32::consts::PI;
/// An animated RGBA color.
///
@ -29,6 +29,7 @@ pub struct RGBA {
}
const RAD_PER_DEG: f32 = PI / 180.0;
const DEG_PER_RAD: f32 = 180.0 / PI;
impl RGBA {
/// Returns a transparent color.
@ -389,15 +390,9 @@ fn interpolate_premultiplied_component(
(left * left_weight * left_alpha + right * right_weight * right_alpha) * inverse_of_result_alpha
}
// Normalize hue into [0, 2 * PI)
fn normalize_hue(mut v: f32) -> f32 {
while v < 0. {
v += TAU;
}
while v >= TAU {
v -= TAU;
}
v
// Normalize hue into [0, 360)
fn normalize_hue(v: f32) -> f32 {
v - 360. * (v / 360.).floor()
}
fn adjust_hue(left: &mut f32, right: &mut f32, hue_interpolation: HueInterpolationMethod) {
@ -431,31 +426,31 @@ fn adjust_hue(left: &mut f32, right: &mut f32, hue_interpolation: HueInterpolati
HueInterpolationMethod::Shorter => {
let delta = *right - *left;
if delta > PI {
*left += TAU;
} else if delta < -PI {
*right += TAU;
if delta > 180. {
*left += 360.;
} else if delta < -180. {
*right += 360.;
}
},
// https://drafts.csswg.org/css-color/#longer
HueInterpolationMethod::Longer => {
let delta = *right - *left;
if 0. < delta && delta < PI {
*left += TAU;
} else if -1. * PI < delta && delta < 0. {
*right += TAU;
if 0. < delta && delta < 180. {
*left += 360.;
} else if -180. < delta && delta < 0. {
*right += 360.;
}
},
// https://drafts.csswg.org/css-color/#increasing
HueInterpolationMethod::Increasing => {
if *right < *left {
*right += TAU;
*right += 360.;
}
},
// https://drafts.csswg.org/css-color/#decreasing
HueInterpolationMethod::Decreasing => {
if *left < *right {
*left += TAU;
*left += 360.;
}
},
HueInterpolationMethod::Specified => unreachable!("Handled above"),
@ -643,7 +638,6 @@ fn rgb_to_hsl(rgba: RGBA) -> (HSLA, f32, f32) {
}
hue *= 60.;
hue *= RAD_PER_DEG;
}
(HSLA { hue, sat, light, alpha }, min, max)
@ -658,7 +652,7 @@ impl From<RGBA> for HSLA {
impl From<HSLA> for RGBA {
fn from(hsla: HSLA) -> Self {
// cssparser expects hue in the 0..1 range.
let hue_normalized = normalize_hue(hsla.hue) / TAU;
let hue_normalized = normalize_hue(hsla.hue) / 360.;
let (r, g, b) = cssparser::hsl_to_rgb(hue_normalized, hsla.sat, hsla.light);
RGBA::new(r, g, b, hsla.alpha)
}
@ -679,7 +673,7 @@ impl From<RGBA> for HWBA {
impl From<HWBA> for RGBA {
fn from(hwba: HWBA) -> Self {
let hue_normalized = normalize_hue(hwba.hue) / TAU;
let hue_normalized = normalize_hue(hwba.hue) / 360.;
let (r, g, b) = cssparser::hwb_to_rgb(hue_normalized, hwba.white, hwba.black);
RGBA::new(r, g, b, hwba.alpha)
}
@ -868,7 +862,7 @@ impl From<LABA> for LCHA {
///
/// [1]: https://drafts.csswg.org/css-color/#color-conversion-code
fn from(laba: LABA) -> Self {
let hue = laba.b.atan2(laba.a);
let hue = laba.b.atan2(laba.a) * DEG_PER_RAD;
let chroma = (laba.a * laba.a + laba.b * laba.b).sqrt();
LCHA {
lightness: laba.lightness,
@ -884,8 +878,9 @@ impl From<LCHA> for LABA {
///
/// [1]: https://drafts.csswg.org/css-color/#color-conversion-code
fn from(lcha: LCHA) -> Self {
let a = lcha.chroma * lcha.hue.cos();
let b = lcha.chroma * lcha.hue.sin();
let hue_radians = lcha.hue * RAD_PER_DEG;
let a = lcha.chroma * hue_radians.cos();
let b = lcha.chroma * hue_radians.sin();
LABA {
lightness: lcha.lightness,
a,