three-text 0.2.0 → 0.2.2

package/dist/p5/index.cjs

@@ -1,21 +1,30 @@
 'use strict';
 
-// p5.js adapter - converts core geometry to p5.Geometry
-function createP5Geometry(p5Instance, textGeometry) {
-    // In global mode, p5.Geometry exists but createVector is global
-    // In instance mode, both are on the instance
-    const P5Geometry = p5Instance.Geometry || window.p5?.Geometry;
-    const createVec = p5Instance.createVector || window.createVector;
-    if (!P5Geometry || !createVec) {
-        throw new Error('p5.js not found. Make sure p5.js is loaded before calling this function.');
-    }
-    const geom = new P5Geometry();
+var Text = require('../index.cjs');
+
+// p5.js adapter
+function convertToP5Geometry(p5Instance, textGeometry) {
     const { vertices, normals, indices } = textGeometry;
-    // Convert vertices (flip Y for p5.js coordinate system)
+    const P5GeometryClass = p5Instance.constructor?.Geometry ||
+        (typeof window !== 'undefined' && window.p5?.Geometry);
+    if (!P5GeometryClass) {
+        throw new Error('p5.Geometry not found. Ensure p5.js is loaded.');
+    }
+    const geom = new P5GeometryClass();
+    const createVec = (x, y, z) => {
+        if (typeof p5Instance.createVector === 'function') {
+            return p5Instance.createVector(x, y, z);
+        }
+        const globalCreateVector = (typeof window !== 'undefined' && window.createVector);
+        if (globalCreateVector) {
+            return globalCreateVector(x, y, z);
+        }
+        throw new Error('createVector not found');
+    };
+    // p5 uses +Y up, we use +Y down
     for (let i = 0; i < vertices.length; i += 3) {
         geom.vertices.push(createVec(vertices[i], -vertices[i + 1], vertices[i + 2]));
     }
-    // Convert normals (flip Y)
     for (let i = 0; i < normals.length; i += 3) {
         geom.vertexNormals.push(createVec(normals[i], -normals[i + 1], normals[i + 2]));
     }
@@ -29,5 +38,75 @@ function createP5Geometry(p5Instance, textGeometry) {
     }
     return geom;
 }
+let shaperInitialized = false;
+if (typeof window !== 'undefined' && window.p5) {
+    const p5 = window.p5;
+    p5.prototype.loadThreeTextShaper = function (wasmPath) {
+        if (shaperInitialized) {
+            return;
+        }
+        Text.Text.setHarfBuzzPath(wasmPath);
+        shaperInitialized = true;
+        Text.Text.init()
+            .then(() => {
+            this._decrementPreload();
+        })
+            .catch((err) => {
+            console.error('Failed to load text shaper:', err);
+            this._decrementPreload();
+        });
+    };
+    p5.prototype.loadThreeTextFont = function (fontPath, fontVariations) {
+        const fontRef = {
+            buffer: null,
+            path: fontPath,
+            variations: fontVariations
+        };
+        fetch(fontPath)
+            .then(res => {
+            if (!res.ok) {
+                throw new Error(`Failed to load font: HTTP ${res.status}`);
+            }
+            return res.arrayBuffer();
+        })
+            .then(buffer => {
+            fontRef.buffer = buffer;
+            this._decrementPreload();
+        })
+            .catch((err) => {
+            console.error(`Failed to load font ${fontPath}:`, err);
+            this._decrementPreload();
+        });
+        return fontRef;
+    };
+    p5.prototype.createThreeTextGeometry = async function (text, options) {
+        if (!options.font || !options.font.buffer) {
+            console.error('Font not loaded. Use loadThreeTextFont() in preload().');
+            return null;
+        }
+        const { font, ...coreOptions } = options;
+        try {
+            const result = await Text.Text.create({
+                text,
+                font: font.buffer,
+                fontVariations: font.variations,
+                ...coreOptions
+            });
+            const p5Instance = this;
+            const geometry = convertToP5Geometry(p5Instance, result);
+            return {
+                geometry,
+                planeBounds: result.planeBounds,
+                glyphs: result.glyphs
+            };
+        }
+        catch (err) {
+            console.error('Failed to create text geometry:', err);
+            return null;
+        }
+    };
+    p5.prototype.registerPreloadMethod('loadThreeTextShaper', p5.prototype);
+    p5.prototype.registerPreloadMethod('loadThreeTextFont', p5.prototype);
+}
 
-exports.createP5Geometry = createP5Geometry;
+exports.createP5Geometry = convertToP5Geometry;

package/dist/p5/index.d.ts

@@ -13,7 +13,13 @@ interface P5Geometry {
 interface P5Instance {
     Geometry: new () => P5Geometry;
     createVector(x: number, y: number, z: number): P5Vector;
+    _decrementPreload(): void;
 }
-declare function createP5Geometry(p5Instance: P5Instance | any, textGeometry: TextGeometryInfo): P5Geometry;
+declare global {
+    interface Window {
+        p5?: any;
+    }
+}
+declare function convertToP5Geometry(p5Instance: P5Instance, textGeometry: TextGeometryInfo): P5Geometry;
 
-export { createP5Geometry };
+export { convertToP5Geometry as createP5Geometry };

package/dist/p5/index.js

@@ -1,19 +1,28 @@
-// p5.js adapter - converts core geometry to p5.Geometry
-function createP5Geometry(p5Instance, textGeometry) {
-    // In global mode, p5.Geometry exists but createVector is global
-    // In instance mode, both are on the instance
-    const P5Geometry = p5Instance.Geometry || window.p5?.Geometry;
-    const createVec = p5Instance.createVector || window.createVector;
-    if (!P5Geometry || !createVec) {
-        throw new Error('p5.js not found. Make sure p5.js is loaded before calling this function.');
-    }
-    const geom = new P5Geometry();
+import { Text } from '../index.js';
+
+// p5.js adapter
+function convertToP5Geometry(p5Instance, textGeometry) {
     const { vertices, normals, indices } = textGeometry;
-    // Convert vertices (flip Y for p5.js coordinate system)
+    const P5GeometryClass = p5Instance.constructor?.Geometry ||
+        (typeof window !== 'undefined' && window.p5?.Geometry);
+    if (!P5GeometryClass) {
+        throw new Error('p5.Geometry not found. Ensure p5.js is loaded.');
+    }
+    const geom = new P5GeometryClass();
+    const createVec = (x, y, z) => {
+        if (typeof p5Instance.createVector === 'function') {
+            return p5Instance.createVector(x, y, z);
+        }
+        const globalCreateVector = (typeof window !== 'undefined' && window.createVector);
+        if (globalCreateVector) {
+            return globalCreateVector(x, y, z);
+        }
+        throw new Error('createVector not found');
+    };
+    // p5 uses +Y up, we use +Y down
     for (let i = 0; i < vertices.length; i += 3) {
         geom.vertices.push(createVec(vertices[i], -vertices[i + 1], vertices[i + 2]));
     }
-    // Convert normals (flip Y)
     for (let i = 0; i < normals.length; i += 3) {
         geom.vertexNormals.push(createVec(normals[i], -normals[i + 1], normals[i + 2]));
     }
@@ -27,5 +36,75 @@ function createP5Geometry(p5Instance, textGeometry) {
     }
     return geom;
 }
+let shaperInitialized = false;
+if (typeof window !== 'undefined' && window.p5) {
+    const p5 = window.p5;
+    p5.prototype.loadThreeTextShaper = function (wasmPath) {
+        if (shaperInitialized) {
+            return;
+        }
+        Text.setHarfBuzzPath(wasmPath);
+        shaperInitialized = true;
+        Text.init()
+            .then(() => {
+            this._decrementPreload();
+        })
+            .catch((err) => {
+            console.error('Failed to load text shaper:', err);
+            this._decrementPreload();
+        });
+    };
+    p5.prototype.loadThreeTextFont = function (fontPath, fontVariations) {
+        const fontRef = {
+            buffer: null,
+            path: fontPath,
+            variations: fontVariations
+        };
+        fetch(fontPath)
+            .then(res => {
+            if (!res.ok) {
+                throw new Error(`Failed to load font: HTTP ${res.status}`);
+            }
+            return res.arrayBuffer();
+        })
+            .then(buffer => {
+            fontRef.buffer = buffer;
+            this._decrementPreload();
+        })
+            .catch((err) => {
+            console.error(`Failed to load font ${fontPath}:`, err);
+            this._decrementPreload();
+        });
+        return fontRef;
+    };
+    p5.prototype.createThreeTextGeometry = async function (text, options) {
+        if (!options.font || !options.font.buffer) {
+            console.error('Font not loaded. Use loadThreeTextFont() in preload().');
+            return null;
+        }
+        const { font, ...coreOptions } = options;
+        try {
+            const result = await Text.create({
+                text,
+                font: font.buffer,
+                fontVariations: font.variations,
+                ...coreOptions
+            });
+            const p5Instance = this;
+            const geometry = convertToP5Geometry(p5Instance, result);
+            return {
+                geometry,
+                planeBounds: result.planeBounds,
+                glyphs: result.glyphs
+            };
+        }
+        catch (err) {
+            console.error('Failed to create text geometry:', err);
+            return null;
+        }
+    };
+    p5.prototype.registerPreloadMethod('loadThreeTextShaper', p5.prototype);
+    p5.prototype.registerPreloadMethod('loadThreeTextFont', p5.prototype);
+}
 
-export { createP5Geometry };
+export { convertToP5Geometry as createP5Geometry };

package/dist/types/p5/index.d.ts

@@ -12,6 +12,12 @@ interface P5Geometry {
 interface P5Instance {
     Geometry: new () => P5Geometry;
     createVector(x: number, y: number, z: number): P5Vector;
+    _decrementPreload(): void;
 }
-export declare function createP5Geometry(p5Instance: P5Instance | any, textGeometry: TextGeometryInfo): P5Geometry;
-export {};
+declare global {
+    interface Window {
+        p5?: any;
+    }
+}
+declare function convertToP5Geometry(p5Instance: P5Instance, textGeometry: TextGeometryInfo): P5Geometry;
+export { convertToP5Geometry as createP5Geometry };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "three-text",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "3D font rendering and text layout engine for the web",
   "main": "dist/index.cjs",
   "module": "dist/index.js",