@mlightcad/mtext-renderer 0.5.1 → 0.6.1

package/dist/mtext-renderer-worker.js

@@ -18242,16 +18242,18 @@ var md = ih((M) => {
     }
     /**
      * Draw the MText object. This method loads required fonts on demand and builds the object graph.
-     *
-     * @param isLoadFontsOnDemand - The flag indicate whether to load required fonts on demand
      */
-    async draw(t = !0) {
-      if (t) {
-        const r = Array.from(ii.getFonts(this._mtextData.text || "", !0));
-        r.length > 0 && await this._fontManager.loadFontsByNames(r);
-      }
-      const e = this.loadMText(this._mtextData, this._style);
-      e && (this.getBoxes(e, this._boxes), this._boxes.forEach((r) => this.box.union(r)), this.add(e));
+    async asyncDraw() {
+      const t = Array.from(ii.getFonts(this._mtextData.text || "", !0));
+      t.length > 0 && await this._fontManager.loadFontsByNames(t), this.syncDraw();
+    }
+    /**
+     * Draw the MText object. This method assumes that fonts needed are loaded. If font needed
+     * not found, the default font will be used.
+     */
+    syncDraw() {
+      const t = this.loadMText(this._mtextData, this._style);
+      t && (this.getBoxes(t, this._boxes), this._boxes.forEach((e) => this.box.union(e)), this.add(t));
     }
     /**
      * Gets the style manager instance associated with this MText object.
@@ -18454,23 +18456,23 @@ var md = ih((M) => {
       switch (t) {
         case "render": {
           if (!r) throw new Error("Missing data for render message");
-          const { mtextContent: s, textStyle: i, colorSettings: a, isLoadFontsOnDemand: o } = r, h = new ii(
+          const { mtextContent: s, textStyle: i, colorSettings: a } = r, o = new ii(
             s,
             i,
             pd,
             Ga,
             a
           );
-          await h.draw(o), h.updateMatrixWorld(!0);
-          const { data: u, transferableObjects: l } = dd(h);
+          await o.asyncDraw(), o.updateMatrixWorld(!0);
+          const { data: h, transferableObjects: u } = dd(o);
           self.postMessage(
             {
               type: "render",
               id: e,
               success: !0,
-              data: u
+              data: h
             },
-            { transfer: l }
+            { transfer: u }
           );
           break;
         }

package/lib/renderer/mtext.d.ts

@@ -54,10 +54,13 @@ export declare class MText extends THREE.Object3D {
     get fontManager(): FontManager;
     /**
      * Draw the MText object. This method loads required fonts on demand and builds the object graph.
-     *
-     * @param isLoadFontsOnDemand - The flag indicate whether to load required fonts on demand
      */
-    draw(isLoadFontsOnDemand?: boolean): Promise<void>;
+    asyncDraw(): Promise<void>;
+    /**
+     * Draw the MText object. This method assumes that fonts needed are loaded. If font needed
+     * not found, the default font will be used.
+     */
+    syncDraw(): void;
     /**
      * Gets the style manager instance associated with this MText object.
      * @returns The StyleManager instance

package/lib/worker/baseRenderer.d.ts

@@ -21,7 +21,7 @@ export interface MTextObject extends THREE.Object3D {
  */
 export interface MTextBaseRenderer {
     /**
-     * Render the provided MText content into a Three.js object hierarchy.
+     * Render the provided MText content into a Three.js object hierarchy asynchronously
      *
      * The returned root object contains meshes/lines for glyphs and exposes a
      * bounding box on `object.box`.
@@ -31,7 +31,19 @@ export interface MTextBaseRenderer {
      * @param colorSettings Optional color context (ByLayer, ByBlock colors).
      * @returns A Promise resolving to a populated `MTextObject` ready to add to a scene.
      */
-    renderMText(mtextContent: MTextData, textStyle: TextStyle, colorSettings?: ColorSettings): Promise<MTextObject>;
+    asyncRenderMText(mtextContent: MTextData, textStyle: TextStyle, colorSettings?: ColorSettings): Promise<MTextObject>;
+    /**
+     * Render the provided MText content into a Three.js object hierarchy synchronously.
+     *
+     * The returned root object contains meshes/lines for glyphs and exposes a
+     * bounding box on `object.box`.
+     *
+     * @param mtextContent Structured MText input (text, height, width, position).
+     * @param textStyle Text style to apply (font, width factor, oblique, etc.).
+     * @param colorSettings Optional color context (ByLayer, ByBlock colors).
+     * @returns A Promise resolving to a populated `MTextObject` ready to add to a scene.
+     */
+    syncRenderMText(mtextContent: MTextData, textStyle: TextStyle, colorSettings?: ColorSettings): MTextObject;
     /**
      * Ensure the specified fonts are available to the renderer.
      *

package/lib/worker/mainThreadRenderer.d.ts

@@ -10,9 +10,15 @@ export declare class MainThreadRenderer implements MTextBaseRenderer {
     private isInitialized;
     constructor();
     /**
-     * Render MText directly in the main thread
+     * Render MText directly in the main thread asynchronously. It will ensure that default font
+     * is loaded. And fonts needed in mtext are loaded on demand.
      */
-    renderMText(mtextContent: MTextData, textStyle: TextStyle, colorSettings?: ColorSettings): Promise<MTextObject>;
+    asyncRenderMText(mtextContent: MTextData, textStyle: TextStyle, colorSettings?: ColorSettings): Promise<MTextObject>;
+    /**
+     * Render MText directly in the main thread synchronously. It is user's responsibility to ensure
+     * that default font is loaded and fonts needed in mtext are loaded.
+     */
+    syncRenderMText(mtextContent: MTextData, textStyle: TextStyle, colorSettings?: ColorSettings): MTextObject;
     /**
      * Load fonts in the main thread
      */

package/lib/worker/unifiedRenderer.d.ts

@@ -6,11 +6,11 @@ export type RenderMode = 'main' | 'worker';
  * Unified renderer that can work in both main thread and web worker modes
  */
 export declare class UnifiedRenderer {
-    private workerManager;
+    private webWorkerRenderer;
     private mainThreadRenderer;
     private adapter;
     private currentMode;
-    private workerConfig?;
+    private webWorkerConfig?;
     /**
      * Constructor
      *
@@ -29,9 +29,17 @@ export declare class UnifiedRenderer {
      */
     getMode(): RenderMode;
     /**
-     * Render MText using the current mode
+     * Render MText using the current mode asynchronously
      */
-    renderMText(mtextContent: MTextData, textStyle: TextStyle, colorSettings?: ColorSettings): Promise<MTextObject>;
+    asyncRenderMText(mtextContent: MTextData, textStyle: TextStyle, colorSettings?: ColorSettings): Promise<MTextObject>;
+    /**
+     * Render MText using the current mode synchronously.
+     *
+     * Notes:
+     * One error will be thrown if calling this function in 'worker' mode because rendering
+     * process is always asynchronous in web worker mode.
+     */
+    syncRenderMText(mtextContent: MTextData, textStyle: TextStyle, colorSettings?: ColorSettings): MTextObject;
     /**
      * Load fonts using the current mode
      */

package/lib/worker/webWorkerRenderer.d.ts

@@ -14,12 +14,6 @@ export interface WebWorkerRendererConfig {
      * @default './mtext-renderer-worker.js'
      */
     workerUrl?: string;
-    /**
-     * The flag indicate whether to load required fonts on demand
-     *
-     * @default false
-     */
-    isLoadFontsOnDemand?: boolean;
     /**
      * Timeout duration in milliseconds for worker requests
      * @default 120000
@@ -112,7 +106,6 @@ export declare class WebWorkerRenderer implements MTextBaseRenderer {
     private requestId;
     private poolSize;
     private timeOut;
-    private isLoadFontsOnDemand;
     private readyPromise;
     private isInitialized;
     private styleManager;
@@ -124,9 +117,14 @@ export declare class WebWorkerRenderer implements MTextBaseRenderer {
     private sendMessage;
     private ensureTasksFinished;
     /**
-     * Render MText in the worker and return serialized data
+     * Render MText in the worker and return serialized data asynchronously.
+     */
+    asyncRenderMText(mtextContent: MTextData, textStyle: TextStyle, colorSettings?: ColorSettings): Promise<MTextObject>;
+    /**
+     * Render MText synchronously.
+     * Notes: It isn't supported yet.
      */
-    renderMText(mtextContent: MTextData, textStyle: TextStyle, colorSettings?: ColorSettings): Promise<MTextObject>;
+    syncRenderMText(_mtextContent: MTextData, _textStyle: TextStyle, _colorSettings?: ColorSettings): MTextObject;
     /**
      * Load fonts in the worker
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mlightcad/mtext-renderer",
-  "version": "0.5.1",
+  "version": "0.6.1",
   "description": "AutoCAD MText renderer based on Three.js",
   "license": "MIT",
   "author": "MLight Lee <mlight.lee@outlook.com>",