three-base 2.0.142 → 2.0.166

package/PlaneModal1/PlaneModal1.js

@@ -1,109 +1,109 @@
-/*
- * @Author: xiaosihan
- * @Date: 2023-03-09 18:51:11
- * @Last Modified by: xiaosihan
- * @Last Modified time: 2023-03-09 19:15:35
- */
-import { DoubleSide, Mesh, MeshBasicMaterial, PlaneGeometry, Vector2 } from "three";
-import threeLoader from "../threeLoader";
-import planeModalPNG from "./planeModal.png";
-// 平面模型弹窗
-export default class PlaneModal1 extends Mesh {
-    constructor(config = {}) {
-        super();
-        this.updata(config);
-        this.material.map = this.texture;
-        // this.scale.set(10, 10, 10);
-    }
-    geometry = new PlaneGeometry(1 * 0.65, 0.728 * 0.65, 1, 1);
-    material = new MeshBasicMaterial({
-        side: DoubleSide,
-        transparent: true,
-        alphaTest: 0.01
-    });
-    // 背景图
-    static img = (() => {
-        const img = new Image();
-        img.src = planeModalPNG;
-        return img;
-    })();
-    canvas = (() => {
-        const canvas = document.createElement("canvas");
-        canvas.width = 660;
-        canvas.height = 481;
-        return canvas;
-    })();
-    context = this.canvas.getContext("2d");
-    texture = threeLoader.getTexture(this.canvas);
-    // 配置
-    _config = {
-        size: 10,
-        title: "PlaneModal1",
-        titleColor: "#ffffff",
-        texts: []
-        // [
-        //     {
-        //         text: "1",
-        //         color: "#ffff00",
-        //         size: 40
-        //     },
-        //     {
-        //         text: "2",
-        //         color: "#ff00ff",
-        //         size: 40
-        //     },
-        // ]
-    };
-    async updata(config) {
-        Object.assign(this._config, config);
-        //绘制背景
-        if (!this.context)
-            return;
-        this.context.clearRect(0, 0, 660, 481);
-        while (!PlaneModal1.img.complete) {
-            await new Promise(resolve => setTimeout(resolve, 100));
-        }
-        // 设置大小
-        this.scale.set(this._config.size, this._config.size, this._config.size);
-        // this.context.fillStyle = "#00000088";
-        // this.context.fillRect(0, 0, 660, 481);
-        //绘制背景
-        this.context.drawImage(PlaneModal1.img, 0, 0);
-        // 绘制标题
-        this.context.fillStyle = this._config.titleColor;
-        this.context.font = '40px serif'; // 设置字体大小
-        this.context.textAlign = "left";
-        this.context.textBaseline = "top";
-        this.context.fillText(this._config.title, 60, 72);
-        let textPos = new Vector2(60, 150);
-        let maxWidth = 530;
-        // 绘制内容
-        this._config.texts.map(({ text = "text", color = "#ffffff", size = 40 }) => {
-            if (!this.context)
-                return;
-            this.context.fillStyle = color;
-            this.context.font = `${size}px serif`; // 设置字体大小
-            this.context.textAlign = "left";
-            this.context.textBaseline = "top";
-            // 字符分隔为数组
-            var arrText = text.split('');
-            var line = '';
-            for (var n = 0; n < arrText.length; n++) {
-                var metrics = this.context.measureText(line + arrText[n]);
-                var testWidth = metrics.width;
-                if ((testWidth > maxWidth && n > 0) || arrText[n] === "\n") {
-                    this.context.fillText(line, textPos.x, textPos.y);
-                    line = "";
-                    textPos.y += size;
-                }
-                else {
-                    line += arrText[n];
-                }
-            }
-            this.context.fillText(line, textPos.x, textPos.y);
-            textPos.y += size;
-        });
-        this.texture.needsUpdate = true;
-        this.dispatchEvent({ type: "loaded" });
-    }
-}
+/*
+ * @Author: xiaosihan
+ * @Date: 2023-03-09 18:51:11
+ * @Last Modified by: xiaosihan
+ * @Last Modified time: 2023-03-09 19:15:35
+ */
+import { DoubleSide, Mesh, MeshBasicMaterial, PlaneGeometry, Vector2 } from "three";
+import threeLoader from "../threeLoader";
+import planeModalPNG from "./planeModal.png";
+// 平面模型弹窗
+export default class PlaneModal1 extends Mesh {
+    constructor(config = {}) {
+        super();
+        this.updata(config);
+        this.material.map = this.texture;
+        // this.scale.set(10, 10, 10);
+    }
+    geometry = new PlaneGeometry(1 * 0.65, 0.728 * 0.65, 1, 1);
+    material = new MeshBasicMaterial({
+        side: DoubleSide,
+        transparent: true,
+        alphaTest: 0.01
+    });
+    // 背景图
+    static img = (() => {
+        const img = new Image();
+        img.src = planeModalPNG;
+        return img;
+    })();
+    canvas = (() => {
+        const canvas = document.createElement("canvas");
+        canvas.width = 660;
+        canvas.height = 481;
+        return canvas;
+    })();
+    context = this.canvas.getContext("2d");
+    texture = threeLoader.getTexture(this.canvas);
+    // 配置
+    _config = {
+        size: 10,
+        title: "PlaneModal1",
+        titleColor: "#ffffff",
+        texts: []
+        // [
+        //     {
+        //         text: "1",
+        //         color: "#ffff00",
+        //         size: 40
+        //     },
+        //     {
+        //         text: "2",
+        //         color: "#ff00ff",
+        //         size: 40
+        //     },
+        // ]
+    };
+    async updata(config) {
+        Object.assign(this._config, config);
+        //绘制背景
+        if (!this.context)
+            return;
+        this.context.clearRect(0, 0, 660, 481);
+        while (!PlaneModal1.img.complete) {
+            await new Promise(resolve => setTimeout(resolve, 100));
+        }
+        // 设置大小
+        this.scale.set(this._config.size, this._config.size, this._config.size);
+        // this.context.fillStyle = "#00000088";
+        // this.context.fillRect(0, 0, 660, 481);
+        //绘制背景
+        this.context.drawImage(PlaneModal1.img, 0, 0);
+        // 绘制标题
+        this.context.fillStyle = this._config.titleColor;
+        this.context.font = '40px serif'; // 设置字体大小
+        this.context.textAlign = "left";
+        this.context.textBaseline = "top";
+        this.context.fillText(this._config.title, 60, 72);
+        let textPos = new Vector2(60, 150);
+        let maxWidth = 530;
+        // 绘制内容
+        this._config.texts.map(({ text = "text", color = "#ffffff", size = 40 }) => {
+            if (!this.context)
+                return;
+            this.context.fillStyle = color;
+            this.context.font = `${size}px serif`; // 设置字体大小
+            this.context.textAlign = "left";
+            this.context.textBaseline = "top";
+            // 字符分隔为数组
+            var arrText = text.split('');
+            var line = '';
+            for (var n = 0; n < arrText.length; n++) {
+                var metrics = this.context.measureText(line + arrText[n]);
+                var testWidth = metrics.width;
+                if ((testWidth > maxWidth && n > 0) || arrText[n] === "\n") {
+                    this.context.fillText(line, textPos.x, textPos.y);
+                    line = "";
+                    textPos.y += size;
+                }
+                else {
+                    line += arrText[n];
+                }
+            }
+            this.context.fillText(line, textPos.x, textPos.y);
+            textPos.y += size;
+        });
+        this.texture.needsUpdate = true;
+        this.dispatchEvent({ type: "loaded" });
+    }
+}

