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

core: Ensure the new scale is finite when setting the width / height of display objects.

This commit is contained in:
desuwa 2021-04-06 23:58:13 +02:00 committed by kmeisthax
parent 1020aa84d6
commit fa1fde7083
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
core/src/display_object.rs
View File

@ -605,10 +605,19 @@ pub trait TDisplayObject<'gc>:
let rotation = self.rotation(gc_context); let rotation = self.rotation(gc_context);
let cos = f64::abs(f64::cos(rotation.into_radians())); let cos = f64::abs(f64::cos(rotation.into_radians()));
let sin = f64::abs(f64::sin(rotation.into_radians())); let sin = f64::abs(f64::sin(rotation.into_radians()));
let new_scale_x = aspect_ratio * (cos * target_scale_x + sin * target_scale_y) let mut new_scale_x = aspect_ratio * (cos * target_scale_x + sin * target_scale_y)
/ ((cos + aspect_ratio * sin) * (aspect_ratio * cos + sin)); / ((cos + aspect_ratio * sin) * (aspect_ratio * cos + sin));
let new_scale_y = let mut new_scale_y =
(sin * prev_scale_x + aspect_ratio * cos * prev_scale_y) / (aspect_ratio * cos + sin); (sin * prev_scale_x + aspect_ratio * cos * prev_scale_y) / (aspect_ratio * cos + sin);
if !new_scale_x.is_finite() {
new_scale_x = 0.0;
}
if !new_scale_y.is_finite() {
new_scale_y = 0.0;
}
self.set_scale_x(gc_context, Percent::from_unit(new_scale_x)); self.set_scale_x(gc_context, Percent::from_unit(new_scale_x));
self.set_scale_y(gc_context, Percent::from_unit(new_scale_y)); self.set_scale_y(gc_context, Percent::from_unit(new_scale_y));
} }
@ -644,10 +653,19 @@ pub trait TDisplayObject<'gc>:
let rotation = self.rotation(gc_context); let rotation = self.rotation(gc_context);
let cos = f64::abs(f64::cos(rotation.into_radians())); let cos = f64::abs(f64::cos(rotation.into_radians()));
let sin = f64::abs(f64::sin(rotation.into_radians())); let sin = f64::abs(f64::sin(rotation.into_radians()));
let new_scale_x = let mut new_scale_x =
(aspect_ratio * cos * prev_scale_x + sin * prev_scale_y) / (aspect_ratio * cos + sin); (aspect_ratio * cos * prev_scale_x + sin * prev_scale_y) / (aspect_ratio * cos + sin);
let new_scale_y = aspect_ratio * (sin * target_scale_x + cos * target_scale_y) let mut new_scale_y = aspect_ratio * (sin * target_scale_x + cos * target_scale_y)
/ ((cos + aspect_ratio * sin) * (aspect_ratio * cos + sin)); / ((cos + aspect_ratio * sin) * (aspect_ratio * cos + sin));
if !new_scale_x.is_finite() {
new_scale_x = 0.0;
}
if !new_scale_y.is_finite() {
new_scale_y = 0.0;
}
self.set_scale_x(gc_context, Percent::from_unit(new_scale_x)); self.set_scale_x(gc_context, Percent::from_unit(new_scale_x));
self.set_scale_y(gc_context, Percent::from_unit(new_scale_y)); self.set_scale_y(gc_context, Percent::from_unit(new_scale_y));
} }