diff --git a/core/src/avm1/globals/blur_filter.rs b/core/src/avm1/globals/blur_filter.rs index bf7fcfb9c..a64c18abf 100644 --- a/core/src/avm1/globals/blur_filter.rs +++ b/core/src/avm1/globals/blur_filter.rs @@ -4,11 +4,9 @@ use crate::avm1::activation::Activation; use crate::avm1::error::Error; use crate::avm1::function::{Executable, FunctionObject}; use crate::avm1::object::blur_filter::BlurFilterObject; -use crate::avm1::property::Attribute; use crate::avm1::{Object, TObject, Value}; use enumset::EnumSet; use gc_arena::MutationContext; -use quick_xml::events::attributes::Attributes; pub fn constructor<'gc>( activation: &mut Activation<'_, 'gc, '_>, @@ -33,15 +31,11 @@ pub fn constructor<'gc>( .coerce_to_i32(activation) .map(|x| x.max(0).min(15))?; - println!("args = {}, {}, {}", blur_x, blur_y, quality); - let blur_filter = this.as_blur_filter_object().unwrap(); - blur_filter.set_blur_x(activation.context.gc_context, blur_x.into()); - blur_filter.set_blur_y(activation.context.gc_context, blur_y.into()); - blur_filter.set_quality(activation.context.gc_context, quality.into()); - - println!("constructor called, bf: {:?}", blur_filter); + blur_filter.set_blur_x(activation.context.gc_context, blur_x); + blur_filter.set_blur_y(activation.context.gc_context, blur_y); + blur_filter.set_quality(activation.context.gc_context, quality); Ok(Value::Undefined) } @@ -66,7 +60,6 @@ pub fn get_blur_x<'gc>( this: Object<'gc>, _args: &[Value<'gc>], ) -> Result, Error<'gc>> { - println!("Get blur x"); Ok(this.as_blur_filter_object().unwrap().get_blur_x().into()) } @@ -150,7 +143,6 @@ pub fn create_proto<'gc>( object.force_set_function("clone", clone, gc_context, EnumSet::empty(), Some(fn_proto)); - //TODO: check attribs object.add_property( gc_context, "blurX", diff --git a/core/tests/swfs/avm1/blur_filter/output.txt b/core/tests/swfs/avm1/blur_filter/output.txt index 41fb62290..68e316e5c 100644 --- a/core/tests/swfs/avm1/blur_filter/output.txt +++ b/core/tests/swfs/avm1/blur_filter/output.txt @@ -34,7 +34,3 @@ false 255 // oob_over.quality 15 -// prototype[clone] = [type Function] -// prototype[quality] = undefined -// prototype[blurY] = undefined -// prototype[blurX] = undefined diff --git a/core/tests/swfs/avm1/blur_filter/test.fla b/core/tests/swfs/avm1/blur_filter/test.fla index 58c846f39..e93920227 100644 Binary files a/core/tests/swfs/avm1/blur_filter/test.fla and b/core/tests/swfs/avm1/blur_filter/test.fla differ diff --git a/core/tests/swfs/avm1/blur_filter/test.swf b/core/tests/swfs/avm1/blur_filter/test.swf index 120409181..01b178178 100644 Binary files a/core/tests/swfs/avm1/blur_filter/test.swf and b/core/tests/swfs/avm1/blur_filter/test.swf differ