package/PlaneModal1/index.d.ts

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

package/PlaneModal1/index.js

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

package/PlaneText.d.ts

@@ -1,27 +1,27 @@
-import { Mesh, MeshBasicMaterial, PlaneGeometry } from "three";
-import SpriteText from "./SpriteText";
-type Props = {
-    text?: string;
-    textHeight?: number;
-    color?: string;
-    backgroundColor?: string;
-    fontFace?: string;
-    fontSize?: number;
-    fontWeight?: string;
-    padding?: number | [number, number];
-    borderWidth?: number;
-    borderRadius?: number;
-    borderColor?: string;
-    strokeWidth?: number;
-    strokeColor?: string;
-};
-export default class PlaneText extends Mesh {
-    constructor(text?: string);
-    type: string;
-    static geometry: PlaneGeometry;
-    spriteText: SpriteText;
-    material: MeshBasicMaterial;
-    set(parame: Props): void;
-    get<K extends keyof SpriteText>(prop: K): SpriteText[K];
-}
-export {};
+import { Mesh, MeshBasicMaterial, PlaneGeometry } from "three";
+import SpriteText from "./SpriteText";
+type Props = {
+    text?: string;
+    textHeight?: number;
+    color?: string;
+    backgroundColor?: string;
+    fontFace?: string;
+    fontSize?: number;
+    fontWeight?: string;
+    padding?: number | [number, number];
+    borderWidth?: number;
+    borderRadius?: number;
+    borderColor?: string;
+    strokeWidth?: number;
+    strokeColor?: string;
+};
+export default class PlaneText extends Mesh {
+    constructor(text?: string);
+    type: string;
+    static geometry: PlaneGeometry;
+    spriteText: SpriteText;
+    material: MeshBasicMaterial;
+    set(parame: Props): void;
+    get<K extends keyof SpriteText>(prop: K): SpriteText[K];
+}
+export {};

