@m2c2kit/core 0.3.12 → 0.3.13

package/dist/index.d.ts

@@ -422,6 +422,8 @@ interface EntityOptions {
     position?: Point;
     /** Scale of the entity. Default is 1.0 */
     scale?: number;
+    /** Opacity of the entity. 0 is fully transparent, 1 is fully opaque. Default is 1.0. Alpha has multiplicative in inheritance. For example, if the entity's parent is alpha .5 and this entity's is alpha .4, then the entity will appear with alpha .2. */
+    alpha?: number;
     /** Does the entity respond to user events, such as taps? Default is false */
     isUserInteractionEnabled?: boolean;
     /** Can the entity be dragged? */
@@ -502,6 +504,7 @@ declare class Scene extends Entity implements IDrawable, SceneOptions {
      * @param callback
      */
     onAppear(callback: (scene: Scene) => void): void;
+    update(): void;
     draw(canvas: Canvas): void;
     warmup(canvas: Canvas): void;
 }
@@ -1792,6 +1795,7 @@ declare abstract class Entity implements EntityOptions {
     name: string;
     position: Point;
     scale: number;
+    alpha: number;
     isUserInteractionEnabled: boolean;
     draggable: boolean;
     hidden: boolean;
@@ -1802,6 +1806,8 @@ declare abstract class Entity implements EntityOptions {
     absolutePosition: Point;
     size: Size;
     absoluteScale: number;
+    absoluteAlpha: number;
+    absoluteAlphaChange: number;
     actions: Action[];
     queuedAction?: Action;
     originalActions: Action[];
@@ -2022,6 +2028,17 @@ declare abstract class Entity implements EntityOptions {
     private parseLayoutConstraints;
     private calculateYFromConstraint;
     private calculateXFromConstraint;
+    /**
+     * Calculates the absolute alpha of the entity, taking into account the
+     * alpha of all ancestor parent entities.
+     *
+     * @remarks Alpha has multiplicative inheritance from all ancestors.
+     *
+     * @param alpha - Opacity of the entity
+     * @param ancestors - Array of ancestor parent entities
+     * @returns
+     */
+    private calculateAbsoluteAlpha;
     update(): void;
     /**
      * Draws each child entity that is Drawable and is not hidden, by zPosition
@@ -2117,6 +2134,15 @@ interface ScaleActionOptions {
     runDuringTransition?: boolean;
 }
 
+interface FadeAlphaActionOptions {
+    /** Opacity of the entity. 0 is fully transparent, 1 is fully opaque. */
+    alpha: number;
+    /** Duration of scale, in milliseconds */
+    duration: number;
+    /** Should the action run during screen transitions? Default is no */
+    runDuringTransition?: boolean;
+}
+
 interface IActionContainer {
     children?: Array<Action>;
 }
@@ -2128,7 +2154,8 @@ declare enum ActionType {
     Wait = "Wait",
     Custom = "Custom",
     Move = "Move",
-    Scale = "Scale"
+    Scale = "Scale",
+    FadeAlpha = "FadeAlpha"
 }
 
 /**
@@ -2180,6 +2207,15 @@ declare abstract class Action {
      * @returns The scale action
      */
     static scale(options: ScaleActionOptions): Action;
+    /**
+     * Creates an action that will change the entity's alpha (opacity).
+     *
+     * @remarks Alpha has multiplicative inheritance. For example, if the entity's parent is alpha .5 and this entity's action fades alpha to .4, then the entity will appear with alpha .2.
+     *
+     * @param options - {@link FadeAlphaActionOptions}
+     * @returns The fadeAlpha action
+     */
+    static fadeAlpha(options: FadeAlphaActionOptions): Action;
     /**
      * Creates an array of actions that will be run in order.
      *
@@ -2280,6 +2316,12 @@ declare class ScaleAction extends Action {
     delta: number;
     constructor(scale: number, duration: number, runDuringTransition?: boolean);
 }
+declare class FadeAlphaAction extends Action {
+    type: ActionType;
+    alpha: number;
+    delta: number;
+    constructor(alpha: number, duration: number, runDuringTransition?: boolean);
+}
 
 declare class CanvasKitHelpers {
     /**
@@ -2439,6 +2481,8 @@ declare class Label extends Entity implements IDrawable, IText, LabelOptions {
     private paragraph?;
     private paraStyle?;
     private builder?;
+    private _fontPaint?;
+    private _backgroundPaint?;
     private _translatedText;
     /**
      * Single or multi-line text formatted and rendered on the screen.
@@ -2467,6 +2511,10 @@ declare class Label extends Entity implements IDrawable, IText, LabelOptions {
     set preferredMaxLayoutWidth(preferredMaxLayoutWidth: number | undefined);
     get backgroundColor(): RgbaColor | undefined;
     set backgroundColor(backgroundColor: RgbaColor | undefined);
+    private get backgroundPaint();
+    private set backgroundPaint(value);
+    private get fontPaint();
+    private set fontPaint(value);
     /**
      * Duplicates an entity using deep copy.
      *
@@ -2695,6 +2743,7 @@ declare class Shape extends Entity implements IDrawable, ShapeOptions {
     duplicate(newName?: string): Shape;
     update(): void;
     draw(canvas: Canvas): void;
+    private applyAlphaToPaints;
     private drawPathFromM2Path;
     private drawPathFromSvgString;
     private calculateSvgPathY;
@@ -2747,6 +2796,7 @@ declare class Sprite extends Entity implements IDrawable, SpriteOptions {
     zPosition: number;
     private _imageName;
     private loadedImage?;
+    private _paint?;
     /**
      * Visual image displayed on the screen.
      *
@@ -2759,6 +2809,8 @@ declare class Sprite extends Entity implements IDrawable, SpriteOptions {
     dispose(): void;
     set imageName(imageName: string);
     get imageName(): string;
+    private set paint(value);
+    private get paint();
     /**
      * Duplicates an entity using deep copy.
      *
@@ -3104,4 +3156,4 @@ declare class WebGlInfo {
     static dispose(): void;
 }
 
-export { Action, Activity, ActivityKeyValueData, ActivityLifecycleEvent, ActivityResultsEvent, ActivityType, BrowserImage, CallbackOptions, CanvasKitHelpers, Composite, CompositeOptions, Constants, ConstraintType, Constraints, CustomAction, CustomActionOptions, DefaultParameter, Dimensions, DrawableOptions, EasingFunction, Easings, Entity, EntityEvent, EntityEventListener, EntityOptions, EntityType, Equals, EventBase, EventListenerBase, EventType, FontData, FontManager, Game, GameData, GameOptions, GameParameters, GlobalVariables, GoToActivityOptions, GroupAction, I18n, IDataStore, IDrawable, IText, ImageManager, Label, LabelHorizontalAlignmentMode, LabelOptions, Layout, LayoutConstraint, LoadedImage, M2DragEvent, M2Path, M2PointerEvent, MoveAction, MoveActionOptions, MutablePath, NoneTransition, Point, RandomDraws, RectOptions, RgbaColor, ScaleAction, ScaleActionOptions, Scene, SceneOptions, SceneTransition, SequenceAction, Session, SessionDictionaryValues, SessionLifecycleEvent, SessionOptions, Shape, ShapeOptions, ShapeType, Size, SlideTransition, SlideTransitionOptions, Sprite, SpriteOptions, Story, StoryOptions, TapEvent, TextLine, TextLineOptions, TextOptions, Timer, Transition, TransitionDirection, TransitionType, Translations, TrialData, TrialSchema, Uuid, WaitAction, WaitActionOptions, WebColors, WebGlInfo, handleInterfaceOptions };
+export { Action, Activity, ActivityKeyValueData, ActivityLifecycleEvent, ActivityResultsEvent, ActivityType, BrowserImage, CallbackOptions, CanvasKitHelpers, Composite, CompositeOptions, Constants, ConstraintType, Constraints, CustomAction, CustomActionOptions, DefaultParameter, Dimensions, DrawableOptions, EasingFunction, Easings, Entity, EntityEvent, EntityEventListener, EntityOptions, EntityType, Equals, EventBase, EventListenerBase, EventType, FadeAlphaAction, FadeAlphaActionOptions, FontData, FontManager, Game, GameData, GameOptions, GameParameters, GlobalVariables, GoToActivityOptions, GroupAction, I18n, IDataStore, IDrawable, IText, ImageManager, Label, LabelHorizontalAlignmentMode, LabelOptions, Layout, LayoutConstraint, LoadedImage, M2DragEvent, M2Path, M2PointerEvent, MoveAction, MoveActionOptions, MutablePath, NoneTransition, Point, RandomDraws, RectOptions, RgbaColor, ScaleAction, ScaleActionOptions, Scene, SceneOptions, SceneTransition, SequenceAction, Session, SessionDictionaryValues, SessionLifecycleEvent, SessionOptions, Shape, ShapeOptions, ShapeType, Size, SlideTransition, SlideTransitionOptions, Sprite, SpriteOptions, Story, StoryOptions, TapEvent, TextLine, TextLineOptions, TextOptions, Timer, Transition, TransitionDirection, TransitionType, Translations, TrialData, TrialSchema, Uuid, WaitAction, WaitActionOptions, WebColors, WebGlInfo, handleInterfaceOptions };

package/dist/index.js

@@ -5,6 +5,7 @@ var ActionType = /* @__PURE__ */ ((ActionType2) => {
   ActionType2["Custom"] = "Custom";
   ActionType2["Move"] = "Move";
   ActionType2["Scale"] = "Scale";
+  ActionType2["FadeAlpha"] = "FadeAlpha";
   return ActionType2;
 })(ActionType || {});
 
@@ -218,6 +219,21 @@ class Action {
       options.runDuringTransition
     );
   }
+  /**
+   * Creates an action that will change the entity's alpha (opacity).
+   *
+   * @remarks Alpha has multiplicative inheritance. For example, if the entity's parent is alpha .5 and this entity's action fades alpha to .4, then the entity will appear with alpha .2.
+   *
+   * @param options - {@link FadeAlphaActionOptions}
+   * @returns The fadeAlpha action
+   */
+  static fadeAlpha(options) {
+    return new FadeAlphaAction(
+      options.alpha,
+      options.duration,
+      options.runDuringTransition
+    );
+  }
   /**
    * Creates an array of actions that will be run in order.
    *
@@ -304,6 +320,15 @@ class Action {
         });
         break;
       }
+      case ActionType.FadeAlpha: {
+        const fadeAlpha = action;
+        cloned = Action.fadeAlpha({
+          alpha: fadeAlpha.alpha,
+          duration: fadeAlpha.duration,
+          runDuringTransition: fadeAlpha.runDuringTransition
+        });
+        break;
+      }
       case ActionType.Wait: {
         const wait = action;
         cloned = Action.wait({
@@ -391,6 +416,20 @@ class Action {
         scaleAction.completed = true;
       }
     }
+    if (action.type === ActionType.FadeAlpha) {
+      const fadeAlphaAction = action;
+      if (!fadeAlphaAction.started) {
+        fadeAlphaAction.delta = fadeAlphaAction.alpha - entity.alpha;
+        fadeAlphaAction.started = true;
+      }
+      if (elapsed < fadeAlphaAction.duration) {
+        entity.alpha = entity.alpha + fadeAlphaAction.delta * (dt / fadeAlphaAction.duration);
+      } else {
+        entity.alpha = fadeAlphaAction.alpha;
+        fadeAlphaAction.running = false;
+        fadeAlphaAction.completed = true;
+      }
+    }
   }
   /**
    * Calculates the duration of an action, including any children actions
@@ -572,6 +611,17 @@ class ScaleAction extends Action {
     this.isParent = false;
   }
 }
+class FadeAlphaAction extends Action {
+  constructor(alpha, duration, runDuringTransition = false) {
+    super(runDuringTransition);
+    __publicField$j(this, "type", ActionType.FadeAlpha);
+    __publicField$j(this, "alpha");
+    __publicField$j(this, "delta", 0);
+    this.duration = duration;
+    this.alpha = alpha;
+    this.isParent = false;
+  }
+}
 
 var ActivityType = /* @__PURE__ */ ((ActivityType2) => {
   ActivityType2["Game"] = "Game";
@@ -588,7 +638,7 @@ class CanvasKitHelpers {
    * free these wasm objects.
    */
   static Dispose(objects) {
-    objects.filter((o) => !(o == null ? void 0 : o.isDeleted)).forEach((o) => o == null ? void 0 : o.delete());
+    objects.filter((o) => !(o == null ? void 0 : o.isDeleted())).forEach((o) => o == null ? void 0 : o.delete());
   }
   static makePaint(canvasKit, color, style, isAntialiased) {
     const paint = new canvasKit.Paint();
@@ -782,21 +832,21 @@ function handleDrawableOptions(drawable, options) {
   if (options.anchorPoint) {
     drawable.anchorPoint = options.anchorPoint;
   }
-  if (options.zPosition) {
+  if (options.zPosition !== void 0) {
     drawable.zPosition = options.zPosition;
   }
 }
 function handleTextOptions(text, options) {
-  if (options.text) {
+  if (options.text !== void 0) {
     text.text = options.text;
   }
-  if (options.fontName) {
+  if (options.fontName !== void 0) {
     text.fontName = options.fontName;
   }
   if (options.fontColor) {
     text.fontColor = options.fontColor;
   }
-  if (options.fontSize) {
+  if (options.fontSize !== void 0) {
     text.fontSize = options.fontSize;
   }
 }
@@ -822,6 +872,7 @@ class Entity {
     __publicField$g(this, "position", { x: 0, y: 0 });
     // position of the entity in the parent coordinate system
     __publicField$g(this, "scale", 1);
+    __publicField$g(this, "alpha", 1);
     __publicField$g(this, "isUserInteractionEnabled", false);
     __publicField$g(this, "draggable", false);
     __publicField$g(this, "hidden", false);
@@ -833,6 +884,8 @@ class Entity {
     // position within the root coordinate system
     __publicField$g(this, "size", { width: 0, height: 0 });
     __publicField$g(this, "absoluteScale", 1);
+    __publicField$g(this, "absoluteAlpha", 1);
+    __publicField$g(this, "absoluteAlphaChange", 0);
     __publicField$g(this, "actions", new Array());
     __publicField$g(this, "queuedAction");
     __publicField$g(this, "originalActions", new Array());
@@ -882,22 +935,25 @@ class Entity {
     } else {
       this.name = options.name;
     }
-    if (options.position) {
+    if (options.position !== void 0) {
       this.position = options.position;
     }
-    if (options.scale) {
+    if (options.scale !== void 0) {
       this.scale = options.scale;
     }
-    if (options.isUserInteractionEnabled) {
+    if (options.alpha !== void 0) {
+      this.alpha = options.alpha;
+    }
+    if (options.isUserInteractionEnabled !== void 0) {
       this.isUserInteractionEnabled = options.isUserInteractionEnabled;
     }
-    if (options.draggable) {
+    if (options.draggable !== void 0) {
       this.draggable = options.draggable;
     }
-    if (options.hidden) {
+    if (options.hidden !== void 0) {
       this.hidden = options.hidden;
     }
-    if (options.layout) {
+    if (options.layout !== void 0) {
       this.layout = options.layout;
     }
   }
@@ -1383,12 +1439,30 @@ class Entity {
     }
     return x;
   }
+  /**
+   * Calculates the absolute alpha of the entity, taking into account the
+   * alpha of all ancestor parent entities.
+   *
+   * @remarks Alpha has multiplicative inheritance from all ancestors.
+   *
+   * @param alpha - Opacity of the entity
+   * @param ancestors - Array of ancestor parent entities
+   * @returns
+   */
+  calculateAbsoluteAlpha(alpha, ancestors) {
+    const inheritedAlpha = ancestors.reduce((acc, ancestor) => {
+      return acc * ancestor.alpha;
+    }, 1);
+    return alpha * inheritedAlpha;
+  }
   update() {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
     if (this.needsInitialization) {
       this.initialize();
       this.needsInitialization = false;
     }
+    this.absoluteAlphaChange = this.calculateAbsoluteAlpha(this.alpha, this.ancestors) - this.absoluteAlpha;
+    this.absoluteAlpha += this.absoluteAlphaChange;
     if (this.parent === void 0) {
       this.absolutePosition.x = this.position.x * this.scale;
       this.absolutePosition.y = this.position.y * this.scale;
@@ -2343,8 +2417,9 @@ class Sprite extends Entity {
     __publicField$b(this, "_imageName", "");
     // public getter/setter is below
     __publicField$b(this, "loadedImage");
+    __publicField$b(this, "_paint");
     handleInterfaceOptions(this, options);
-    if (options.imageName) {
+    if (options.imageName !== void 0) {
       this.imageName = options.imageName;
     }
   }
@@ -2363,11 +2438,14 @@ class Sprite extends Entity {
     }
     this.size.width = this.loadedImage.width;
     this.size.height = this.loadedImage.height;
+    if (!this._paint) {
+      this.paint = new this.canvasKit.Paint();
+    }
     this.needsInitialization = false;
   }
   dispose() {
     var _a;
-    CanvasKitHelpers.Dispose([(_a = this.loadedImage) == null ? void 0 : _a.image]);
+    CanvasKitHelpers.Dispose([(_a = this.loadedImage) == null ? void 0 : _a.image, this._paint]);
   }
   set imageName(imageName) {
     this._imageName = imageName;
@@ -2376,6 +2454,17 @@ class Sprite extends Entity {
   get imageName() {
     return this._imageName;
   }
+  set paint(paint) {
+    this._paint = paint;
+  }
+  get paint() {
+    if (!this._paint) {
+      throw new Error(
+        `in paint getter: Sprite entity ${this.toString()} paint is undefined.`
+      );
+    }
+    return this._paint;
+  }
   /**
    * Duplicates an entity using deep copy.
    *
@@ -2411,7 +2500,10 @@ class Sprite extends Entity {
         canvas.scale(1 / drawScale, 1 / drawScale);
         const x = (this.absolutePosition.x - this.size.width * this.anchorPoint.x * this.absoluteScale) * drawScale;
         const y = (this.absolutePosition.y - this.size.height * this.anchorPoint.y * this.absoluteScale) * drawScale;
-        canvas.drawImage(this.loadedImage.image, x, y);
+        if (this.absoluteAlphaChange !== 0) {
+          this.paint.setAlphaf(this.absoluteAlpha);
+        }
+        canvas.drawImage(this.loadedImage.image, x, y, this.paint);
         canvas.restore();
       }
       super.drawChildren(canvas);
@@ -2496,16 +2588,15 @@ class Scene extends Entity {
     this.scale = Globals.rootScale;
     this.size.width = this.game.canvasCssWidth;
     this.size.height = this.game.canvasCssHeight;
-    this.backgroundPaint = new this.canvasKit.Paint();
-    this.backgroundPaint.setColor(
-      this.canvasKit.Color(
-        this.backgroundColor[0],
-        this.backgroundColor[1],
-        this.backgroundColor[2],
-        this.backgroundColor[3]
-      )
+    if (this.backgroundPaint) {
+      this.backgroundPaint.delete();
+    }
+    this.backgroundPaint = CanvasKitHelpers.makePaint(
+      this.canvasKit,
+      this.backgroundColor,
+      this.canvasKit.PaintStyle.Fill,
+      false
     );
-    this.backgroundPaint.setStyle(this.canvasKit.PaintStyle.Fill);
     this.needsInitialization = false;
   }
   dispose() {
@@ -2582,6 +2673,9 @@ class Scene extends Entity {
   onAppear(callback) {
     this._appearCallback = callback;
   }
+  update() {
+    super.update();
+  }
   draw(canvas) {
     canvas.save();
     const drawScale = Globals.canvasScale / this.absoluteScale;
@@ -2589,6 +2683,9 @@ class Scene extends Entity {
     if (!this.backgroundPaint) {
       throw new Error(`in Scene ${this}, background paint is undefined.`);
     }
+    if (this.absoluteAlphaChange !== 0) {
+      this.backgroundPaint.setAlphaf(this.absoluteAlpha);
+    }
     canvas.drawRect(
       [
         this.position.x * drawScale * Globals.rootScale,
@@ -6080,6 +6177,8 @@ class Label extends Entity {
     __publicField$4(this, "paragraph");
     __publicField$4(this, "paraStyle");
     __publicField$4(this, "builder");
+    __publicField$4(this, "_fontPaint");
+    __publicField$4(this, "_backgroundPaint");
     __publicField$4(this, "_translatedText", "");
     handleInterfaceOptions(this, options);
     if (options.horizontalAlignmentMode) {
@@ -6188,24 +6287,63 @@ class Label extends Entity {
       fontFamilies.push(defaultTypeface.fontFamily);
     }
     this.paraStyle = new this.canvasKit.ParagraphStyle({
-      textStyle: {
-        color: textColor,
-        backgroundColor: this.backgroundColor ? this.canvasKit.Color(
-          this.backgroundColor[0],
-          this.backgroundColor[1],
-          this.backgroundColor[2],
-          this.backgroundColor[3]
-        ) : void 0,
-        fontFamilies,
-        fontSize: this.fontSize * Globals.canvasScale
-      },
+      textStyle: {},
       textAlign: ckTextAlign
     });
+    if (this.builder) {
+      this.builder.delete();
+    }
     this.builder = this.canvasKit.ParagraphBuilder.Make(
       this.paraStyle,
       fontManager.fontMgr
     );
+    if (!this._backgroundPaint) {
+      this._backgroundPaint = new this.canvasKit.Paint();
+    }
+    if (!this._fontPaint) {
+      this._fontPaint = new this.canvasKit.Paint();
+    }
+    this.fontPaint.setColor(textColor);
+    this.fontPaint.setAlphaf(this.absoluteAlpha);
+    if (this.backgroundColor) {
+      this.backgroundPaint.setColor(this.backgroundColor);
+      this.backgroundPaint.setAlphaf(this.absoluteAlpha);
+    } else {
+      this.backgroundPaint.setColor(this.canvasKit.Color(0, 0, 0, 0));
+    }
+    this.builder.pushPaintStyle(
+      {
+        fontFamilies,
+        fontSize: this.fontSize * Globals.canvasScale,
+        // set default values for below properties as well.
+        fontStyle: {
+          weight: this.canvasKit.FontWeight.Normal,
+          width: this.canvasKit.FontWidth.Normal,
+          slant: this.canvasKit.FontSlant.Oblique
+        },
+        // Normal font style
+        decoration: 0,
+        // No decoration
+        decorationThickness: 1,
+        // Default decoration thickness
+        decorationStyle: this.canvasKit.DecorationStyle.Solid,
+        // Solid decoration style
+        heightMultiplier: -1,
+        // Providing -1, rather than 1.0, gives default height multiplier
+        halfLeading: false,
+        // Default half leading
+        letterSpacing: 0,
+        // Default letter spacing
+        wordSpacing: 0
+        // Default word spacing
+      },
+      this.fontPaint,
+      this.backgroundPaint
+    );
     this.builder.addText(textForParagraph);
+    if (this.paragraph) {
+      this.paragraph.delete();
+    }
     this.paragraph = this.builder.build();
     const preferredWidth = (
       //this.preferredMaxLayoutWidth ?? this.parentScene.game.canvasCssWidth;
@@ -6233,7 +6371,14 @@ class Label extends Entity {
     this.needsInitialization = false;
   }
   dispose() {
-    CanvasKitHelpers.Dispose([this.paragraph, this.builder]);
+    CanvasKitHelpers.Dispose([
+      this.paragraph,
+      this.builder,
+      this._fontPaint,
+      // use backing field since it may be undefined
+      this._backgroundPaint
+      // use backing field since it may be undefined
+    ]);
   }
   get text() {
     return this._text;
@@ -6294,6 +6439,24 @@ class Label extends Entity {
     this._backgroundColor = backgroundColor;
     this.needsInitialization = true;
   }
+  get backgroundPaint() {
+    if (!this._backgroundPaint) {
+      throw new Error("backgroundPaint cannot be undefined");
+    }
+    return this._backgroundPaint;
+  }
+  set backgroundPaint(backgroundPaint) {
+    this._backgroundPaint = backgroundPaint;
+  }
+  get fontPaint() {
+    if (!this._fontPaint) {
+      throw new Error("fontPaint cannot be undefined");
+    }
+    return this._fontPaint;
+  }
+  set fontPaint(fontPaint) {
+    this._fontPaint = fontPaint;
+  }
   /**
    * Duplicates an entity using deep copy.
    *
@@ -6322,6 +6485,9 @@ class Label extends Entity {
   }
   update() {
     super.update();
+    if (this.absoluteAlphaChange !== 0) {
+      this.initialize();
+    }
   }
   draw(canvas) {
     if (this.parent && this.text !== "") {
@@ -7103,7 +7269,7 @@ class Session {
     __publicField$2(this, "sessionDictionary", /* @__PURE__ */ new Map());
     __publicField$2(this, "canvasKit");
     __publicField$2(this, "initialized", false);
-    __publicField$2(this, "version", "0.3.12 (291d0cee)");
+    __publicField$2(this, "version", "0.3.13 (f05b4c6d)");
     this.options = options;
     for (const activity of this.options.activities) {
       if (this.options.activities.filter((a) => a === activity).length > 1) {
@@ -7711,7 +7877,7 @@ class Shape extends Entity {
         throw new Error("Size cannot be specified for rectangle shape");
       }
     }
-    if (options.cornerRadius) {
+    if (options.cornerRadius !== void 0) {
       this.cornerRadius = options.cornerRadius;
     }
     if (options.fillColor) {
@@ -7726,9 +7892,9 @@ class Shape extends Entity {
     if (options.isAntialiased !== void 0) {
       this.isAntialiased = options.isAntialiased;
     }
-    if (options.strokeColor && options.lineWidth === void 0) {
+    if (options.strokeColor && !options.lineWidth) {
       console.warn(
-        `warning: for entity ${this}, strokeColor = ${options.strokeColor} but lineWidth is undefined. In normal usage, both would be set or both would be undefined.`
+        `warning: for entity ${this}, strokeColor = ${options.strokeColor} but lineWidth is non-zero. In normal usage, both would be set or both would be undefined.`
       );
     }
     if (options.strokeColor === void 0 && options.lineWidth) {
@@ -7795,6 +7961,7 @@ class Shape extends Entity {
   }
   dispose() {
     CanvasKitHelpers.Dispose([
+      // use backing fields, since paints may be undefined
       this._strokeColorPaintAntialiased,
       this._strokeColorPaintNotAntialiased,
       this._fillColorPaintAntialiased,
@@ -7839,6 +8006,14 @@ class Shape extends Entity {
     canvas.save();
     const drawScale = Globals.canvasScale / this.absoluteScale;
     canvas.scale(1 / drawScale, 1 / drawScale);
+    if (this.absoluteAlphaChange !== 0) {
+      this.applyAlphaToPaints(this.absoluteAlpha, [
+        this._fillColorPaintAntialiased,
+        this._fillColorPaintNotAntialiased,
+        this._strokeColorPaintAntialiased,
+        this._strokeColorPaintNotAntialiased
+      ]);
+    }
     if (this.shapeIsM2Path()) {
       this.drawPathFromM2Path(canvas);
     }
@@ -7854,6 +8029,13 @@ class Shape extends Entity {
     canvas.restore();
     super.drawChildren(canvas);
   }
+  applyAlphaToPaints(alpha, paints) {
+    paints.forEach((paint) => {
+      if (paint) {
+        paint.setAlphaf(alpha);
+      }
+    });
+  }
   drawPathFromM2Path(canvas) {
     const drawScale = Globals.canvasScale / this.absoluteScale;
     const pathOriginX = (this.absolutePosition.x - this.anchorPoint.x * this.size.width * this.absoluteScale) * drawScale;
@@ -8227,6 +8409,9 @@ class TextLine extends Entity {
     super.update();
   }
   initialize() {
+    if (this.paint) {
+      this.paint.delete();
+    }
     this.paint = new this.canvasKit.Paint();
     this.paint.setColor(
       this.canvasKit.Color(
@@ -8266,6 +8451,9 @@ class TextLine extends Entity {
         this.typeface = fontManager.getTypeface(gameUuid, fontNames[0]);
       }
     }
+    if (this.font) {
+      this.font.delete();
+    }
     this.font = new this.canvasKit.Font(
       this.typeface,
       this.fontSize * Globals.canvasScale
@@ -8341,6 +8529,9 @@ class TextLine extends Entity {
           `in TextLine entity ${this}, Paint or Font is undefined.`
         );
       }
+      if (this.absoluteAlphaChange !== 0) {
+        paintForDraw.setAlphaf(this.absoluteAlpha);
+      }
       canvas.drawText(textForDraw, x, y, paintForDraw, this.font);
       canvas.restore();
     }
@@ -8357,5 +8548,5 @@ class TextLine extends Entity {
   }
 }
 
-export { Action, ActivityType, CanvasKitHelpers, Composite, Constants, ConstraintType, CustomAction, Dimensions, Easings, Entity, EntityType, Equals, EventType, FontManager, Game, GlobalVariables, GroupAction, I18n, ImageManager, Label, LabelHorizontalAlignmentMode, LayoutConstraint, LoadedImage, MoveAction, MutablePath, NoneTransition, RandomDraws, ScaleAction, Scene, SceneTransition, SequenceAction, Session, Shape, ShapeType, SlideTransition, Sprite, Story, TextLine, Timer, Transition, TransitionDirection, TransitionType, Uuid, WaitAction, WebColors, WebGlInfo, handleInterfaceOptions };
+export { Action, ActivityType, CanvasKitHelpers, Composite, Constants, ConstraintType, CustomAction, Dimensions, Easings, Entity, EntityType, Equals, EventType, FadeAlphaAction, FontManager, Game, GlobalVariables, GroupAction, I18n, ImageManager, Label, LabelHorizontalAlignmentMode, LayoutConstraint, LoadedImage, MoveAction, MutablePath, NoneTransition, RandomDraws, ScaleAction, Scene, SceneTransition, SequenceAction, Session, Shape, ShapeType, SlideTransition, Sprite, Story, TextLine, Timer, Transition, TransitionDirection, TransitionType, Uuid, WaitAction, WebColors, WebGlInfo, handleInterfaceOptions };
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@m2c2kit/core",
-  "version": "0.3.12",
+  "version": "0.3.13",
   "description": "The m2c2kit core functionality",
   "main": "dist/index.js",
   "module": "dist/index.js",