three-base 2.0.142 → 2.0.145

package/SpriteText.js

@@ -1,176 +1,176 @@
-/*
- * @Author: xiaosihan
- * @Date: 2023-05-03 02:42:07
- * @Last Modified by: xiaosihan
- * @Last Modified time: 2023-05-03 02:53:00
- */
-import { Sprite, SpriteMaterial, Texture, LinearFilter } from "three";
-export default class SpriteText extends Sprite {
-    constructor(text = '', textHeight = 10, color = 'rgba(255, 255, 255, 1)') {
-        super(new SpriteMaterial());
-        this.material.alphaTest = 0.1;
-        this._text = `${text}`;
-        this._textHeight = textHeight;
-        this._color = color;
-        this._genCanvas();
-    }
-    _text = "";
-    _textHeight = 10;
-    _color = "#ffffff";
-    _backgroundColor = false; // no background color
-    _padding = 0;
-    _borderWidth = 0;
-    _borderRadius = 0;
-    _borderColor = "#fffff";
-    _strokeWidth = 0;
-    _strokeColor = "#fffff";
-    _fontFace = 'Arial';
-    _fontSize = 90; // defines text resolution
-    _fontWeight = 'normal';
-    _canvas = document.createElement('canvas');
-    get text() { return this._text; }
-    set text(text) { this._text = text; this._genCanvas(); }
-    get textHeight() { return this._textHeight; }
-    set textHeight(textHeight) { this._textHeight = textHeight; this._genCanvas(); }
-    get color() { return this._color; }
-    set color(color) { this._color = color; this._genCanvas(); }
-    get backgroundColor() { return this._backgroundColor; }
-    set backgroundColor(color) { this._backgroundColor = color; this._genCanvas(); }
-    get padding() { return this._padding; }
-    set padding(padding) { this._padding = padding; this._genCanvas(); }
-    get borderWidth() { return this._borderWidth; }
-    set borderWidth(borderWidth) { this._borderWidth = borderWidth; this._genCanvas(); }
-    get borderRadius() { return this._borderRadius; }
-    set borderRadius(borderRadius) { this._borderRadius = borderRadius; this._genCanvas(); }
-    get borderColor() { return this._borderColor; }
-    set borderColor(borderColor) { this._borderColor = borderColor; this._genCanvas(); }
-    get fontFace() { return this._fontFace; }
-    set fontFace(fontFace) { this._fontFace = fontFace; this._genCanvas(); }
-    get fontSize() { return this._fontSize; }
-    set fontSize(fontSize) { this._fontSize = fontSize; this._genCanvas(); }
-    get fontWeight() { return this._fontWeight; }
-    set fontWeight(fontWeight) { this._fontWeight = fontWeight; this._genCanvas(); }
-    get strokeWidth() { return this._strokeWidth; }
-    set strokeWidth(strokeWidth) { this._strokeWidth = strokeWidth; this._genCanvas(); }
-    get strokeColor() { return this._strokeColor; }
-    set strokeColor(strokeColor) { this._strokeColor = strokeColor; this._genCanvas(); }
-    _genCanvas() {
-        const canvas = this._canvas;
-        const ctx = canvas.getContext('2d');
-        if (!ctx)
-            return;
-        const border = Array.isArray(this.borderWidth) ? this.borderWidth : [this.borderWidth, this.borderWidth]; // x,y border
-        const relBorder = border.map(b => b * this.fontSize * 0.1); // border in canvas units
-        const borderRadius = Array.isArray(this.borderRadius) ? this.borderRadius : [this.borderRadius, this.borderRadius, this.borderRadius, this.borderRadius]; // tl tr br bl corners
-        const relBorderRadius = borderRadius.map(b => b * this.fontSize * 0.1); // border radius in canvas units
-        const padding = Array.isArray(this.padding) ? this.padding : [this.padding, this.padding]; // x,y padding
-        const relPadding = padding.map(p => p * this.fontSize * 0.1);
-        ; // padding in canvas units
-        const lines = this.text.split('\n');
-        const font = `${this.fontWeight} ${this.fontSize}px ${this.fontFace}`;
-        ctx.font = font; // measure canvas with appropriate font
-        const innerWidth = Math.max(...lines.map(line => ctx.measureText(line).width));
-        const innerHeight = this.fontSize * lines.length;
-        canvas.width = innerWidth + relBorder[0] * 2 + relPadding[0] * 2;
-        canvas.height = innerHeight + relBorder[1] * 2 + relPadding[1] * 2;
-        // paint border
-        if (this.borderWidth) {
-            ctx.strokeStyle = this.borderColor;
-            if (relBorder[0]) { // left + right borders
-                const hb = relBorder[0] / 2;
-                ctx.lineWidth = relBorder[0];
-                ctx.beginPath();
-                ctx.moveTo(hb, relBorderRadius[0]);
-                ctx.lineTo(hb, canvas.height - relBorderRadius[3]);
-                ctx.moveTo(canvas.width - hb, relBorderRadius[1]);
-                ctx.lineTo(canvas.width - hb, canvas.height - relBorderRadius[2]);
-                ctx.stroke();
-            }
-            if (relBorder[1]) { // top + bottom borders
-                const hb = relBorder[1] / 2;
-                ctx.lineWidth = relBorder[1];
-                ctx.beginPath();
-                ctx.moveTo(Math.max(relBorder[0], relBorderRadius[0]), hb);
-                ctx.lineTo(canvas.width - Math.max(relBorder[0], relBorderRadius[1]), hb);
-                ctx.moveTo(Math.max(relBorder[0], relBorderRadius[3]), canvas.height - hb);
-                ctx.lineTo(canvas.width - Math.max(relBorder[0], relBorderRadius[2]), canvas.height - hb);
-                ctx.stroke();
-            }
-            if (this.borderRadius) { // strike rounded corners
-                const cornerWidth = Math.max(...relBorder);
-                const hb = cornerWidth / 2;
-                ctx.lineWidth = cornerWidth;
-                ctx.beginPath();
-                [
-                    !!relBorderRadius[0] && [relBorderRadius[0], hb, hb, relBorderRadius[0]],
-                    !!relBorderRadius[1] && [canvas.width - relBorderRadius[1], canvas.width - hb, hb, relBorderRadius[1]],
-                    !!relBorderRadius[2] && [canvas.width - relBorderRadius[2], canvas.width - hb, canvas.height - hb, canvas.height - relBorderRadius[2]],
-                    !!relBorderRadius[3] && [relBorderRadius[3], hb, canvas.height - hb, canvas.height - relBorderRadius[3]]
-                ].filter((d) => !!d).forEach(([x0, x1, y0, y1]) => {
-                    ctx.moveTo(x0, y0);
-                    ctx.quadraticCurveTo(x1, y0, x1, y1);
-                });
-                ctx.stroke();
-            }
-        }
-        // paint background
-        if (this.backgroundColor && typeof this.backgroundColor === 'string') {
-            ctx.fillStyle = this.backgroundColor;
-            if (!this.borderRadius) {
-                ctx.fillRect(relBorder[0], relBorder[1], canvas.width - relBorder[0] * 2, canvas.height - relBorder[1] * 2);
-            }
-            else { // fill with rounded corners
-                ctx.beginPath();
-                ctx.moveTo(relBorder[0], relBorderRadius[0]);
-                [
-                    [relBorder[0], relBorderRadius[0], canvas.width - relBorderRadius[1], relBorder[1], relBorder[1], relBorder[1]],
-                    [canvas.width - relBorder[0], canvas.width - relBorder[0], canvas.width - relBorder[0], relBorder[1], relBorderRadius[1], canvas.height - relBorderRadius[2]],
-                    [canvas.width - relBorder[0], canvas.width - relBorderRadius[2], relBorderRadius[3], canvas.height - relBorder[1], canvas.height - relBorder[1], canvas.height - relBorder[1]],
-                    [relBorder[0], relBorder[0], relBorder[0], canvas.height - relBorder[1], canvas.height - relBorderRadius[3], relBorderRadius[0]], // t
-                ].forEach(([x0, x1, x2, y0, y1, y2]) => {
-                    ctx.quadraticCurveTo(x0, y0, x1, y1);
-                    ctx.lineTo(x2, y2);
-                });
-                ctx.closePath();
-                ctx.fill();
-            }
-        }
-        ctx.translate(...relBorder);
-        ctx.translate(...relPadding);
-        // paint text
-        ctx.font = font; // Set font again after canvas is resized, as context properties are reset
-        ctx.fillStyle = this.color;
-        // 精确垂直居中：用 measureText 的 actualBoundingBox 实测字形上下沿，
-        // 不再依赖 textBaseline='middle'（middle 是 em 盒中线，与真实字形视觉中线常偏差，
-        // 导致整行文字偏上/偏下、看着不居中）。改为 alphabetic 基线 + 实测字形高度，
-        // 把每行字形放进其 fontSize 高的槽中心。
-        ctx.textAlign = 'center';
-        ctx.textBaseline = 'alphabetic';
-        const drawTextStroke = this.strokeWidth > 0;
-        if (drawTextStroke) {
-            ctx.lineWidth = this.strokeWidth * this.fontSize / 10;
-            ctx.strokeStyle = this.strokeColor;
-        }
-        const slotH = this.fontSize; // 每行槽高
-        lines.forEach((line, index) => {
-            const metrics = ctx.measureText(line);
-            const ascent = metrics.actualBoundingBoxAscent; // 字形顶部到基线
-            const descent = metrics.actualBoundingBoxDescent; // 基线到字形底部
-            const glyphH = (ascent || 0) + (descent || 0);
-            const slotTop = index * slotH; // 本行槽顶（内容框坐标系，已平移）
-            // 让字形在槽中垂直居中：先平移到槽中线，再上移 ascent 回到基线
-            const baselineY = slotTop + (slotH - glyphH) / 2 + (ascent || slotH / 2);
-            const lineX = innerWidth / 2;
-            drawTextStroke && ctx.strokeText(line, lineX, baselineY);
-            ctx.fillText(line, lineX, baselineY);
-        });
-        // Inject canvas into sprite
-        if (this.material.map)
-            this.material.map.dispose(); // gc previous texture
-        const texture = this.material.map = new Texture(canvas);
-        texture.minFilter = LinearFilter;
-        texture.needsUpdate = true;
-        const yScale = this.textHeight * lines.length + border[1] * 2 + padding[1] * 2;
-        this.scale.set(yScale * canvas.width / canvas.height, yScale, 0);
-    }
-}
+/*
+ * @Author: xiaosihan
+ * @Date: 2023-05-03 02:42:07
+ * @Last Modified by: xiaosihan
+ * @Last Modified time: 2023-05-03 02:53:00
+ */
+import { Sprite, SpriteMaterial, Texture, LinearFilter } from "three";
+export default class SpriteText extends Sprite {
+    constructor(text = '', textHeight = 10, color = 'rgba(255, 255, 255, 1)') {
+        super(new SpriteMaterial());
+        this.material.alphaTest = 0.1;
+        this._text = `${text}`;
+        this._textHeight = textHeight;
+        this._color = color;
+        this._genCanvas();
+    }
+    _text = "";
+    _textHeight = 10;
+    _color = "#ffffff";
+    _backgroundColor = false; // no background color
+    _padding = 0;
+    _borderWidth = 0;
+    _borderRadius = 0;
+    _borderColor = "#fffff";
+    _strokeWidth = 0;
+    _strokeColor = "#fffff";
+    _fontFace = 'Arial';
+    _fontSize = 90; // defines text resolution
+    _fontWeight = 'normal';
+    _canvas = document.createElement('canvas');
+    get text() { return this._text; }
+    set text(text) { this._text = text; this._genCanvas(); }
+    get textHeight() { return this._textHeight; }
+    set textHeight(textHeight) { this._textHeight = textHeight; this._genCanvas(); }
+    get color() { return this._color; }
+    set color(color) { this._color = color; this._genCanvas(); }
+    get backgroundColor() { return this._backgroundColor; }
+    set backgroundColor(color) { this._backgroundColor = color; this._genCanvas(); }
+    get padding() { return this._padding; }
+    set padding(padding) { this._padding = padding; this._genCanvas(); }
+    get borderWidth() { return this._borderWidth; }
+    set borderWidth(borderWidth) { this._borderWidth = borderWidth; this._genCanvas(); }
+    get borderRadius() { return this._borderRadius; }
+    set borderRadius(borderRadius) { this._borderRadius = borderRadius; this._genCanvas(); }
+    get borderColor() { return this._borderColor; }
+    set borderColor(borderColor) { this._borderColor = borderColor; this._genCanvas(); }
+    get fontFace() { return this._fontFace; }
+    set fontFace(fontFace) { this._fontFace = fontFace; this._genCanvas(); }
+    get fontSize() { return this._fontSize; }
+    set fontSize(fontSize) { this._fontSize = fontSize; this._genCanvas(); }
+    get fontWeight() { return this._fontWeight; }
+    set fontWeight(fontWeight) { this._fontWeight = fontWeight; this._genCanvas(); }
+    get strokeWidth() { return this._strokeWidth; }
+    set strokeWidth(strokeWidth) { this._strokeWidth = strokeWidth; this._genCanvas(); }
+    get strokeColor() { return this._strokeColor; }
+    set strokeColor(strokeColor) { this._strokeColor = strokeColor; this._genCanvas(); }
+    _genCanvas() {
+        const canvas = this._canvas;
+        const ctx = canvas.getContext('2d');
+        if (!ctx)
+            return;
+        const border = Array.isArray(this.borderWidth) ? this.borderWidth : [this.borderWidth, this.borderWidth]; // x,y border
+        const relBorder = border.map(b => b * this.fontSize * 0.1); // border in canvas units
+        const borderRadius = Array.isArray(this.borderRadius) ? this.borderRadius : [this.borderRadius, this.borderRadius, this.borderRadius, this.borderRadius]; // tl tr br bl corners
+        const relBorderRadius = borderRadius.map(b => b * this.fontSize * 0.1); // border radius in canvas units
+        const padding = Array.isArray(this.padding) ? this.padding : [this.padding, this.padding]; // x,y padding
+        const relPadding = padding.map(p => p * this.fontSize * 0.1);
+        ; // padding in canvas units
+        const lines = this.text.split('\n');
+        const font = `${this.fontWeight} ${this.fontSize}px ${this.fontFace}`;
+        ctx.font = font; // measure canvas with appropriate font
+        const innerWidth = Math.max(...lines.map(line => ctx.measureText(line).width));
+        const innerHeight = this.fontSize * lines.length;
+        canvas.width = innerWidth + relBorder[0] * 2 + relPadding[0] * 2;
+        canvas.height = innerHeight + relBorder[1] * 2 + relPadding[1] * 2;
+        // paint border
+        if (this.borderWidth) {
+            ctx.strokeStyle = this.borderColor;
+            if (relBorder[0]) { // left + right borders
+                const hb = relBorder[0] / 2;
+                ctx.lineWidth = relBorder[0];
+                ctx.beginPath();
+                ctx.moveTo(hb, relBorderRadius[0]);
+                ctx.lineTo(hb, canvas.height - relBorderRadius[3]);
+                ctx.moveTo(canvas.width - hb, relBorderRadius[1]);
+                ctx.lineTo(canvas.width - hb, canvas.height - relBorderRadius[2]);
+                ctx.stroke();
+            }
+            if (relBorder[1]) { // top + bottom borders
+                const hb = relBorder[1] / 2;
+                ctx.lineWidth = relBorder[1];
+                ctx.beginPath();
+                ctx.moveTo(Math.max(relBorder[0], relBorderRadius[0]), hb);
+                ctx.lineTo(canvas.width - Math.max(relBorder[0], relBorderRadius[1]), hb);
+                ctx.moveTo(Math.max(relBorder[0], relBorderRadius[3]), canvas.height - hb);
+                ctx.lineTo(canvas.width - Math.max(relBorder[0], relBorderRadius[2]), canvas.height - hb);
+                ctx.stroke();
+            }
+            if (this.borderRadius) { // strike rounded corners
+                const cornerWidth = Math.max(...relBorder);
+                const hb = cornerWidth / 2;
+                ctx.lineWidth = cornerWidth;
+                ctx.beginPath();
+                [
+                    !!relBorderRadius[0] && [relBorderRadius[0], hb, hb, relBorderRadius[0]],
+                    !!relBorderRadius[1] && [canvas.width - relBorderRadius[1], canvas.width - hb, hb, relBorderRadius[1]],
+                    !!relBorderRadius[2] && [canvas.width - relBorderRadius[2], canvas.width - hb, canvas.height - hb, canvas.height - relBorderRadius[2]],
+                    !!relBorderRadius[3] && [relBorderRadius[3], hb, canvas.height - hb, canvas.height - relBorderRadius[3]]
+                ].filter((d) => !!d).forEach(([x0, x1, y0, y1]) => {
+                    ctx.moveTo(x0, y0);
+                    ctx.quadraticCurveTo(x1, y0, x1, y1);
+                });
+                ctx.stroke();
+            }
+        }
+        // paint background
+        if (this.backgroundColor && typeof this.backgroundColor === 'string') {
+            ctx.fillStyle = this.backgroundColor;
+            if (!this.borderRadius) {
+                ctx.fillRect(relBorder[0], relBorder[1], canvas.width - relBorder[0] * 2, canvas.height - relBorder[1] * 2);
+            }
+            else { // fill with rounded corners
+                ctx.beginPath();
+                ctx.moveTo(relBorder[0], relBorderRadius[0]);
+                [
+                    [relBorder[0], relBorderRadius[0], canvas.width - relBorderRadius[1], relBorder[1], relBorder[1], relBorder[1]], // t
+                    [canvas.width - relBorder[0], canvas.width - relBorder[0], canvas.width - relBorder[0], relBorder[1], relBorderRadius[1], canvas.height - relBorderRadius[2]], // r
+                    [canvas.width - relBorder[0], canvas.width - relBorderRadius[2], relBorderRadius[3], canvas.height - relBorder[1], canvas.height - relBorder[1], canvas.height - relBorder[1]], // b
+                    [relBorder[0], relBorder[0], relBorder[0], canvas.height - relBorder[1], canvas.height - relBorderRadius[3], relBorderRadius[0]], // t
+                ].forEach(([x0, x1, x2, y0, y1, y2]) => {
+                    ctx.quadraticCurveTo(x0, y0, x1, y1);
+                    ctx.lineTo(x2, y2);
+                });
+                ctx.closePath();
+                ctx.fill();
+            }
+        }
+        ctx.translate(...relBorder);
+        ctx.translate(...relPadding);
+        // paint text
+        ctx.font = font; // Set font again after canvas is resized, as context properties are reset
+        ctx.fillStyle = this.color;
+        // 精确垂直居中：用 measureText 的 actualBoundingBox 实测字形上下沿，
+        // 不再依赖 textBaseline='middle'（middle 是 em 盒中线，与真实字形视觉中线常偏差，
+        // 导致整行文字偏上/偏下、看着不居中）。改为 alphabetic 基线 + 实测字形高度，
+        // 把每行字形放进其 fontSize 高的槽中心。
+        ctx.textAlign = 'center';
+        ctx.textBaseline = 'alphabetic';
+        const drawTextStroke = this.strokeWidth > 0;
+        if (drawTextStroke) {
+            ctx.lineWidth = this.strokeWidth * this.fontSize / 10;
+            ctx.strokeStyle = this.strokeColor;
+        }
+        const slotH = this.fontSize; // 每行槽高
+        lines.forEach((line, index) => {
+            const metrics = ctx.measureText(line);
+            const ascent = metrics.actualBoundingBoxAscent; // 字形顶部到基线
+            const descent = metrics.actualBoundingBoxDescent; // 基线到字形底部
+            const glyphH = (ascent || 0) + (descent || 0);
+            const slotTop = index * slotH; // 本行槽顶（内容框坐标系，已平移）
+            // 让字形在槽中垂直居中：先平移到槽中线，再上移 ascent 回到基线
+            const baselineY = slotTop + (slotH - glyphH) / 2 + (ascent || slotH / 2);
+            const lineX = innerWidth / 2;
+            drawTextStroke && ctx.strokeText(line, lineX, baselineY);
+            ctx.fillText(line, lineX, baselineY);
+        });
+        // Inject canvas into sprite
+        if (this.material.map)
+            this.material.map.dispose(); // gc previous texture
+        const texture = this.material.map = new Texture(canvas);
+        texture.minFilter = LinearFilter;
+        texture.needsUpdate = true;
+        const yScale = this.textHeight * lines.length + border[1] * 2 + padding[1] * 2;
+        this.scale.set(yScale * canvas.width / canvas.height, yScale, 0);
+    }
+}