package/PlaneText.js

@@ -1,35 +1,35 @@
-/*
- * @Author: xiaosihan
- * @Date: 2022-05-23 13:53:06
- * @Last Modified by: xiaosihan
- * @Last Modified time: 2023-05-03 02:54:52
- */
-import { DoubleSide, Mesh, MeshBasicMaterial, PlaneGeometry, Vector3 } from "three";
-import SpriteText from "./SpriteText";
-export default class PlaneText extends Mesh {
-    constructor(text = "planeText") {
-        super(PlaneText.geometry);
-        this.set({ text });
-    }
-    type = "PlaneText";
-    static geometry = new PlaneGeometry(1, 1, 1, 1);
-    spriteText = new SpriteText("");
-    material = new MeshBasicMaterial({ transparent: true, side: DoubleSide, map: this.spriteText.material.map });
-    set(parame) {
-        for (let key in parame) {
-            const value = parame[key];
-            if (value !== undefined) {
-                // Only set properties that exist on SpriteText and are writable
-                if (key in this.spriteText) {
-                    this.spriteText[key] = value;
-                }
-            }
-        }
-        this.scale.copy(this.spriteText.scale);
-        this.scale.max(new Vector3(1, 1, 1));
-        this.material.map = this.spriteText.material.map;
-    }
-    get(prop) {
-        return this.spriteText[prop];
-    }
-}
+/*
+ * @Author: xiaosihan
+ * @Date: 2022-05-23 13:53:06
+ * @Last Modified by: xiaosihan
+ * @Last Modified time: 2023-05-03 02:54:52
+ */
+import { DoubleSide, Mesh, MeshBasicMaterial, PlaneGeometry, Vector3 } from "three";
+import SpriteText from "./SpriteText";
+export default class PlaneText extends Mesh {
+    constructor(text = "planeText") {
+        super(PlaneText.geometry);
+        this.set({ text });
+    }
+    type = "PlaneText";
+    static geometry = new PlaneGeometry(1, 1, 1, 1);
+    spriteText = new SpriteText("");
+    material = new MeshBasicMaterial({ transparent: true, side: DoubleSide, map: this.spriteText.material.map });
+    set(parame) {
+        for (let key in parame) {
+            const value = parame[key];
+            if (value !== undefined) {
+                // Only set properties that exist on SpriteText and are writable
+                if (key in this.spriteText) {
+                    this.spriteText[key] = value;
+                }
+            }
+        }
+        this.scale.copy(this.spriteText.scale);
+        this.scale.max(new Vector3(1, 1, 1));
+        this.material.map = this.spriteText.material.map;
+    }
+    get(prop) {
+        return this.spriteText[prop];
+    }
+}

package/PlaneWithHtml.d.ts

