@mlightcad/mtext-renderer 0.12.13 → 0.13.1

package/lib/font/meshGlyphGeometry.d.ts

@@ -2,9 +2,9 @@ import type * as THREE from 'three';
 /**
  * `userData` flag marking BufferGeometry produced for mesh (TTF/OTF) glyphs.
  *
- * `mergeVertices` returns a plain {@link THREE.BufferGeometry}, so callers must
- * not rely on `instanceof ShapeGeometry` to distinguish mesh glyphs from SHX
- * stroke geometry after the first cache fill.
+ * Cached glyphs are baked to position and index buffers, so callers must not
+ * rely on `instanceof ShapeGeometry` to distinguish mesh glyphs from SHX
+ * stroke geometry.
  */
 export declare const MESH_GLYPH_USER_DATA_KEY = "isMeshGlyph";
 /**
@@ -13,8 +13,8 @@ export declare const MESH_GLYPH_USER_DATA_KEY = "isMeshGlyph";
  */
 export declare const MESH_GLYPH_CACHE_SIZE = 1;
 /**
- * Returns true when `geometry` is a mesh-font glyph (filled ShapeGeometry path),
- * including geometries that were demoted to BufferGeometry by `mergeVertices`.
+ * Returns true when `geometry` is a mesh-font glyph (filled outline),
+ * including geometries baked down to a plain {@link THREE.BufferGeometry}.
  */
 export declare function isMeshGlyphGeometry(geometry: THREE.BufferGeometry): boolean;
 /**

package/lib/font/textGeometryBuilder.d.ts

@@ -44,4 +44,21 @@ export declare class TextGeometryBuilder {
      * @returns The next write offset after all segments have been written.
      */
     private static writeTransformedLineSegments;
+    /**
+     * Merges indexed mesh glyphs into one indexed triangle geometry, applying each
+     * glyph matrix while copying vertices.
+     *
+     * One write pass replaces per-glyph `clone` + `applyMatrix4` followed by a
+     * second copy inside `mergeGeometries`.
+     *
+     * @param entries Cached glyph geometries paired with their placement matrices.
+     * @returns A single indexed mesh geometry. Empty when `entries` is empty.
+     */
+    static mergeMeshGeometries(entries: TransformedLineGeometryEntry[]): THREE.BufferGeometry;
+    /**
+     * Writes `position` transformed by `matrix` into `output` at `vertexBase`.
+     * Affine placement matrices keep `w` at 1; the perspective term matches
+     * {@link THREE.Vector3.applyMatrix4} for any other matrix.
+     */
+    private static writeTransformedMeshPositions;
 }

package/lib/index.d.ts

@@ -5,4 +5,3 @@ export * from './memory';
 export * from './shxParser';
 export * from './renderer';
 export * from './worker';
-export * from '@mlightcad/mtext-parser';

package/lib/renderer/mtextProcessor.d.ts

@@ -121,6 +121,8 @@ export declare class MTextProcessor {
     private _processedCharCount;
     /** Line glyph entries collected for batch geometry merge within a style segment. */
     private _lineBatchEntries;
+    /** Mesh glyph entries collected for a single-pass triangle merge within a style segment. */
+    private _meshBatchEntries;
     /** Current paragraph first-line indent in drawing units. */
     private _currentIndent;
     /** Current paragraph left margin in drawing units. */
@@ -415,15 +417,16 @@ export declare class MTextProcessor {
     /**
      * Appends one glyph's geometry to the active batch buffers and optional char boxes.
      *
-     * Mesh fonts (tagged via {@link isMeshGlyphGeometry}) are transformed immediately;
-     * line fonts are queued in
+     * Mesh fonts (tagged via {@link isMeshGlyphGeometry}) are queued in
+     * {@link _meshBatchEntries} and merged once via {@link TextGeometryBuilder.mergeMeshGeometries}.
+     * Line fonts are queued in
      * {@link _lineBatchEntries} for later merge via {@link TextGeometryBuilder.mergeLineGeometries}.
      *
      * @param shape Source text shape for the glyph.
      * @param label Character label stored on geometry and char boxes.
      * @param canonical Untransformed glyph geometry from the font.
      * @param matrix World transform to apply to the glyph.
-     * @param geometries Accumulator for mesh glyph primitives.
+     * @param geometries Unused. Mesh glyphs are queued on {@link _meshBatchEntries}.
      * @param meshCharBoxes Accumulator for mesh-glyph picking boxes.
      * @param lineCharBoxes Accumulator for line-glyph picking boxes.
      */
@@ -441,6 +444,10 @@ export declare class MTextProcessor {
      * @returns A {@link THREE.Group} containing merged line/mesh objects and layout metadata.
      */
     processText(tokens: Generator<MTextToken>): THREE.Group<THREE.Object3DEventMap>;
+    /**
+     * True when the current style segment still has mesh glyphs, line glyphs, or decorations to flush.
+     */
+    private hasPendingDrawables;
     /**
      * Flushes pending geometry and char boxes into a styled THREE.js object on `group`.
      *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mlightcad/mtext-renderer",
-  "version": "0.12.13",
+  "version": "0.13.1",
   "description": "AutoCAD MText renderer based on Three.js",
   "license": "MIT",
   "author": "MLight Lee <mlight.lee@outlook.com>",
@@ -43,18 +43,19 @@
     "3d-text"
   ],
   "dependencies": {
-    "@mlightcad/mtext-parser": "^1.5.1",
     "@mlightcad/shx-parser": "^1.4.5",
     "iconv-lite": "^0.7.0",
     "idb": "^8.0.3",
     "opentype.js": "^2.0.0"
   },
   "devDependencies": {
+    "@mlightcad/mtext-parser": "^1.5.3",
     "@types/opentype.js": "^1.3.10",
     "@types/three": "^0.172.0",
     "vitest": "^3.2.4"
   },
   "peerDependencies": {
+    "@mlightcad/mtext-parser": "^1.5.3",
     "three": "^0.172.0"
   },
   "scripts": {