liangsheng8708
/
ruffle
mirror of https://mirror.ghproxy.com/https://github.com/ruffle-rs/ruffle.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

canvas: Remove `clamped_u8_color` function 

Since Rust 1.45, the `as` keyword performs a saturating cast when
casting from float to int. Therefore the `clamped_u8_color` function
is useless, and `as` can be simply used instead.
This commit is contained in:
relrelb 2022-03-28 22:11:10 +03:00 committed by Mike Welsh
parent fcb5eaec0e
commit e27240e434
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
render/canvas/src/lib.rs
View File

@ -37,27 +37,16 @@ struct ShapeData(Vec<CanvasDrawCommand>);
struct CanvasColor(String, u8, u8, u8, u8);
/// Convert an f32 to a u8, clamping all out-of-range values to the `u8` range.
fn clamped_u8_color(v: f32) -> u8 {
if v < 0.0 {
0
} else if v > 255.0 {
255
} else {
v as u8
}
}
impl CanvasColor {
/// Apply a color transformation to this color.
fn color_transform(&self, cxform: &ColorTransform) -> CanvasColor {
let CanvasColor(_, r, g, b, a) = self;
let r = clamped_u8_color(*r as f32 * cxform.r_mult.to_f32() + (cxform.r_add as f32));
let g = clamped_u8_color(*g as f32 * cxform.g_mult.to_f32() + (cxform.g_add as f32));
let b = clamped_u8_color(*b as f32 * cxform.b_mult.to_f32() + (cxform.b_add as f32));
let a = clamped_u8_color(*a as f32 * cxform.a_mult.to_f32() + (cxform.a_add as f32));
fn color_transform(&self, cxform: &ColorTransform) -> Self {
let Self(_, r, g, b, a) = self;
let r = (*r as f32 * cxform.r_mult.to_f32() + (cxform.r_add as f32)) as u8;
let g = (*g as f32 * cxform.g_mult.to_f32() + (cxform.g_add as f32)) as u8;
let b = (*b as f32 * cxform.b_mult.to_f32() + (cxform.b_add as f32)) as u8;
let a = (*a as f32 * cxform.a_mult.to_f32() + (cxform.a_add as f32)) as u8;
let colstring = format!("rgba({},{},{},{})", r, g, b, f32::from(a) / 255.0);
CanvasColor(colstring, r, g, b, a)
Self(colstring, r, g, b, a)
}
}