@@ -1,13 +1,13 @@
-import { Mesh, MeshBasicMaterial, PlaneGeometry, Vector2 } from "three";
-type HexColorString = `#${string}`;
-export default class PlaneWithHtml extends Mesh {
-    constructor(html?: string, backgroundColor?: HexColorString);
-    visible: boolean;
-    size: Vector2;
-    geometry: PlaneGeometry;
-    material: MeshBasicMaterial;
-    div: HTMLDivElement;
-    setGeoSize(width: number, height: number): void;
-    setHtml(html?: string, backgroundColor?: HexColorString): Promise<void>;
-}
-export {};
+import { Mesh, MeshBasicMaterial, PlaneGeometry, Vector2 } from "three";
+type HexColorString = `#${string}`;
+export default class PlaneWithHtml extends Mesh {
+    constructor(html?: string, backgroundColor?: HexColorString);
+    visible: boolean;
+    size: Vector2;
+    geometry: PlaneGeometry;
+    material: MeshBasicMaterial;
+    div: HTMLDivElement;
+    setGeoSize(width: number, height: number): void;
+    setHtml(html?: string, backgroundColor?: HexColorString): Promise<void>;
+}
+export {};

package/PlaneWithHtml.js

@@ -1,64 +1,66 @@
-/*
- * @Author: xiaosihan
- * @Date: 2023-04-15 11:26:32
- * @Last Modified by: xiaosihan
- * @Last Modified time: 2023-04-15 12:38:09
- */
-import { snapdom } from "@zumer/snapdom";
-import { Texture, DoubleSide, Mesh, MeshBasicMaterial, PlaneGeometry, Vector2 } from "three";
-import { MathUtils } from "three";
-const { degToRad } = MathUtils;
-import threeLoader from "./threeLoader";
-// html 文本面板
-export default class PlaneWithHtml extends Mesh {
-    constructor(html = "", backgroundColor = "#00000000") {
-        super();
-        this.setHtml(html, backgroundColor);
-    }
-    visible = false;
-    size = new Vector2(10, 10);
-    geometry = (() => {
-        const geometry = new PlaneGeometry(10, 10, 1, 1);
-        geometry.rotateX(degToRad(-90));
-        return geometry;
-    })();
-    material = new MeshBasicMaterial({
-        side: DoubleSide,
-        transparent: true,
-        alphaTest: 0.1
-    });
-    div = (() => {
-        const div = document.createElement("div");
-        div.style.position = "fixed";
-        div.style.top = "100%";
-        div.style.left = "100%";
-        div.style.pointerEvents = "none";
-        div.style.userSelect = "none";
-        div.style.lineHeight = "1";
-        div.style.whiteSpace = "nowrap";
-        return div;
-    })();
-    // 设置网格尺寸
-    setGeoSize(width, height) {
-        this.size.set(width, height);
-        this.geometry.dispose();
-        const geometry = new PlaneGeometry(width, height, 1, 1);
-        geometry.rotateX(degToRad(-90));
-        this.geometry = geometry;
-    }
-    async setHtml(html = "", backgroundColor = "#00000000") {
-        this.div.innerHTML = html;
-        document.body.appendChild(this.div);
-        const img = await snapdom.toPng(this.div, { backgroundColor });
-        this.setGeoSize(img.naturalWidth, img.naturalHeight);
-        const texture = new Texture(img);
-        texture.needsUpdate = true;
-        this.material.map = texture;
-        this.material.map.anisotropy = threeLoader.anisotropy;
-        this.material.needsUpdate = true;
-        await new Promise(resolve => requestAnimationFrame(resolve));
-        this.visible = true;
-        this.div.remove();
-        this.dispatchEvent({ type: "loaded" });
-    }
-}
+/*
+ * @Author: xiaosihan
+ * @Date: 2023-04-15 11:26:32
+ * @Last Modified by: xiaosihan
+ * @Last Modified time: 2023-04-15 12:38:09
+ */
+import { snapdom } from "@zumer/snapdom";
+import { Texture, DoubleSide, Mesh, MeshBasicMaterial, PlaneGeometry, Vector2 } from "three";
+import { MathUtils } from "three";
+const { degToRad } = MathUtils;
+import threeLoader from "./threeLoader";
+import threeUtils from "./threeUtils";
+// html 文本面板
+export default class PlaneWithHtml extends Mesh {
+    constructor(html = "", backgroundColor = "#00000000") {
+        super();
+        this.setHtml(html, backgroundColor);
+    }
+    visible = false;
+    size = new Vector2(10, 10);
+    geometry = (() => {
+        const geometry = new PlaneGeometry(10, 10, 1, 1);
+        geometry.rotateX(degToRad(-90));
+        return geometry;
+    })();
+    material = new MeshBasicMaterial({
+        side: DoubleSide,
+        transparent: true,
+        alphaTest: 0.1
+    });
+    div = (() => {
+        const div = document.createElement("div");
+        div.style.position = "fixed";
+        div.style.top = "100%";
+        div.style.left = "100%";
+        div.style.pointerEvents = "none";
+        div.style.userSelect = "none";
+        div.style.lineHeight = "1";
+        div.style.whiteSpace = "nowrap";
+        return div;
+    })();
+    // 设置网格尺寸
+    setGeoSize(width, height) {
+        this.size.set(width, height);
+        this.geometry.dispose();
+        const geometry = new PlaneGeometry(width, height, 1, 1);
+        geometry.rotateX(degToRad(-90));
+        this.geometry = geometry;
+    }
+    async setHtml(html = "", backgroundColor = "#00000000") {
+        this.div.innerHTML = html;
+        document.body.appendChild(this.div);
+        const img = await snapdom.toPng(this.div, { backgroundColor });
+        this.setGeoSize(img.naturalWidth, img.naturalHeight);
+        const texture = new Texture(img);
+        texture.needsUpdate = true;
+        this.material.map = texture;
+        this.material.map.anisotropy = threeLoader.anisotropy;
+        this.material.needsUpdate = true;
+        // ⭐ 2026-10-09 皇上旨：走 threeUtils 公共 rAF 链，不再另起独立 rAF 回调
+        await threeUtils.waitNextFrame();
+        this.visible = true;
+        this.div.remove();
+        this.dispatchEvent({ type: "loaded" });
+    }
+}

