tidy

src/rendering/mask/MaskEffectManager.ts

@@ -10,6 +10,8 @@ interface MaskConversionTest
     maskClass: new (item: any) => Effect & PoolItem;
 }
 
+export type MaskEffect = {mask: unknown} & Effect;
+
 /**
  * A class that manages the conversion of masks to mask effects.
  * @memberof rendering
@@ -44,7 +46,7 @@ export class MaskEffectManagerClass
         this._tests.push(test);
     }
 
-    public getMaskEffect(item: any): Effect
+    public getMaskEffect(item: any): MaskEffect
     {
         if (!this._initialized) this.init();
 
@@ -54,7 +56,7 @@ export class MaskEffectManagerClass
 
             if (test.test(item))
             {
-                return BigPool.get(test.maskClass as PoolItemConstructor<Effect & PoolItem>, item);
+                return BigPool.get(test.maskClass as PoolItemConstructor<MaskEffect & PoolItem>, item);
             }
         }
 

src/scene/container/container-mixins/effectsMixin.ts

@@ -3,6 +3,7 @@ import { MaskEffectManager } from '../../../rendering/mask/MaskEffectManager';
 
 import type { Filter } from '../../../filters/Filter';
 import type { Rectangle } from '../../../maths/shapes/Rectangle';
+import type { MaskEffect } from '../../../rendering/mask/MaskEffectManager';
 import type { Container } from '../Container';
 import type { Effect } from '../Effect';
 
@@ -13,7 +14,7 @@ export interface EffectsMixinConstructor
 }
 export interface EffectsMixin extends Required<EffectsMixinConstructor>
 {
-    _maskEffect?: {mask: unknown} & Effect;
+    _maskEffect?: MaskEffect;
     _filterEffect?: FilterEffect,
 
     filterArea?: Rectangle,
@@ -81,22 +82,22 @@ export const effectsMixin: Partial<Container> = {
 
     set mask(value: number | Container | null)
     {
-        if (this._maskEffect?.mask === value) return;
+        const effect = this._maskEffect;
 
-        if (this._maskEffect)
+        if (effect?.mask === value) return;
+
+        if (effect)
         {
-            this.removeEffect(this._maskEffect);
+            this.removeEffect(effect);
 
-            MaskEffectManager.returnMaskEffect(this._maskEffect);
+            MaskEffectManager.returnMaskEffect(effect);
         }
 
         if (value === null || value === undefined) return;
 
-        const effect = MaskEffectManager.getMaskEffect(value);
-
-        this._maskEffect = effect as {mask: unknown} & Effect;
+        this._maskEffect = MaskEffectManager.getMaskEffect(value);
 
-        this.addEffect(effect);
+        this.addEffect(this._maskEffect);
     },
 
     /**