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

avm2: Clamp filter quality to (0, 15) instead of (1, 15)

This commit is contained in:
TÖRÖK Attila 2023-07-24 22:03:11 +02:00 committed by Nathan Adams
parent 1c1a4aee18
commit 365f6bee6e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/avm2/filters.rs
View File

@ -230,7 +230,7 @@ fn avm2_to_bevel_filter<'gc>(
flags |= BevelFilterFlags::ON_TOP; flags |= BevelFilterFlags::ON_TOP;
} }
flags.set(BevelFilterFlags::KNOCKOUT, knockout); flags.set(BevelFilterFlags::KNOCKOUT, knockout);
flags |= BevelFilterFlags::from_passes(quality.clamp(1, 15) as u8); flags |= BevelFilterFlags::from_passes(quality.clamp(0, 15) as u8);
Ok(Filter::BevelFilter(BevelFilter { Ok(Filter::BevelFilter(BevelFilter {
shadow_color: Color::from_rgb(shadow_color, (shadow_alpha * 255.0) as u8), shadow_color: Color::from_rgb(shadow_color, (shadow_alpha * 255.0) as u8),
highlight_color: Color::from_rgb(highlight_color, (highlight_alpha * 255.0) as u8), highlight_color: Color::from_rgb(highlight_color, (highlight_alpha * 255.0) as u8),
@ -289,7 +289,7 @@ fn avm2_to_blur_filter<'gc>(
Ok(Filter::BlurFilter(BlurFilter { Ok(Filter::BlurFilter(BlurFilter {
blur_x: Fixed16::from_f64(blur_x.max(0.0)), blur_x: Fixed16::from_f64(blur_x.max(0.0)),
blur_y: Fixed16::from_f64(blur_y.max(0.0)), blur_y: Fixed16::from_f64(blur_y.max(0.0)),
flags: BlurFilterFlags::from_passes(quality.clamp(1, 15) as u8), flags: BlurFilterFlags::from_passes(quality.clamp(0, 15) as u8),
})) }))
} }
@ -586,7 +586,7 @@ fn avm2_to_drop_shadow_filter<'gc>(
} }
flags.set(DropShadowFilterFlags::INNER_SHADOW, inner); flags.set(DropShadowFilterFlags::INNER_SHADOW, inner);
flags.set(DropShadowFilterFlags::KNOCKOUT, knockout); flags.set(DropShadowFilterFlags::KNOCKOUT, knockout);
flags |= DropShadowFilterFlags::from_passes(quality.clamp(1, 15) as u8); flags |= DropShadowFilterFlags::from_passes(quality.clamp(0, 15) as u8);
Ok(Filter::DropShadowFilter(DropShadowFilter { Ok(Filter::DropShadowFilter(DropShadowFilter {
color: Color::from_rgb(color, (alpha * 255.0) as u8), color: Color::from_rgb(color, (alpha * 255.0) as u8),
angle: Fixed16::from_f64(angle.to_radians()), angle: Fixed16::from_f64(angle.to_radians()),
@ -651,7 +651,7 @@ fn avm2_to_glow_filter<'gc>(
let mut flags = GlowFilterFlags::COMPOSITE_SOURCE; let mut flags = GlowFilterFlags::COMPOSITE_SOURCE;
flags.set(GlowFilterFlags::INNER_GLOW, inner); flags.set(GlowFilterFlags::INNER_GLOW, inner);
flags.set(GlowFilterFlags::KNOCKOUT, knockout); flags.set(GlowFilterFlags::KNOCKOUT, knockout);
flags |= GlowFilterFlags::from_passes(quality.clamp(1, 15) as u8); flags |= GlowFilterFlags::from_passes(quality.clamp(0, 15) as u8);
Ok(Filter::GlowFilter(GlowFilter { Ok(Filter::GlowFilter(GlowFilter {
color: Color::from_rgb(color, (alpha * 255.0) as u8), color: Color::from_rgb(color, (alpha * 255.0) as u8),
blur_x: Fixed16::from_f64(blur_x.max(0.0)), blur_x: Fixed16::from_f64(blur_x.max(0.0)),
@ -716,7 +716,7 @@ fn avm2_to_gradient_filter<'gc>(
} else if &bevel_type != b"outer" { } else if &bevel_type != b"outer" {
flags |= GradientFilterFlags::ON_TOP; flags |= GradientFilterFlags::ON_TOP;
} }
flags |= GradientFilterFlags::from_passes(quality.clamp(1, 15) as u8); flags |= GradientFilterFlags::from_passes(quality.clamp(0, 15) as u8);
Ok(GradientFilter { Ok(GradientFilter {
colors, colors,
blur_x: Fixed16::from_f64(blur_x.max(0.0)), blur_x: Fixed16::from_f64(blur_x.max(0.0)),