core: Use interior mutability for DisplayObjectBase

The only 'cast' method is now `TDisplayObject::base`, which now returns a
`Gc<DisplayObjectBase>`.

Author: moulins

core/src/avm1/globals/color.rs

@@ -142,14 +142,15 @@ fn set_rgb<'gc>(
             .coerce_to_i32(activation)?;
         let [b, g, r, _] = rgb.to_le_bytes();
 
-        let mut base = target.base_mut(activation.gc());
-        let color_transform = base.color_transform_mut();
+        let base = target.base();
+        let mut color_transform = base.color_transform();
         color_transform.r_multiply = Fixed8::ZERO;
         color_transform.g_multiply = Fixed8::ZERO;
         color_transform.b_multiply = Fixed8::ZERO;
         color_transform.r_add = r.into();
         color_transform.g_add = g.into();
         color_transform.b_add = b.into();
+        base.set_color_transform(color_transform);
     }
     Ok(Value::Undefined)
 }
@@ -198,8 +199,8 @@ fn set_transform<'gc>(
             parent.invalidate_cached_bitmap(activation.gc());
         }
 
-        let mut base = target.base_mut(activation.gc());
-        let color_transform = base.color_transform_mut();
+        let base = target.base();
+        let mut color_transform = base.color_transform();
         let transform = args
             .get(0)
             .unwrap_or(&Value::Undefined)
@@ -252,6 +253,8 @@ fn set_transform<'gc>(
             istr!("ab"),
             &mut color_transform.a_add,
         )?;
+
+        base.set_color_transform(color_transform);
     }
 
     Ok(Value::Undefined)

core/src/avm1/globals/movie_clip.rs

@@ -983,8 +983,8 @@ pub fn clone_sprite<'gc>(
     parent.replace_at_depth(context, new_clip.into(), depth);
 
     // Copy display properties from previous clip to new clip.
-    new_clip.set_matrix(context.gc(), *movie_clip.base().matrix());
-    new_clip.set_color_transform(context.gc(), *movie_clip.base().color_transform());
+    new_clip.set_matrix(context.gc(), movie_clip.base().matrix());
+    new_clip.set_color_transform(context.gc(), movie_clip.base().color_transform());
 
     new_clip.init_clip_event_handlers(movie_clip.clip_actions().into());
 
