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: Convert sprite to use ParametersExt

This commit is contained in:
Nathan Adams 2023-03-17 13:57:25 +01:00
parent b19ddbe0fc
commit 652a8f86d6
1 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
core/src/avm2/globals/flash/display/sprite.rs
View File

@ -113,11 +113,7 @@ pub fn set_sound_transform<'gc>(
args: &[Value<'gc>],
) -> Result<Value<'gc>, Error<'gc>> {
if let Some(dobj) = this.and_then(|o| o.as_display_object()) {
let as3_st = args
.get(0)
.cloned()
.unwrap_or(Value::Undefined)
.coerce_to_object(activation)?;
let as3_st = args.get_object(activation, 0, "value")?;
let dobj_st = SoundTransform::from_avm2_object(activation, as3_st)?;
dobj.set_sound_transform(&mut activation.context, dobj_st);
@ -168,7 +164,7 @@ pub fn start_drag<'gc>(
args: &[Value<'gc>],
) -> Result<Value<'gc>, Error<'gc>> {
if let Some(display_object) = this.and_then(|this| this.as_display_object()) {
let lock_center = args.get(0).map(|o| o.coerce_to_boolean()).unwrap_or(false);
let lock_center = args.get_bool(0);
let offset = if lock_center {
// The object's origin point is locked to the mouse.
@ -181,21 +177,21 @@ pub fn start_drag<'gc>(
(object_x - mouse_x, object_y - mouse_y)
};
let constraint = if !matches!(args[1], Value::Null) {
let rect = args[1].coerce_to_object(activation)?;
let x = rect
let rectangle = args.try_get_object(activation, 1);
let constraint = if let Some(rectangle) = rectangle {
let x = rectangle
.get_public_property("x", activation)?
.coerce_to_number(activation)?;
let y = rect
let y = rectangle
.get_public_property("y", activation)?
.coerce_to_number(activation)?;
let width = rect
let width = rectangle
.get_public_property("width", activation)?
.coerce_to_number(activation)?;
let height = rect
let height = rectangle
.get_public_property("height", activation)?
.coerce_to_number(activation)?;
@ -274,13 +270,7 @@ pub fn set_use_hand_cursor<'gc>(
.and_then(|this| this.as_display_object())
.and_then(|this| this.as_movie_clip())
{
mc.set_use_hand_cursor(
&mut activation.context,
args.get(0)
.cloned()
.unwrap_or(Value::Undefined)
.coerce_to_boolean(),
);
mc.set_use_hand_cursor(&mut activation.context, args.get_bool(0));
}
Ok(Value::Undefined)
@ -313,12 +303,10 @@ pub fn set_hit_area<'gc>(
.and_then(|this| this.as_display_object())
.and_then(|this| this.as_movie_clip())
{
mc.set_hit_area(
&mut activation.context,
args.get(0)
.and_then(|hit_area| hit_area.as_object())
.and_then(|hit_area| hit_area.as_display_object()),
);
let object = args
.try_get_object(activation, 0)
.and_then(|hit_area| hit_area.as_display_object());
mc.set_hit_area(&mut activation.context, object);
}
Ok(Value::Undefined)