three-base 2.0.137 → 2.0.142

package/Text3D/fontController.js

@@ -1,199 +1,166 @@
-/*
- * @Author: xiaosihan
- * @Date: 2021-04-15 00:34:44
- * @Last Modified by: xiaosihan
- * @Last Modified time: 2022-06-08 14:33:45
- */
-import Dexie from "dexie";
-import { filter, first, isEmpty } from "lodash";
-import { Font } from "three/examples/jsm/loaders/FontLoader.js";
-import threeUtils from "../threeUtils";
-import gentilisJSON from "./gentilis.json";
-class indexBD extends Dexie {
-    constructor(dbName) {
-        super(dbName);
-    }
-    threeFont;
-}
-// 字体加载器
-class fontContorl {
-    constructor() { }
-    THREEFontMap = new Map();
-    // 专门存储字体的数据库
-    fontBD = (() => {
-        let fontDB = new indexBD("three-base-font");
-        fontDB.version(1).stores({ threeFont: "++KeyPath,fontType,fontName,fontJson" });
-        return fontDB;
-    })();
-    /**
-     * 保存 字体json到本地数据库中
-     * @param {saveFontParam} { fontType = "simhei", fontName, fontJson }
-     * @memberof fontContorl
-     */
-    async saveFont({ fontType = "simhei", fontName, fontJson = "" }) {
-        let findResult = await this.getFont({ fontType, fontName });
-        if (isEmpty(findResult)) {
-            await this.fontBD.threeFont.add({ fontType, fontName, fontJson });
-        }
-    }
-    /**
-     * 通过 fontType 和 fontName 查询 fontJson
-     * @param {getFontParam} { fontType = "simhei", fontName }
-     * @returns
-     * @memberof fontContorl
-     */
-    async getFont({ fontType = "simhei", fontName }) {
-        let fondResult = await this.fontBD.threeFont
-            .filter(d => (d.fontType === fontType && d.fontName === fontName))
-            .toArray();
-        if (isEmpty(fondResult)) {
-            return undefined;
-        }
-        else {
-            return first(fondResult).fontJson;
-        }
-    }
-    // 加载字体的回调函数们
-    _loadTextCall = new Map();
-    // 加载文字 提供给需要创建字体模型的方法使用 以节流的形式调用 回调函数
-    async loadText({ fontType = "simhei", text = "", fontBasePath, callback }) {
-        // 加载字体容器
-        await this._loadFontIndexJson({ fontType, fontBasePath });
-        let newCallback = () => {
-            let fontFamily = this.THREEFontMap.get(fontType);
-            if (callback && fontFamily) {
-                callback(fontFamily);
-            }
-        };
-        // 遍历文本
-        filter(text).map(fontName => {
-            // 没有的就去加载
-            if (!this.hasFont({ fontType, fontName })) {
-                // 添加文字的默认模型 避免报错
-                let fontFamily = this.THREEFontMap.get(fontType);
-                // 创建 three 字体对象
-                if (fontFamily) {
-                    //@ts-ignore
-                    fontFamily.data.glyphs[fontName] = { "ha": 1389, "x_min": 477, "x_max": 949, "o": "m 700 901 q 906 770 830 906 q 770 477 949 618 q 711 288 711 412 l 613 288 q 781 608 613 494 q 819 722 825 651 q 700 808 808 803 l 684 808 q 581 673 575 803 l 477 673 q 613 884 477 836 q 700 901 629 901 m 732 184 l 732 71 l 591 71 l 591 184 l 732 184 z " };
-                }
-                this._loadFontJson({ fontType, fontName, fontBasePath });
-            }
-            // 加入待执行的回调
-            let origin_callbacks = this._loadTextCall.get(`${fontType}_${fontName}`) || [];
-            if (newCallback) {
-                this._loadTextCall.set(`${fontType}_${fontName}`, [...origin_callbacks, newCallback]);
-            }
-        });
-        // 执行任务队列
-        threeUtils.addWork(newCallback);
-    }
-    // 加载字体
-    async _loadFontIndexJson({ fontType = "simhei", fontBasePath }) {
-        let fontFamily = this.THREEFontMap.get(fontType);
-        // 创建 three 字体对象
-        if (!fontFamily) {
-            // 初始字体结构
-            fontFamily = new Font({
-                "underlineThickness": 69,
-                "underlinePosition": -174,
-                "resolution": 1000,
-                "original_font_information": {},
-                "familyName": "Source Han Sans CN Normal",
-                "descender": -167,
-                "ascender": 0,
-                "boundingBox": {
-                    "yMin": -700,
-                    "xMin": -1389,
-                    "yMax": 700,
-                    "xMax": 4067
-                },
-                "glyphs": {}
-            });
-            this.THREEFontMap.set(fontType, fontFamily);
-            // 读取本地数据库中的字体初始结构文件
-            let fontFamilyIndexJson = await this.getFont({ fontType, fontName: "index" });
-            // 加载外部字体初始结构文件
-            if (!fontFamilyIndexJson) {
-                this._loadFontJson({ fontType, fontName: "index", fontBasePath });
-            }
-        }
-    }
-    // 加载外部字体.js
-    async _loadFontJson({ fontType = "simhei", fontName, fontBasePath }) {
-        let fontJson = await this.getFont({ fontType, fontName });
-        if (!fontJson) {
-            fontJson = gentilisJSON.glyphs[fontName];
-        }
-        // 数据库中没有 就去加载字体js
-        if (!fontJson) {
-            // 加载字体js 
-            await new Promise(resolve => {
-                let script = document.createElement("script");
-                Object.assign(script, {
-                    type: "text/javascript",
-                    src: `${fontBasePath}${fontType}/${fontName}.js`,
-                    async: true,
-                    onload: () => {
-                        script.remove();
-                        resolve();
-                    },
-                    onerror: () => {
-                    }
-                });
-                document.head.appendChild(script);
-            });
-        }
-        else {
-            // 数据库或者默认字体中 有就加入字体文件中
-            let fontFamily = this.THREEFontMap.get(fontType);
-            // 创建 three 字体对象
-            if (fontFamily) {
-                //@ts-ignore
-                fontFamily.data.glyphs[fontName] = fontJson;
-            }
-        }
-        // 执行相应的回调函数
-        let origin_callbacks = this._loadTextCall.get(`${fontType}_${fontName}`) || [];
-        // // 删除待执行的回调
-        this._loadTextCall.delete(`${fontType}_${fontName}`);
-        origin_callbacks.map(callback => {
-            // 执行任务队列
-            threeUtils.addWork(callback);
-        });
-    }
-    // 判断是否有这个文字
-    hasFont({ fontType, fontName }) {
-        return !isEmpty(this.THREEFontMap.get(fontType) &&
-            //@ts-ignore
-            this.THREEFontMap.get(fontType).data.glyphs[fontName]);
-    }
-    // 这个方法是提供给外部字体文件调用的
-    addFont({ fontType = "simhei", fontName, fontJson }) {
-        // 保存字体json到本地数据中
-        this.saveFont({ fontType, fontName, fontJson });
-        let fontFamily = this.THREEFontMap.get(fontType);
-        // 创建 three 字体对象
-        if (fontFamily) {
-            //@ts-ignore
-            fontFamily.data.glyphs[fontName] = fontJson;
-        }
-    }
-    // 这个方法是提供给外部字体文件调用的
-    addFontFamily({ fontType = "simhei", fontFamilyJson }) {
-        // 保存字体初始结构到数据库中
-        this.saveFont({ fontType, fontName: "index", fontJson: fontFamilyJson });
-        let fontFamily = this.THREEFontMap.get(fontType);
-        // 创建 three 字体对象
-        if (fontFamily) {
-            //@ts-ignore
-            fontFamily.data = {
-                ...fontFamilyJson,
-                //@ts-ignore
-                glyphs: fontFamily.data.glyphs
-            };
-        }
-    }
-}
-const fontContorller = new fontContorl();
-Object.assign(window, { fontContorller });
-export default fontContorller;
+/*
+ * @Author: xiaosihan
+ * @Date: 2021-04-15 00:34:44
+ * @Last Modified by: xiaosihan
+ * @Last Modified time: 2022-06-08 14:33:45
+ */
+import Dexie from "dexie";
+import { filter, first, isEmpty } from "lodash";
+import { Font } from "three/examples/jsm/loaders/FontLoader";
+import threeUtils from "../threeUtils";
+import gentilisJSON from "./gentilis.json";
+class indexBD extends Dexie {
+    constructor(dbName) {
+        super(dbName);
+    }
+    threeFont;
+}
+class fontControl {
+    constructor() { }
+    THREEFontMap = new Map();
+    fontBD = (() => {
+        let fontDB = new indexBD("three-base-font");
+        fontDB.version(1).stores({ threeFont: "++KeyPath,fontType,fontName,fontJson" });
+        return fontDB;
+    })();
+    /**
+     * 保存 字体json到本地数据库中
+     * @param {saveFontParam} { fontType = "simhei", fontName, fontJson }
+     * @memberof fontControl
+     */
+    async saveFont({ fontType = "simhei", fontName, fontJson = {} }) {
+        let findResult = await this.getFont({ fontType, fontName });
+        if (isEmpty(findResult)) {
+            await this.fontBD.threeFont.add({ fontType, fontName, fontJson });
+        }
+    }
+    /**
+     * 通过 fontType 和 fontName 查询 fontJson
+     * @param {getFontParam} { fontType = "simhei", fontName }
+     * @returns
+     * @memberof fontControl
+     */
+    async getFont({ fontType = "simhei", fontName }) {
+        let fondResult = await this.fontBD.threeFont
+            .filter((d) => (d.fontType === fontType && d.fontName === fontName))
+            .toArray();
+        if (isEmpty(fondResult)) {
+            return undefined;
+        }
+        else {
+            return first(fondResult).fontJson;
+        }
+    }
+    _loadTextCall = new Map();
+    async loadText({ fontType = "simhei", text = "", fontBasePath, callback }) {
+        await this._loadFontIndexJson({ fontType, fontBasePath });
+        let newCallback = () => {
+            let fontFamily = this.THREEFontMap.get(fontType);
+            if (callback && fontFamily) {
+                callback(fontFamily);
+            }
+        };
+        filter(text).map((fontName) => {
+            if (!this.hasFont({ fontType, fontName })) {
+                let fontFamily = this.THREEFontMap.get(fontType);
+                if (fontFamily) {
+                    fontFamily.data.glyphs[fontName] = { "ha": 1389, "x_min": 477, "x_max": 949, "o": "m 700 901 q 906 770 830 906 q 770 477 949 618 q 711 288 711 412 l 613 288 q 781 608 613 494 q 819 722 825 651 q 700 808 808 803 l 684 808 q 581 673 575 803 l 477 673 q 613 884 477 836 q 700 901 629 901 m 732 184 l 732 71 l 591 71 l 591 184 l 732 184 z " };
+                }
+                this._loadFontJson({ fontType, fontName, fontBasePath });
+            }
+            let origin_callbacks = this._loadTextCall.get(`${fontType}_${fontName}`) || [];
+            if (newCallback) {
+                this._loadTextCall.set(`${fontType}_${fontName}`, [...origin_callbacks, newCallback]);
+            }
+        });
+        threeUtils.addWork(newCallback);
+    }
+    async _loadFontIndexJson({ fontType = "simhei", fontBasePath }) {
+        let fontFamily = this.THREEFontMap.get(fontType);
+        if (!fontFamily) {
+            fontFamily = new Font({
+                "underlineThickness": 69,
+                "underlinePosition": -174,
+                "resolution": 1000,
+                "original_font_information": {},
+                "familyName": "Source Han Sans CN Normal",
+                "descender": -167,
+                "ascender": 0,
+                "boundingBox": {
+                    "yMin": -700,
+                    "xMin": -1389,
+                    "yMax": 700,
+                    "xMax": 4067
+                },
+                "glyphs": {}
+            });
+            this.THREEFontMap.set(fontType, fontFamily);
+            let fontFamilyIndexJson = await this.getFont({ fontType, fontName: "index" });
+            if (!fontFamilyIndexJson) {
+                this._loadFontJson({ fontType, fontName: "index", fontBasePath });
+            }
+        }
+    }
+    async _loadFontJson({ fontType = "simhei", fontName, fontBasePath }) {
+        let fontJson = await this.getFont({ fontType, fontName });
+        if (!fontJson) {
+            fontJson = gentilisJSON.glyphs[fontName];
+        }
+        if (!fontJson) {
+            await new Promise(resolve => {
+                let script = document.createElement("script");
+                Object.assign(script, {
+                    type: "text/javascript",
+                    src: `${fontBasePath}${fontType}/${fontName}.js`,
+                    async: true,
+                    onload: () => {
+                        script.remove();
+                        resolve();
+                    },
+                    onerror: () => {
+                    }
+                });
+                document.head.appendChild(script);
+            });
+        }
+        else {
+            let fontFamily = this.THREEFontMap.get(fontType);
+            if (fontFamily) {
+                fontFamily.data.glyphs[fontName] = fontJson;
+            }
+        }
+        let origin_callbacks = this._loadTextCall.get(`${fontType}_${fontName}`) || [];
+        this._loadTextCall.delete(`${fontType}_${fontName}`);
+        origin_callbacks.map(callback => {
+            threeUtils.addWork(callback);
+        });
+    }
+    hasFont({ fontType, fontName }) {
+        return !isEmpty(this.THREEFontMap.get(fontType) &&
+            this.THREEFontMap.get(fontType).data.glyphs[fontName]);
+    }
+    addFont({ fontType = "simhei", fontName, fontJson }) {
+        this.saveFont({ fontType, fontName, fontJson });
+        let fontFamily = this.THREEFontMap.get(fontType);
+        if (fontFamily) {
+            fontFamily.data.glyphs[fontName] = fontJson;
+        }
+    }
+    addFontFamily({ fontType = "simhei", fontFamilyJson }) {
+        this.saveFont({ fontType, fontName: "index", fontJson: fontFamilyJson });
+        let fontFamily = this.THREEFontMap.get(fontType);
+        if (fontFamily) {
+            fontFamily.data = Object.assign({}, fontFamilyJson, {
+                glyphs: fontFamily.data.glyphs
+            });
+        }
+    }
+}
+const fontController = new fontControl();
+// 将 fontController 实例挂载到 window 上，供浏览器控制台全局访问
+window.fontController = fontController;
+// 兼容旧代码中对 fontContorller (多了一个 l) 的错误拼写引用
+// 保持向后兼容，避免旧示例代码或浏览器控制台输入报错
+window.fontContorller = fontController;
+export default fontController;
+export { fontController };