@@ -1665,10 +1665,10 @@ fn set_transform<'gc>(
     if let Value::Object(object) = value {
         if let NativeObject::Transform(transform) = object.native() {
             if let Some(clip) = transform.clip(activation) {
-                let matrix = *clip.base().matrix();
+                let matrix = clip.base().matrix();
                 this.set_matrix(activation.gc(), matrix);
 
-                let color_transform = *clip.base().color_transform();
+                let color_transform = clip.base().color_transform();
                 this.set_color_transform(activation.gc(), color_transform);
 
                 if let Some(parent) = this.parent() {

core/src/avm1/globals/sound.rs

@@ -360,8 +360,8 @@ fn get_pan<'gc>(
     if let NativeObject::Sound(sound) = this.native() {
         let transform = sound
             .owner()
-            .map(|owner| owner.base().sound_transform().clone())
-            .unwrap_or_else(|| activation.context.global_sound_transform().clone());
+            .map(|owner| owner.base().sound_transform())
+            .unwrap_or_else(|| *activation.context.global_sound_transform());
         Ok(transform.pan().into())
     } else {
         Ok(Value::Undefined)
@@ -376,8 +376,8 @@ fn get_transform<'gc>(
     if let NativeObject::Sound(sound) = this.native() {
         let transform = sound
             .owner()
-            .map(|owner| owner.base().sound_transform().clone())
-            .unwrap_or_else(|| activation.context.global_sound_transform().clone());
+            .map(|owner| owner.base().sound_transform())
+            .unwrap_or_else(|| *activation.context.global_sound_transform());
 
         let obj = Object::new(
             &activation.context.strings,
@@ -402,8 +402,8 @@ fn get_volume<'gc>(
     if let NativeObject::Sound(sound) = this.native() {
         let transform = sound
             .owner()
-            .map(|owner| owner.base().sound_transform().clone())
-            .unwrap_or_else(|| activation.context.global_sound_transform().clone());
+            .map(|owner| owner.base().sound_transform())
+            .unwrap_or_else(|| *activation.context.global_sound_transform());
         Ok(transform.volume.into())
     } else {
         Ok(Value::Undefined)
@@ -483,13 +483,13 @@ fn set_pan<'gc>(
         .clamp_to_i32();
     if let NativeObject::Sound(sound) = this.native() {
         if let Some(owner) = sound.owner() {
-            let mut transform = owner.base().sound_transform().clone();
-            transform.set_pan(pan);
-            owner.set_sound_transform(activation.context, transform);
+            let transform = owner.base().sound_transform();
+            owner.set_sound_transform(activation.context, transform.with_pan(pan));
         } else {
-            let mut transform = activation.context.global_sound_transform().clone();
-            transform.set_pan(pan);
-            activation.context.set_global_sound_transform(transform);
+            let transform = activation.context.global_sound_transform();
+            activation
+                .context
+                .set_global_sound_transform(transform.with_pan(pan));
         }
     }
 
@@ -508,9 +508,9 @@ fn set_transform<'gc>(
 
     if let NativeObject::Sound(sound) = this.native() {
         let mut transform = if let Some(owner) = sound.owner() {
-            owner.base().sound_transform().clone()
+            owner.base().sound_transform()
         } else {
-            activation.context.global_sound_transform().clone()
+            *activation.context.global_sound_transform()
         };
 
         if obj.has_own_property(activation, istr!("ll")) {
@@ -558,7 +558,7 @@ fn set_volume<'gc>(
         if let Some(owner) = sound.owner() {
             let transform = SoundTransform {
                 volume,
-                ..*owner.base().sound_transform()
+                ..owner.base().sound_transform()
             };
             owner.set_sound_transform(activation.context, transform);
         } else {

core/src/avm1/globals/transform.rs

@@ -81,7 +81,7 @@ fn method<'gc>(
     };
 
     Ok(match index {
-        GET_MATRIX => matrix_to_value(clip.base().matrix(), activation)?,
+        GET_MATRIX => matrix_to_value(&clip.base().matrix(), activation)?,
         SET_MATRIX => {
             let matrix_props: &[AvmString<'_>] = &[
                 istr!("a"),
@@ -120,7 +120,7 @@ fn method<'gc>(
             )?
         }
         GET_COLOR_TRANSFORM => {
-            ColorTransformObject::construct(activation, clip.base().color_transform())?
+            ColorTransformObject::construct(activation, &clip.base().color_transform())?
         }
         SET_COLOR_TRANSFORM => {
             if let [value] = args {
@@ -135,10 +135,10 @@ fn method<'gc>(
         }
         GET_CONCATENATED_COLOR_TRANSFORM => {
             // Walk through parents to get combined color transform.
-            let mut color_transform = *clip.base().color_transform();
+            let mut color_transform = clip.base().color_transform();
             let mut node = clip.avm1_parent();
             while let Some(display_object) = node {
-                color_transform = *display_object.base().color_transform() * color_transform;
+                color_transform = display_object.base().color_transform() * color_transform;
                 node = display_object.parent();
             }
             ColorTransformObject::construct(activation, &color_transform)?

core/src/avm2/globals/flash/display/display_object.rs

@@ -850,11 +850,10 @@ pub fn set_transform<'gc>(
     let color_transform = color_transform_from_transform_object(transform);
 
     let dobj = this.as_display_object().unwrap();
-    let mut write = dobj.base_mut(activation.gc());
-    write.set_matrix(matrix);
-    write.set_has_matrix3d_stub(has_matrix3d);
-    write.set_color_transform(color_transform);
-    drop(write);
+    let base = dobj.base();
+    base.set_matrix(matrix);
+    base.set_has_matrix3d_stub(has_matrix3d);
+    base.set_color_transform(color_transform);
     if let Some(parent) = dobj.parent() {
         // Self-transform changes are automatically handled,
         // we only want to inform ancestors to avoid unnecessary invalidations for tx/ty

core/src/avm2/globals/flash/display/sprite.rs

@@ -102,7 +102,7 @@ pub fn get_sound_transform<'gc>(
     let this = this.as_object().unwrap();
 
     if let Some(dobj) = this.as_display_object() {
-        let dobj_st = dobj.base().sound_transform().clone();
+        let dobj_st = dobj.base().sound_transform();
 
         return Ok(dobj_st.into_avm2_object(activation)?.into());
     }

core/src/avm2/globals/flash/geom/perspective_projection.rs

@@ -208,17 +208,16 @@ fn sync_from_display_object<'gc>(
 }
 
 fn sync_to_display_object<'gc>(
-    activation: &mut Activation<'_, 'gc>,
+    _activation: &mut Activation<'_, 'gc>,
     this: Object<'gc>,
 ) -> Result<(), Error<'gc>> {
     let Some(dobj) = this.get_slot(pp_slots::DISPLAY_OBJECT).as_object() else {
         // Not associated with DO. Unnecessary to sync.
         return Ok(());
     };
-    let dobj = dobj.as_display_object().unwrap();
+    let base = dobj.as_display_object().unwrap().base();
 
-    let mut write = dobj.base_mut(activation.gc());
-    let Some(write) = write.perspective_projection_mut() else {
+    let Some(mut proj) = base.perspective_projection() else {
         return Ok(());
     };
 
@@ -230,8 +229,9 @@ fn sync_to_display_object<'gc>(
         (x, y)
     };
 
-    write.field_of_view = fov;
-    write.center = (x, y);
+    proj.field_of_view = fov;
+    proj.center = (x, y);
+    base.set_perspective_projection(Some(proj));
 
     Ok(())
 }

core/src/avm2/globals/flash/geom/transform.rs

@@ -125,7 +125,7 @@ pub fn get_concatenated_matrix<'gc>(
             StageQuality::High16x16 | StageQuality::High16x16Linear => 1.25,
         };
 
-        let mut mat = *dobj.base().matrix();
+        let mut mat = dobj.base().matrix();
         mat.a *= scale;
         mat.d *= scale;
 
@@ -140,11 +140,11 @@ pub fn has_matrix3d_from_transform_object(transform_object: Object<'_>) -> bool
 }
 
 pub fn matrix_from_transform_object(transform_object: Object<'_>) -> Matrix {
-    *get_display_object(transform_object).base().matrix()
+    get_display_object(transform_object).base().matrix()
 }
 
 pub fn color_transform_from_transform_object(transform_object: Object<'_>) -> ColorTransform {
-    *get_display_object(transform_object)
+    get_display_object(transform_object)
         .base()
         .color_transform()
 }
@@ -260,7 +260,6 @@ pub fn object_to_perspective_projection<'gc>(
             .unwrap()
             .base()
             .perspective_projection()
-            .copied()
             .unwrap_or_default());
     }
 
@@ -367,7 +366,7 @@ pub fn get_matrix_3d<'gc>(
 
     let display_object = get_display_object(this);
     if display_object.base().has_matrix3d_stub() {
-        let matrix = *get_display_object(this).base().matrix();
+        let matrix = get_display_object(this).base().matrix();
         let matrix3d = Matrix3D::from(matrix);
         matrix3d_to_object(matrix3d, activation)
     } else {

core/src/avm2/globals/flash/media/sound_mixer.rs

@@ -17,7 +17,7 @@ pub fn get_sound_transform<'gc>(
     _this: Value<'gc>,
     _args: &[Value<'gc>],
 ) -> Result<Value<'gc>, Error<'gc>> {
-    let dobj_st = activation.context.global_sound_transform().clone();
+    let dobj_st = activation.context.global_sound_transform();
 
     Ok(dobj_st.into_avm2_object(activation)?.into())
 }

core/src/avm2/object/soundchannel_object.rs

@@ -133,7 +133,7 @@ impl<'gc> SoundChannelObject<'gc> {
                 if let Some(sound_transform) = sound_transform {
                     activation
                         .context
-                        .set_local_sound_transform(instance, sound_transform.clone());
+                        .set_local_sound_transform(instance, *sound_transform);
                 }
 
                 if *should_stop {
@@ -153,13 +153,13 @@ impl<'gc> SoundChannelObject<'gc> {
 
     pub fn sound_transform(self, activation: &mut Activation<'_, 'gc>) -> Option<SoundTransform> {
         let sound_channel_data = self.0.sound_channel_data.borrow();
-        match &*sound_channel_data {
+        match *sound_channel_data {
             SoundChannelData::NotLoaded {
                 sound_transform, ..
-            } => sound_transform.clone(),
+            } => sound_transform,
             SoundChannelData::Loaded { sound_instance } => activation
                 .context
-                .local_sound_transform(*sound_instance)
+                .local_sound_transform(sound_instance)
                 .cloned(),
         }
     }