package/PlaneWithHtml.ts

@@ -9,6 +9,7 @@ import { Texture, DoubleSide, Mesh, MeshBasicMaterial, PlaneGeometry, Vector2 }
 import { MathUtils } from "three";
 const { degToRad } = MathUtils;
 import threeLoader from "./threeLoader";
+import threeUtils from "./threeUtils";
 
 type HexColorString = `#${string}`;
 
@@ -62,7 +63,8 @@ export default class PlaneWithHtml extends Mesh {
         this.material.map = texture;
         this.material.map.anisotropy = threeLoader.anisotropy;
         this.material.needsUpdate = true;
-        await new Promise(resolve => requestAnimationFrame(resolve));
+        // ⭐ 2026-10-09 皇上旨：走 threeUtils 公共 rAF 链，不再另起独立 rAF 回调
+        await threeUtils.waitNextFrame();
         this.visible = true;
         this.div.remove();
         this.dispatchEvent({ type: "loaded" } as never);

package/PointLight/PointLight.d.ts

@@ -1,13 +1,13 @@
-import { Sprite, PointLight as THREEPointLight, Object3DEventMap } from "three";
-import SpriteText from "../SpriteText";
-/**
- * 点光源
- * @export
- * @class PointLight
- * @extends {THREEPointLight}
- */
-export default class PointLight extends THREEPointLight {
-    constructor(color?: string, intensity?: number, distance?: number, decay?: number);
-    pointLinghtHelper: Sprite<Object3DEventMap> | false;
-    label: SpriteText | false;
-}
+import { Sprite, PointLight as THREEPointLight, Object3DEventMap } from "three";
+import SpriteText from "../SpriteText";
+/**
+ * 点光源
+ * @export
+ * @class PointLight
+ * @extends {THREEPointLight}
+ */
+export default class PointLight extends THREEPointLight {
+    constructor(color?: string, intensity?: number, distance?: number, decay?: number);
+    pointLinghtHelper: Sprite<Object3DEventMap> | false;
+    label: SpriteText | false;
+}