package/Text3D/fontController.ts

@@ -0,0 +1,209 @@
+/*
+ * @Author: xiaosihan
+ * @Date: 2021-04-15 00:34:44
+ * @Last Modified by: xiaosihan
+ * @Last Modified time: 2022-06-08 14:33:45
+ */
+import Dexie, { Table } from "dexie";
+import { filter, first, isEmpty } from "lodash";
+import { Font, FontData } from "three/examples/jsm/loaders/FontLoader";
+import threeUtils from "../threeUtils";
+import gentilisJSON from "./gentilis.json";
+
+// 字体字形数据结构（对齐 three FontLoader 的 FontData.glyphs 元素）
+type FontGlyph = { ha: number; x_min: number; x_max: number; o?: string };
+
+export type saveFontParam = {
+    fontType?: string;
+    fontName: string;
+    fontJson: Record<string, unknown>;
+};
+
+export type addFontFamilyParam = {
+    fontType?: string;
+    fontFamilyJson: Record<string, unknown>;
+};
+
+export type getFontParam = {
+    fontType?: string;
+    fontName: string;
+};
+
+export type loadTextParam = {
+    fontBasePath: string;
+    fontType?: string;
+    text?: string;
+    callback?: (font: Font) => void;
+};
+
+class indexBD extends Dexie {
+    constructor(dbName: string) {
+        super(dbName);
+    }
+    threeFont!: Table;
+}
+
+class fontControl {
+    constructor() { }
+
+    THREEFontMap: Map<string, Font> = new Map();
+
+    fontBD: indexBD = (() => {
+        let fontDB = new indexBD("three-base-font");
+        fontDB.version(1).stores({ threeFont: "++KeyPath,fontType,fontName,fontJson" });
+        return fontDB;
+    })();
+
+    /**
+     * 保存 字体json到本地数据库中
+     * @param {saveFontParam} { fontType = "simhei", fontName, fontJson }
+     * @memberof fontControl
+     */
+    async saveFont({ fontType = "simhei", fontName, fontJson = {} }: saveFontParam): Promise<void> {
+        let findResult = await this.getFont({ fontType, fontName });
+        if (isEmpty(findResult)) {
+            await this.fontBD.threeFont.add({ fontType, fontName, fontJson });
+        }
+    }
+
+    /**
+     * 通过 fontType 和 fontName 查询 fontJson
+     * @param {getFontParam} { fontType = "simhei", fontName }
+     * @returns
+     * @memberof fontControl
+     */
+    async getFont({ fontType = "simhei", fontName }: getFontParam): Promise<Record<string, unknown> | undefined> {
+        let fondResult = await this.fontBD.threeFont
+            .filter((d: { fontType: string; fontName: string }) => (d.fontType === fontType && d.fontName === fontName))
+            .toArray();
+        if (isEmpty(fondResult)) {
+            return undefined;
+        }
+        else {
+            return first(fondResult)!.fontJson;
+        }
+    }
+
+    _loadTextCall: Map<string, Array<() => void>> = new Map();
+
+    async loadText({ fontType = "simhei", text = "", fontBasePath, callback }: loadTextParam): Promise<void> {
+        await this._loadFontIndexJson({ fontType, fontBasePath });
+        let newCallback = () => {
+            let fontFamily = this.THREEFontMap.get(fontType);
+            if (callback && fontFamily) {
+                callback(fontFamily);
+            }
+        };
+        filter(text).map((fontName: string) => {
+            if (!this.hasFont({ fontType, fontName })) {
+                let fontFamily = this.THREEFontMap.get(fontType);
+                if (fontFamily) {
+                    fontFamily.data.glyphs[fontName] = { "ha": 1389, "x_min": 477, "x_max": 949, "o": "m 700 901 q 906 770 830 906 q 770 477 949 618 q 711 288 711 412 l 613 288 q 781 608 613 494 q 819 722 825 651 q 700 808 808 803 l 684 808 q 581 673 575 803 l 477 673 q 613 884 477 836 q 700 901 629 901 m 732 184 l 732 71 l 591 71 l 591 184 l 732 184 z " };
+                }
+                this._loadFontJson({ fontType, fontName, fontBasePath });
+            }
+            let origin_callbacks = this._loadTextCall.get(`${fontType}_${fontName}`) || [];
+            if (newCallback) {
+                this._loadTextCall.set(`${fontType}_${fontName}`, [...origin_callbacks, newCallback]);
+            }
+        });
+        threeUtils.addWork(newCallback);
+    }
+
+    async _loadFontIndexJson({ fontType = "simhei", fontBasePath }: loadTextParam): Promise<void> {
+        let fontFamily = this.THREEFontMap.get(fontType);
+        if (!fontFamily) {
+            fontFamily = new Font({
+                "underlineThickness": 69,
+                "underlinePosition": -174,
+                "resolution": 1000,
+                "original_font_information": {},
+                "familyName": "Source Han Sans CN Normal",
+                "descender": -167,
+                "ascender": 0,
+                "boundingBox": {
+                    "yMin": -700,
+                    "xMin": -1389,
+                    "yMax": 700,
+                    "xMax": 4067
+                },
+                "glyphs": {}
+            });
+            this.THREEFontMap.set(fontType, fontFamily);
+            let fontFamilyIndexJson = await this.getFont({ fontType, fontName: "index" });
+            if (!fontFamilyIndexJson) {
+                this._loadFontJson({ fontType, fontName: "index", fontBasePath });
+            }
+        }
+    }
+
+    async _loadFontJson({ fontType = "simhei", fontName, fontBasePath }: { fontType: string; fontName: string; fontBasePath: string }): Promise<void> {
+        let fontJson = await this.getFont({ fontType, fontName });
+        if (!fontJson) {
+            fontJson = (gentilisJSON as unknown as FontData).glyphs[fontName];
+        }
+        if (!fontJson) {
+                await new Promise<void>(resolve => {
+                let script = document.createElement("script");
+                Object.assign(script, {
+                    type: "text/javascript",
+                    src: `${fontBasePath}${fontType}/${fontName}.js`,
+                    async: true,
+                    onload: () => {
+                        script.remove();
+                        resolve();
+                    },
+                    onerror: () => {
+                    }
+                });
+                document.head.appendChild(script);
+            });
+        }
+        else {
+            let fontFamily = this.THREEFontMap.get(fontType);
+            if (fontFamily) {
+                fontFamily.data.glyphs[fontName] = fontJson as unknown as FontGlyph;
+            }
+        }
+        let origin_callbacks = this._loadTextCall.get(`${fontType}_${fontName}`) || [];
+        this._loadTextCall.delete(`${fontType}_${fontName}`);
+        origin_callbacks.map(callback => {
+            threeUtils.addWork(callback);
+        });
+    }
+
+    hasFont({ fontType, fontName }: { fontType: string; fontName: string }): boolean {
+        return !isEmpty(this.THREEFontMap.get(fontType) &&
+            this.THREEFontMap.get(fontType)!.data.glyphs[fontName]);
+    }
+
+    addFont({ fontType = "simhei", fontName, fontJson }: saveFontParam): void {
+        this.saveFont({ fontType, fontName, fontJson });
+        let fontFamily = this.THREEFontMap.get(fontType);
+        if (fontFamily) {
+            (fontFamily.data as FontData).glyphs[fontName] = fontJson as unknown as FontGlyph;
+        }
+    }
+
+    addFontFamily({ fontType = "simhei", fontFamilyJson }: addFontFamilyParam): void {
+        this.saveFont({ fontType, fontName: "index", fontJson: fontFamilyJson });
+        let fontFamily = this.THREEFontMap.get(fontType);
+        if (fontFamily) {
+            fontFamily.data = Object.assign({}, fontFamilyJson, {
+                glyphs: fontFamily.data.glyphs
+                }) as unknown as FontData;
+        }
+    }
+}
+
+const fontController = new fontControl();
+
+// 将 fontController 实例挂载到 window 上，供浏览器控制台全局访问
+(window as unknown as Record<string, unknown>).fontController = fontController;
+
+// 兼容旧代码中对 fontContorller (多了一个 l) 的错误拼写引用
+// 保持向后兼容，避免旧示例代码或浏览器控制台输入报错
+(window as unknown as Record<string, unknown>).fontContorller = fontController;
+
+export default fontController;
+export { fontController };

package/Text3D/index.d.ts

@@ -1 +1 @@
-export { default } from "./Text3D";
+export { default } from "./Text3D";

package/Text3D/index.js

@@ -1 +1 @@
-export { default } from "./Text3D";
+export { default } from "./Text3D";

package/Text3D/index.ts

@@ -0,0 +1 @@
+export { default } from "./Text3D";