modern-canvas 0.9.2 → 0.9.4

package/dist/index.cjs

@@ -879,6 +879,9 @@ class CoreObject extends modernIdoc.Reactivable {
   get json() {
     return this.toJSON();
   }
+  set json(val) {
+    this.setProperties(val);
+  }
   _nextTick() {
     return nextTick();
   }
@@ -4473,7 +4476,7 @@ class VertexAttribute extends Resource {
   }
 }
 __decorateClass$W([
-  modernIdoc.property({ protected: true })
+  modernIdoc.property({ internal: true })
 ], VertexAttribute.prototype, "buffer");
 __decorateClass$W([
   modernIdoc.property({ fallback: 0 })
@@ -4867,7 +4870,7 @@ class Texture2D extends Resource {
   }
 }
 __decorateClass$V([
-  modernIdoc.property({ protected: true })
+  modernIdoc.property({ internal: true })
 ], Texture2D.prototype, "source");
 __decorateClass$V([
   modernIdoc.property({ fallback: 0 })
@@ -6201,7 +6204,7 @@ __decorateClass$S([
   modernIdoc.property({ internal: true, fallback: "default" })
 ], exports.Node.prototype, "internalMode", 2);
 __decorateClass$S([
-  modernIdoc.property({ protected: true })
+  modernIdoc.property({ internal: true })
 ], exports.Node.prototype, "mask", 2);
 exports.Node = __decorateClass$S([
   customNode("Node")
@@ -6885,7 +6888,7 @@ exports.Effect = class Effect extends exports.TimelineNode {
   }
 };
 __decorateClass$O([
-  modernIdoc.property({ protected: true })
+  modernIdoc.property({ internal: true })
 ], exports.Effect.prototype, "material", 2);
 __decorateClass$O([
   modernIdoc.property()
@@ -7019,6 +7022,7 @@ var __decorateClass$L = (decorators, target, key, kind) => {
   return result;
 };
 class SceneTree extends MainLoop {
+  fonts;
   input = new Input();
   renderStack = new RenderStack();
   root = new exports.Window(true).setTree(this);
@@ -8902,7 +8906,7 @@ void main(void) {
 }`
 }));
 __decorateClass$w([
-  modernIdoc.property({ protected: true })
+  modernIdoc.property({ internal: true })
 ], exports.MaskEffect.prototype, "texture", 2);
 __decorateClass$w([
   modernIdoc.property({ fallback: "" })
@@ -9704,9 +9708,9 @@ class BaseElement2DText extends CoreObject {
   constructor(parent) {
     super();
     this.parent = parent;
-    this.base.setPropertyAccessor(this);
+    this.base = new modernText.Text().setPropertyAccessor(this);
   }
-  base = new modernText.Text();
+  base;
   measureResult;
   _textureMap = /* @__PURE__ */ new Map();
   setProperties(properties) {
@@ -9730,8 +9734,12 @@ class BaseElement2DText extends CoreObject {
         break;
     }
   }
-  _updateTextureMap() {
+  _updateBase() {
+    this.base.fonts = this.base.fonts ?? this.parent.tree?.fonts;
     this.base.update();
+  }
+  _updateTextureMap() {
+    this._updateBase();
     this._textureMap.clear();
     const pGlyphBoxs = [];
     this.base.paragraphs.forEach((p, pIndex) => {
@@ -9787,6 +9795,7 @@ class BaseElement2DText extends CoreObject {
     this.content = modernIdoc.normalizeTextContent(content);
   }
   measure() {
+    this._updateBase();
     return this.base.measure();
   }
   updateMeasure() {
@@ -9809,7 +9818,7 @@ class BaseElement2DText extends CoreObject {
   }
   draw() {
     const ctx = this.parent.context;
-    this.base.update();
+    this._updateBase();
     this.base.pathSets.forEach((pathSet) => {
       pathSet.paths.forEach((path) => {
         const meta = path.getMeta();
@@ -10932,7 +10941,7 @@ exports.Image2D = class Image2D extends exports.Element2D {
   }
 };
 __decorateClass$i([
-  modernIdoc.property({ protected: true })
+  modernIdoc.property({ internal: true })
 ], exports.Image2D.prototype, "texture", 2);
 __decorateClass$i([
   modernIdoc.property({ fallback: "" })
@@ -14171,6 +14180,7 @@ class Engine extends SceneTree {
       height,
       pixelRatio = DEVICE_PIXEL_RATIO,
       backgroundColor = 0,
+      fonts,
       autoResize,
       autoStart,
       timeline,
@@ -14185,6 +14195,7 @@ class Engine extends SceneTree {
     this._setupInput();
     this.pixelRatio = pixelRatio;
     this.backgroundColor = backgroundColor;
+    this.fonts = fonts;
     if (autoResize) {
       if (!view && this.renderer.view) {
         this.renderer.view.style.width = "100%";
@@ -14335,13 +14346,14 @@ async function start(sleep = 100) {
   starting = false;
 }
 async function task(options) {
-  const { data, width, height, debug = false, time = 0 } = options;
+  const { debug = false, fonts, width, height, time = 0, data } = options;
   engine ??= new Engine({
     width: 1,
     height: 1,
     preserveDrawingBuffer: true
   });
   engine.debug = debug;
+  engine.fonts = fonts;
   engine.root.removeChildren();
   engine.timeline.currentTime = time;
   engine.resize(width, height, true);

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { Font } from 'modern-font';
+import { Font, Fonts } from 'modern-font';
 import { ObservableEvents, Observable, ReactivableEvents, Reactivable, Color as Color$1, RawWeakMap as RawWeakMap$1, LinearGradient, RadialGradient, NormalizedFill, Fill, NormalizedBackground, Background, NormalizedForeground, Foreground, NormalizedOutline, Outline, NormalizedShadow, Shadow, NormalizedShape, Shape, FullStyle, Text as Text$1, TextContent, Style, ImageFillCropRect } from 'modern-idoc';
 export { Color as ColorValue } from 'modern-idoc';
 import { AnimationItem } from 'lottie-web';
@@ -256,6 +256,7 @@ interface CoreObject {
 declare class CoreObject extends Reactivable {
     readonly instanceId: number;
     get json(): Record<string, any>;
+    set json(val: Record<string, any>);
     protected _nextTick(): Promise<void>;
     equal(target: CoreObject | undefined | null): boolean;
 }
@@ -1598,6 +1599,7 @@ declare class SceneTree extends MainLoop {
     processPaused: boolean;
     backgroundColor: Color$1 | undefined;
     debug: boolean;
+    fonts?: Fonts;
     readonly input: Input;
     readonly renderStack: RenderStack;
     readonly root: Window;
@@ -2079,6 +2081,7 @@ declare class BaseElement2DText extends CoreObject {
     constructor(parent: BaseElement2D);
     setProperties(properties?: Text$1): this;
     protected _updateProperty(key: string, value: any, oldValue: any): void;
+    protected _updateBase(): void;
     protected _updateTextureMap(): void;
     protected _updateTexture(key: string, fill: NormalizedFill | undefined, box: any): Promise<void>;
     protected _loadTexture(fill: NormalizedFill, box: any): Promise<Texture2D | undefined>;
@@ -3300,6 +3303,7 @@ interface EngineOptions extends WebGLContextAttributes {
     height?: number;
     pixelRatio?: number;
     backgroundColor?: Color$1;
+    fonts?: Fonts;
     autoResize?: boolean;
     autoStart?: boolean;
     timeline?: Timeline;
@@ -3361,6 +3365,7 @@ interface RenderOptions {
     height: number;
     debug?: boolean;
     time?: number;
+    fonts?: Fonts;
     onBeforeRender?: (engine: Engine) => void | Promise<void>;
 }
 declare function render(options: RenderOptions): Promise<HTMLCanvasElement>;

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { Font } from 'modern-font';
+import { Font, Fonts } from 'modern-font';
 import { ObservableEvents, Observable, ReactivableEvents, Reactivable, Color as Color$1, RawWeakMap as RawWeakMap$1, LinearGradient, RadialGradient, NormalizedFill, Fill, NormalizedBackground, Background, NormalizedForeground, Foreground, NormalizedOutline, Outline, NormalizedShadow, Shadow, NormalizedShape, Shape, FullStyle, Text as Text$1, TextContent, Style, ImageFillCropRect } from 'modern-idoc';
 export { Color as ColorValue } from 'modern-idoc';
 import { AnimationItem } from 'lottie-web';
@@ -256,6 +256,7 @@ interface CoreObject {
 declare class CoreObject extends Reactivable {
     readonly instanceId: number;
     get json(): Record<string, any>;
+    set json(val: Record<string, any>);
     protected _nextTick(): Promise<void>;
     equal(target: CoreObject | undefined | null): boolean;
 }
@@ -1598,6 +1599,7 @@ declare class SceneTree extends MainLoop {
     processPaused: boolean;
     backgroundColor: Color$1 | undefined;
     debug: boolean;
+    fonts?: Fonts;
     readonly input: Input;
     readonly renderStack: RenderStack;
     readonly root: Window;
@@ -2079,6 +2081,7 @@ declare class BaseElement2DText extends CoreObject {
     constructor(parent: BaseElement2D);
     setProperties(properties?: Text$1): this;
     protected _updateProperty(key: string, value: any, oldValue: any): void;
+    protected _updateBase(): void;
     protected _updateTextureMap(): void;
     protected _updateTexture(key: string, fill: NormalizedFill | undefined, box: any): Promise<void>;
     protected _loadTexture(fill: NormalizedFill, box: any): Promise<Texture2D | undefined>;
@@ -3300,6 +3303,7 @@ interface EngineOptions extends WebGLContextAttributes {
     height?: number;
     pixelRatio?: number;
     backgroundColor?: Color$1;
+    fonts?: Fonts;
     autoResize?: boolean;
     autoStart?: boolean;
     timeline?: Timeline;
@@ -3361,6 +3365,7 @@ interface RenderOptions {
     height: number;
     debug?: boolean;
     time?: number;
+    fonts?: Fonts;
     onBeforeRender?: (engine: Engine) => void | Promise<void>;
 }
 declare function render(options: RenderOptions): Promise<HTMLCanvasElement>;

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Font } from 'modern-font';
+import { Font, Fonts } from 'modern-font';
 import { ObservableEvents, Observable, ReactivableEvents, Reactivable, Color as Color$1, RawWeakMap as RawWeakMap$1, LinearGradient, RadialGradient, NormalizedFill, Fill, NormalizedBackground, Background, NormalizedForeground, Foreground, NormalizedOutline, Outline, NormalizedShadow, Shadow, NormalizedShape, Shape, FullStyle, Text as Text$1, TextContent, Style, ImageFillCropRect } from 'modern-idoc';
 export { Color as ColorValue } from 'modern-idoc';
 import { AnimationItem } from 'lottie-web';
@@ -256,6 +256,7 @@ interface CoreObject {
 declare class CoreObject extends Reactivable {
     readonly instanceId: number;
     get json(): Record<string, any>;
+    set json(val: Record<string, any>);
     protected _nextTick(): Promise<void>;
     equal(target: CoreObject | undefined | null): boolean;
 }
@@ -1598,6 +1599,7 @@ declare class SceneTree extends MainLoop {
     processPaused: boolean;
     backgroundColor: Color$1 | undefined;
     debug: boolean;
+    fonts?: Fonts;
     readonly input: Input;
     readonly renderStack: RenderStack;
     readonly root: Window;
@@ -2079,6 +2081,7 @@ declare class BaseElement2DText extends CoreObject {
     constructor(parent: BaseElement2D);
     setProperties(properties?: Text$1): this;
     protected _updateProperty(key: string, value: any, oldValue: any): void;
+    protected _updateBase(): void;
     protected _updateTextureMap(): void;
     protected _updateTexture(key: string, fill: NormalizedFill | undefined, box: any): Promise<void>;
     protected _loadTexture(fill: NormalizedFill, box: any): Promise<Texture2D | undefined>;
@@ -3300,6 +3303,7 @@ interface EngineOptions extends WebGLContextAttributes {
     height?: number;
     pixelRatio?: number;
     backgroundColor?: Color$1;
+    fonts?: Fonts;
     autoResize?: boolean;
     autoStart?: boolean;
     timeline?: Timeline;
@@ -3361,6 +3365,7 @@ interface RenderOptions {
     height: number;
     debug?: boolean;
     time?: number;
+    fonts?: Fonts;
     onBeforeRender?: (engine: Engine) => void | Promise<void>;
 }
 declare function render(options: RenderOptions): Promise<HTMLCanvasElement>;