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

avm1: Remove `get_` prefix from `ColorTransformObject` getters 

To match Rust naming conventions.
This commit is contained in:
relrelb 2022-09-10 10:07:53 +03:00 committed by relrelb
parent e7643c731b
commit 4828a9c5cf
2 changed files with 41 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
core/src/avm1/globals/color_transform.rs
View File

@ -121,9 +121,9 @@ pub fn get_rgb<'gc>(
_args: &[Value<'gc>], _args: &[Value<'gc>],
) -> Result<Value<'gc>, Error<'gc>> { ) -> Result<Value<'gc>, Error<'gc>> {
if let Some(ct) = this.as_color_transform_object() { if let Some(ct) = this.as_color_transform_object() {
let rgb = ((ct.get_red_offset() as u32) << 16) let rgb = ((ct.red_offset() as u32) << 16)
| ((ct.get_green_offset() as u32) << 8) | ((ct.green_offset() as u32) << 8)
| (ct.get_blue_offset() as u32); | (ct.blue_offset() as u32);
Ok(rgb.into()) Ok(rgb.into())
} else { } else {
Ok(Value::Undefined) Ok(Value::Undefined)
@ -155,7 +155,7 @@ pub fn set_rgb<'gc>(
} }
macro_rules! color_transform_value_accessor { macro_rules! color_transform_value_accessor {
($([$get_ident: ident, $set_ident: ident],)*) => { ($([$get_ident: ident, $ident: ident, $set_ident: ident],)*) => {
$( $(
pub fn $set_ident<'gc>( pub fn $set_ident<'gc>(
activation: &mut Activation<'_, 'gc, '_>, activation: &mut Activation<'_, 'gc, '_>,
@ -179,7 +179,7 @@ macro_rules! color_transform_value_accessor {
_args: &[Value<'gc>], _args: &[Value<'gc>],
) -> Result<Value<'gc>, Error<'gc>> { ) -> Result<Value<'gc>, Error<'gc>> {
if let Some(ct) = this.as_color_transform_object() { if let Some(ct) = this.as_color_transform_object() {
Ok(ct.$get_ident().into()) Ok(ct.$ident().into())
} else { } else {
Ok(Value::Undefined) Ok(Value::Undefined)
} }
@ -189,14 +189,14 @@ macro_rules! color_transform_value_accessor {
} }
color_transform_value_accessor!( color_transform_value_accessor!(
[get_red_multiplier, set_red_multiplier], [get_red_multiplier, red_multiplier, set_red_multiplier],
[get_green_multiplier, set_green_multiplier], [get_green_multiplier, green_multiplier, set_green_multiplier],
[get_blue_multiplier, set_blue_multiplier], [get_blue_multiplier, blue_multiplier, set_blue_multiplier],
[get_alpha_multiplier, set_alpha_multiplier], [get_alpha_multiplier, alpha_multiplier, set_alpha_multiplier],
[get_red_offset, set_red_offset], [get_red_offset, red_offset, set_red_offset],
[get_green_offset, set_green_offset], [get_green_offset, green_offset, set_green_offset],
[get_blue_offset, set_blue_offset], [get_blue_offset, blue_offset, set_blue_offset],
[get_alpha_offset, set_alpha_offset], [get_alpha_offset, alpha_offset, set_alpha_offset],
); );
pub fn create_proto<'gc>( pub fn create_proto<'gc>(
@ -247,18 +247,18 @@ fn concat<'gc>(
other.as_color_transform_object(), other.as_color_transform_object(),
this.as_color_transform_object(), this.as_color_transform_object(),
) { ) {
let red_multiplier = other_ct.get_red_multiplier() * this_ct.get_red_multiplier(); let red_multiplier = other_ct.red_multiplier() * this_ct.red_multiplier();
let green_multiplier = other_ct.get_green_multiplier() * this_ct.get_green_multiplier(); let green_multiplier = other_ct.green_multiplier() * this_ct.green_multiplier();
let blue_multiplier = other_ct.get_blue_multiplier() * this_ct.get_blue_multiplier(); let blue_multiplier = other_ct.blue_multiplier() * this_ct.blue_multiplier();
let alpha_multiplier = other_ct.get_alpha_multiplier() * this_ct.get_alpha_multiplier(); let alpha_multiplier = other_ct.alpha_multiplier() * this_ct.alpha_multiplier();
let red_offset = (other_ct.get_red_offset() * this_ct.get_red_multiplier()) let red_offset =
+ this_ct.get_red_offset(); (other_ct.red_offset() * this_ct.red_multiplier()) + this_ct.red_offset();
let green_offset = (other_ct.get_green_offset() * this_ct.get_green_multiplier()) let green_offset =
+ this_ct.get_green_offset(); (other_ct.green_offset() * this_ct.green_multiplier()) + this_ct.green_offset();
let blue_offset = (other_ct.get_blue_offset() * this_ct.get_blue_multiplier()) let blue_offset =
+ this_ct.get_blue_offset(); (other_ct.blue_offset() * this_ct.blue_multiplier()) + this_ct.blue_offset();
let alpha_offset = (other_ct.get_alpha_offset() * this_ct.get_alpha_multiplier()) let alpha_offset =
+ this_ct.get_alpha_offset(); (other_ct.alpha_offset() * this_ct.alpha_multiplier()) + this_ct.alpha_offset();
this_ct.set_red_multiplier(activation.context.gc_context, red_multiplier); this_ct.set_red_multiplier(activation.context.gc_context, red_multiplier);
this_ct.set_green_multiplier(activation.context.gc_context, green_multiplier); this_ct.set_green_multiplier(activation.context.gc_context, green_multiplier);

37
core/src/avm1/object/color_transform_object.rs
View File

@ -65,29 +65,24 @@ impl<'gc> ColorTransformObject<'gc> {
} }
add_field_accessors!( add_field_accessors!(
[set_red_multiplier, get_red_multiplier, red_multiplier, f64], [set_red_multiplier, red_multiplier, red_multiplier, f64],
[ [
set_green_multiplier, set_green_multiplier,
get_green_multiplier, green_multiplier,
green_multiplier, green_multiplier,
f64 f64
], ],
[ [set_blue_multiplier, blue_multiplier, blue_multiplier, f64],
set_blue_multiplier,
get_blue_multiplier,
blue_multiplier,
f64
],
[ [
set_alpha_multiplier, set_alpha_multiplier,
get_alpha_multiplier, alpha_multiplier,
alpha_multiplier, alpha_multiplier,
f64 f64
], ],
[set_red_offset, get_red_offset, red_offset, f64], [set_red_offset, red_offset, red_offset, f64],
[set_green_offset, get_green_offset, green_offset, f64], [set_green_offset, green_offset, green_offset, f64],
[set_blue_offset, get_blue_offset, blue_offset, f64], [set_blue_offset, blue_offset, blue_offset, f64],
[set_alpha_offset, get_alpha_offset, alpha_offset, f64], [set_alpha_offset, alpha_offset, alpha_offset, f64],
); );
} }
@ -100,14 +95,14 @@ impl<'gc> TObject<'gc> for ColorTransformObject<'gc> {
impl From<ColorTransformObject<'_>> for ColorTransform { impl From<ColorTransformObject<'_>> for ColorTransform {
fn from(object: ColorTransformObject) -> Self { fn from(object: ColorTransformObject) -> Self {
Self { Self {
r_mult: Fixed8::from_f64(object.get_red_multiplier()), r_mult: Fixed8::from_f64(object.red_multiplier()),
g_mult: Fixed8::from_f64(object.get_green_multiplier()), g_mult: Fixed8::from_f64(object.green_multiplier()),
b_mult: Fixed8::from_f64(object.get_blue_multiplier()), b_mult: Fixed8::from_f64(object.blue_multiplier()),
a_mult: Fixed8::from_f64(object.get_alpha_multiplier()), a_mult: Fixed8::from_f64(object.alpha_multiplier()),
r_add: object.get_red_offset() as i16, r_add: object.red_offset() as i16,
g_add: object.get_green_offset() as i16, g_add: object.green_offset() as i16,
b_add: object.get_blue_offset() as i16, b_add: object.blue_offset() as i16,
a_add: object.get_alpha_offset() as i16, a_add: object.alpha_offset() as i16,
} }
} }
} }