package/SpriteText2.d.ts

@@ -1,48 +1,48 @@
-import { Sprite, Raycaster, Intersection } from 'three';
-import type { ColorString } from "./types";
-export default class SpriteText2 extends Sprite {
-    constructor(text?: string, textHeight?: number, color?: ColorString);
-    _text: string;
-    _textHeight: number;
-    _color: ColorString;
-    _backgroundColor: ColorString | false;
-    _padding: number;
-    _borderWidth: number;
-    _borderRadius: number;
-    _borderColor: string;
-    _strokeWidth: number;
-    _strokeColor: string;
-    _fontFace: string;
-    _fontSize: number;
-    _fontWeight: string;
-    _canvas: HTMLCanvasElement;
-    get text(): string;
-    set text(text: string);
-    get textHeight(): number;
-    set textHeight(textHeight: number);
-    get color(): ColorString;
-    set color(color: ColorString);
-    get backgroundColor(): ColorString | false;
-    set backgroundColor(color: ColorString | false);
-    get padding(): number;
-    set padding(padding: number);
-    get borderWidth(): number;
-    set borderWidth(borderWidth: number);
-    get borderRadius(): number;
-    set borderRadius(borderRadius: number);
-    get borderColor(): string;
-    set borderColor(borderColor: string);
-    get fontFace(): string;
-    set fontFace(fontFace: string);
-    get fontSize(): number;
-    set fontSize(fontSize: number);
-    get fontWeight(): string;
-    set fontWeight(fontWeight: string);
-    get strokeWidth(): number;
-    set strokeWidth(strokeWidth: number);
-    get strokeColor(): string;
-    set strokeColor(strokeColor: string);
-    _genCanvas(): void;
-    raycast(raycaster: Raycaster, intersects: Intersection[]): void;
-    copy(source: SpriteText2): this;
-}
+import { Sprite, Raycaster, Intersection } from 'three';
+import type { ColorString } from "./types";
+export default class SpriteText2 extends Sprite {
+    constructor(text?: string, textHeight?: number, color?: ColorString);
+    _text: string;
+    _textHeight: number;
+    _color: ColorString;
+    _backgroundColor: ColorString | false;
+    _padding: number;
+    _borderWidth: number;
+    _borderRadius: number;
+    _borderColor: string;
+    _strokeWidth: number;
+    _strokeColor: string;
+    _fontFace: string;
+    _fontSize: number;
+    _fontWeight: string;
+    _canvas: HTMLCanvasElement;
+    get text(): string;
+    set text(text: string);
+    get textHeight(): number;
+    set textHeight(textHeight: number);
+    get color(): ColorString;
+    set color(color: ColorString);
+    get backgroundColor(): ColorString | false;
+    set backgroundColor(color: ColorString | false);
+    get padding(): number;
+    set padding(padding: number);
+    get borderWidth(): number;
+    set borderWidth(borderWidth: number);
+    get borderRadius(): number;
+    set borderRadius(borderRadius: number);
+    get borderColor(): string;
+    set borderColor(borderColor: string);
+    get fontFace(): string;
+    set fontFace(fontFace: string);
+    get fontSize(): number;
+    set fontSize(fontSize: number);
+    get fontWeight(): string;
+    set fontWeight(fontWeight: string);
+    get strokeWidth(): number;
+    set strokeWidth(strokeWidth: number);
+    get strokeColor(): string;
+    set strokeColor(strokeColor: string);
+    _genCanvas(): void;
+    raycast(raycaster: Raycaster, intersects: Intersection[]): void;
+    copy(source: SpriteText2): this;
+}