From 64eed4def94cecda446d8803f8f87953e71b78b7 Mon Sep 17 00:00:00 2001 From: CUB3D Date: Sat, 4 Jul 2020 21:02:01 +0100 Subject: [PATCH] chore: Cleanup --- core/src/avm1/globals/color_transform.rs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/core/src/avm1/globals/color_transform.rs b/core/src/avm1/globals/color_transform.rs index 68c76dd68..987887751 100644 --- a/core/src/avm1/globals/color_transform.rs +++ b/core/src/avm1/globals/color_transform.rs @@ -10,6 +10,7 @@ use gc_arena::MutationContext; use crate::avm1::color_transform_object::ColorTransformObject; use std::convert::Into; +use crate::color_transform::ColorTransform; macro_rules! with_color_transform { ($obj: ident, $gc: ident, $($name: expr => [$get: ident, $set: ident],)*) => { @@ -77,15 +78,16 @@ pub fn constructor<'gc>( Ok(Value::Undefined) } -/*pub fn object_to_color_transform<'gc>( +// We'll need this soon! +#[allow(dead_code)] +pub fn object_to_color_transform<'gc>( object: Object<'gc>, activation: &mut Activation<'_, 'gc>, context: &mut UpdateContext<'_, 'gc, '_>, ) -> Result> { - //TODO: let red_multiplier = object - .get("redMultiplier", activation, context)? - .coerce_to_f64(activation, context)? as f32; + .get("redMultiplier", activation, context)? + .coerce_to_f64(activation, context)? as f32; let green_multiplier = object .get("greenMultiplier", activation, context)? .coerce_to_f64(activation, context)? as f32; @@ -118,7 +120,7 @@ pub fn constructor<'gc>( b_add: blue_offset, a_add: alpha_offset, }) -}*/ +} pub fn get_rgb<'gc>( _activation: &mut Activation<'_, 'gc>,