three-base 2.0.77 → 2.0.79

package/ExtrudeMesh.d.ts

@@ -55,7 +55,7 @@ export default class ExtrudeMesh extends Mesh<BufferGeometry, Material> {
             number
         ];
     }>;
-    computerMatrix(vector1: [number, number, number], vector2: [number, number, number], scale: [number, number, number]): import("three").Matrix4Tuple;
+    computerMatrix(vector1: [number, number, number], vector2: [number, number, number], scale: [number, number, number]): [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number];
     /**
      * @计算渐变值 computerGradient([3,2,4], 0.3);
      * @渐变区间 values:number[]

package/ExtrudeMesh.ts

@@ -81,7 +81,12 @@ export default class ExtrudeMesh extends Mesh<BufferGeometry, Material> {
             )
         );
         ExtrudeMesh.temp1Matrix4.scale(ExtrudeMesh.temp1Vector3.set(...scale));
-        return ExtrudeMesh.temp1Matrix4.transpose().toArray();
+        return ExtrudeMesh.temp1Matrix4.transpose().toArray() as [
+            number, number, number, number,
+            number, number, number, number,
+            number, number, number, number,
+            number, number, number, number
+        ];
     }
 
     /**

package/InstancedMeshBase.js

@@ -150,13 +150,14 @@ export default class InstancedMeshBase extends MeshBase {
     }
     // 设置矩阵
     async setMatrixAt(index, matrix = new Matrix4().identity()) {
+        const new_matrix = matrix.clone(); // 把矩阵克隆一下避免对象引用问题
         await this.awaitLoaded();
         Object.keys(this.meshCollect).forEach(uuid => {
             const instancedMesh = this.instanceCollect[uuid];
             const collect = this.meshCollect[uuid];
             collect.forEach((mesh, i) => {
                 InstancedMeshBase._matrix.copy(mesh.matrix);
-                InstancedMeshBase._matrix.premultiply(matrix);
+                InstancedMeshBase._matrix.premultiply(new_matrix);
                 instancedMesh.setMatrixAt(collect.length * index + i, InstancedMeshBase._matrix);
                 instancedMesh.instanceMatrix.needsUpdate = true;
             });
@@ -165,6 +166,9 @@ export default class InstancedMeshBase extends MeshBase {
     }
     //设置移动旋转缩放
     async setTRS(index, { position, rotation, scale }) {
+        const new_position = position ? position.clone() : undefined;
+        const new_rotation = rotation ? rotation.clone() : undefined;
+        const new_scale = scale ? scale.clone() : undefined;
         await this.awaitLoaded();
         Object.keys(this.meshCollect).forEach(uuid => {
             const instancedMesh = this.instanceCollect[uuid];
@@ -175,9 +179,9 @@ export default class InstancedMeshBase extends MeshBase {
                 InstancedMeshBase._matrix.premultiply(mesh.matrix.clone().invert());
                 InstancedMeshBase._matrix.decompose(InstancedMeshBase._position, InstancedMeshBase._Quaternion, InstancedMeshBase._scale);
                 InstancedMeshBase._rotation.setFromQuaternion(InstancedMeshBase._Quaternion);
-                position && InstancedMeshBase._position.copy(position);
-                rotation && InstancedMeshBase._rotation.copy(rotation);
-                scale && InstancedMeshBase._scale.copy(scale);
+                new_position && InstancedMeshBase._position.copy(new_position);
+                new_rotation && InstancedMeshBase._rotation.copy(new_rotation);
+                new_scale && InstancedMeshBase._scale.copy(new_scale);
                 InstancedMeshBase._Quaternion.setFromEuler(InstancedMeshBase._rotation);
                 InstancedMeshBase._matrix.compose(InstancedMeshBase._position, InstancedMeshBase._Quaternion, InstancedMeshBase._scale);
                 InstancedMeshBase._matrix.premultiply(mesh.matrix);

package/InstancedMeshBase.ts

@@ -6,7 +6,7 @@
  */
 
 import { throttle } from "lodash";
-import { Color, Euler, InstancedBufferAttribute, InstancedMesh, Material, Matrix4, Mesh, Object3D, Quaternion, Vector3 } from "three";
+import { BufferAttribute, Color, Euler, InstancedBufferAttribute, InstancedMesh, Material, Matrix4, Mesh, Object3D, Quaternion, Vector3 } from "three";
 import MeshBase from "./MeshBase";
 import threeUtils from "./threeUtils";
 import threeLoader from "./threeLoader";
@@ -185,7 +185,7 @@ export default class InstancedMeshBase extends MeshBase {
 
             for (let i = 0; i < instanceMesh.count; i++) {
                 instanceMatrix.copyAt(i, instanceMesh.instanceMatrix, i);
-                instanceColor.copyAt(i, instanceMesh.instanceColor, i);
+                instanceColor.copyAt(i, instanceMesh.instanceColor as BufferAttribute, i);
             }
 
             instanceMesh.instanceMatrix = instanceMatrix;
@@ -197,13 +197,14 @@ export default class InstancedMeshBase extends MeshBase {
 
     // 设置矩阵
     async setMatrixAt(index: number, matrix: Matrix4 = new Matrix4().identity()) {
+        const new_matrix = matrix.clone(); // 把矩阵克隆一下避免对象引用问题
         await this.awaitLoaded();
         Object.keys(this.meshCollect).forEach(uuid => {
             const instancedMesh = this.instanceCollect[uuid];
             const collect = this.meshCollect[uuid]
             collect.forEach((mesh: Mesh, i: number) => {
                 InstancedMeshBase._matrix.copy(mesh.matrix);
-                InstancedMeshBase._matrix.premultiply(matrix);
+                InstancedMeshBase._matrix.premultiply(new_matrix);
 
                 instancedMesh.setMatrixAt(collect.length * index + i, InstancedMeshBase._matrix);
                 instancedMesh.instanceMatrix.needsUpdate = true;
@@ -226,6 +227,11 @@ export default class InstancedMeshBase extends MeshBase {
             scale?: Vector3
         }
     ) {
+
+        const new_position = position ? position.clone() : undefined;
+        const new_rotation = rotation ? rotation.clone() : undefined;
+        const new_scale = scale ? scale.clone() : undefined;
+
         await this.awaitLoaded();
 
         Object.keys(this.meshCollect).forEach(uuid => {
@@ -243,9 +249,9 @@ export default class InstancedMeshBase extends MeshBase {
                     InstancedMeshBase._scale
                 );
                 InstancedMeshBase._rotation.setFromQuaternion(InstancedMeshBase._Quaternion);
-                position && InstancedMeshBase._position.copy(position);
-                rotation && InstancedMeshBase._rotation.copy(rotation);
-                scale && InstancedMeshBase._scale.copy(scale);
+                new_position && InstancedMeshBase._position.copy(new_position);
+                new_rotation && InstancedMeshBase._rotation.copy(new_rotation);
+                new_scale && InstancedMeshBase._scale.copy(new_scale);
                 InstancedMeshBase._Quaternion.setFromEuler(InstancedMeshBase._rotation);
 
                 InstancedMeshBase._matrix.compose(

package/KeyFrameAnimation.d.ts

@@ -14,7 +14,7 @@ export default class KeyframeAnimation extends Object3D {
     constructor(props: KeyframeAnimationProps);
     speedScale: number;
     object3d: Object3D;
-    halperLine: Line<any, LineBasicMaterial>;
+    halperLine: Line<any, LineBasicMaterial, import("three").Object3DEventMap>;
     keyframes: Array<Keyframe>;
     setObject3D(object3d: Object3D): void;
     getKeyframe(i: number): Keyframe;

package/MeshBase.d.ts

@@ -15,7 +15,7 @@ export default class MeshBase extends Group {
     frustumCulled: boolean;
     castShadow: boolean;
     receiveShadow: boolean;
-    resoles: any[];
+    resoles: Array<(value: void | PromiseLike<void>) => void>;
     awaitLoaded(): Promise<void>;
     traverseMesh(callback: (mesh: Mesh) => void): Promise<void>;
     clock: Clock;

package/MeshBase.js

@@ -89,7 +89,8 @@ export default class MeshBase extends Group {
                             await new Promise(resolve => requestAnimationFrame(resolve));
                         }
                         while (this.resoles.length > 0) {
-                            this.resoles.pop()();
+                            const resole = this.resoles.pop();
+                            resole && resole();
                         }
                     })();
                 }

package/MeshBase.ts

@@ -109,7 +109,7 @@ export default class MeshBase extends Group {
     receiveShadow: boolean = false;
 
     // promise.resole 队列
-    resoles = [];
+    resoles: Array<(value: void | PromiseLike<void>) => void> = [];
     // 等待加载加载完成
     async awaitLoaded() {
         if (!this.loaded) {
@@ -120,7 +120,8 @@ export default class MeshBase extends Group {
                             await new Promise(resolve => requestAnimationFrame(resolve));
                         }
                         while (this.resoles.length > 0) {
-                            this.resoles.pop()();
+                            const resole = this.resoles.pop();
+                            resole && resole();
                         }
                     })();
                 }

package/PlaneText.d.ts

@@ -25,12 +25,7 @@ export default class PlaneText extends Mesh {
     get(prop: keyof SpriteText): string | number | boolean | Vector3 | import("three").Object3D<import("three").Object3DEventMap> | import("three").BufferGeometry<import("three").NormalBufferAttributes> | ((force?: boolean) => void) | ((callback: (object: import("three").Object3D<import("three").Object3DEventMap>) => any) => void) | import("three").Object3D<import("three").Object3DEventMap>[] | import("three").Euler | import("three").Material | import("three").Quaternion | import("three").Matrix4 | import("three").Matrix3 | import("three").Layers | import("three").AnimationClip[] | Record<string, any> | ((renderer: import("three").WebGLRenderer, scene: import("three").Scene, shadowCamera: import("three").Camera, geometry: import("three").BufferGeometry<import("three").NormalBufferAttributes>, depthMaterial: import("three").Material, group: import("three").Group<import("three").Object3DEventMap>) => void) | ((renderer: import("three").WebGLRenderer, scene: import("three").Scene, shadowCamera: import("three").Camera, geometry: import("three").BufferGeometry<import("three").NormalBufferAttributes>, depthMaterial: import("three").Material, group: import("three").Group<import("three").Object3DEventMap>) => void) | ((renderer: import("three").WebGLRenderer, scene: import("three").Scene, camera: import("three").Camera, geometry: import("three").BufferGeometry<import("three").NormalBufferAttributes>, material: import("three").Material, group: import("three").Group<import("three").Object3DEventMap>) => void) | ((renderer: import("three").WebGLRenderer, scene: import("three").Scene, camera: import("three").Camera, geometry: import("three").BufferGeometry<import("three").NormalBufferAttributes>, material: import("three").Material, group: import("three").Group<import("three").Object3DEventMap>) => void) | ((matrix: import("three").Matrix4) => void) | ((axis: Vector3, angle: number) => void) | ((euler: import("three").Euler) => void) | ((m: import("three").Matrix4) => void) | ((q: import("three").Quaternion) => void) | ((vector: Vector3) => Vector3) | ((vector: Vector3) => Vector3) | {
         (vector: Vector3): void;
         (x: number, y: number, z: number): void;
-    } | ((id: number) => import("three").Object3D<import("three").Object3DEventMap>) | ((name: string) => import("three").Object3D<import("three").Object3DEventMap>) | ((name: string, value: any) => import("three").Object3D<import("three").Object3DEventMap>) | ((name: string, value: any, optionalTarget?: import("three").Object3D<import("three").Object3DEventMap>[]) => import("three").Object3D<import("three").Object3DEventMap>[]) | ((target: Vector3) => Vector3) | ((target: import("three").Quaternion) => import("three").Quaternion) | ((target: Vector3) => Vector3) | ((target: Vector3) => Vector3) | ((raycaster: import("three").Raycaster, intersects: import("three").Intersection<import("three").Object3D<import("three").Object3DEventMap>>[]) => void) | ((callback: (object: import("three").Object3D<import("three").Object3DEventMap>) => any) => void) | ((callback: (object: import("three").Object3D<import("three").Object3DEventMap>) => any) => void) | (() => void) | ((updateParents: boolean, updateChildren: boolean) => void) | ((meta?: {
-        geometries: any;
-        materials: any;
-        textures: any;
-        images: any;
-    }) => any) | (<T extends keyof import("three").Object3DEventMap>(event: import("three").BaseEvent<T> & import("three").Object3DEventMap[T]) => void) | HTMLCanvasElement | import("three").Vector2 | import("three").SpriteMaterial | ((source: SpriteText, recursive?: boolean) => SpriteText) | (() => void) | ((quaternion: import("three").Quaternion) => SpriteText) | ((axis: Vector3, angle: number) => SpriteText) | ((axis: Vector3, angle: number) => SpriteText) | ((angle: number) => SpriteText) | ((angle: number) => SpriteText) | ((angle: number) => SpriteText) | ((axis: Vector3, distance: number) => SpriteText) | ((distance: number) => SpriteText) | ((distance: number) => SpriteText) | ((distance: number) => SpriteText) | ((...object: import("three").Object3D<import("three").Object3DEventMap>[]) => SpriteText) | ((...object: import("three").Object3D<import("three").Object3DEventMap>[]) => SpriteText) | (() => SpriteText) | (() => SpriteText) | ((object: import("three").Object3D<import("three").Object3DEventMap>) => SpriteText) | ((recursive?: boolean) => SpriteText) | {
+    } | ((id: number) => import("three").Object3D<import("three").Object3DEventMap>) | ((name: string) => import("three").Object3D<import("three").Object3DEventMap>) | ((name: string, value: any) => import("three").Object3D<import("three").Object3DEventMap>) | ((name: string, value: any, optionalTarget?: import("three").Object3D<import("three").Object3DEventMap>[]) => import("three").Object3D<import("three").Object3DEventMap>[]) | ((target: Vector3) => Vector3) | ((target: import("three").Quaternion) => import("three").Quaternion) | ((target: Vector3) => Vector3) | ((target: Vector3) => Vector3) | ((raycaster: import("three").Raycaster, intersects: import("three").Intersection<import("three").Object3D<import("three").Object3DEventMap>>[]) => void) | ((callback: (object: import("three").Object3D<import("three").Object3DEventMap>) => any) => void) | ((callback: (object: import("three").Object3D<import("three").Object3DEventMap>) => any) => void) | (() => void) | ((updateParents: boolean, updateChildren: boolean) => void) | ((meta?: import("three").JSONMeta) => import("three").Object3DJSON) | (<T extends keyof import("three").Object3DEventMap>(event: import("three").BaseEvent<T> & import("three").Object3DEventMap[T]) => void) | HTMLCanvasElement | import("three").Vector2 | import("three").SpriteMaterial | ((object: import("three").Object3D<import("three").Object3DEventMap>, recursive?: boolean) => SpriteText) | (() => void) | ((quaternion: import("three").Quaternion) => SpriteText) | ((axis: Vector3, angle: number) => SpriteText) | ((axis: Vector3, angle: number) => SpriteText) | ((angle: number) => SpriteText) | ((angle: number) => SpriteText) | ((angle: number) => SpriteText) | ((axis: Vector3, distance: number) => SpriteText) | ((distance: number) => SpriteText) | ((distance: number) => SpriteText) | ((distance: number) => SpriteText) | ((...object: import("three").Object3D<import("three").Object3DEventMap>[]) => SpriteText) | ((...object: import("three").Object3D<import("three").Object3DEventMap>[]) => SpriteText) | (() => SpriteText) | (() => SpriteText) | ((object: import("three").Object3D<import("three").Object3DEventMap>) => SpriteText) | ((recursive?: boolean) => SpriteText) | {
         <T_1 extends keyof import("three").Object3DEventMap>(type: T_1, listener: import("three").EventListener<import("three").Object3DEventMap[T_1], T_1, SpriteText>): void;
         <T_2 extends string>(type: T_2, listener: import("three").EventListener<{}, T_2, SpriteText>): void;
     } | {

package/PointLight/PointLight.d.ts

@@ -8,6 +8,6 @@ import SpriteText from "../SpriteText";
  */
 export default class PointLight extends THREEPointLight {
     constructor(color?: string, intensity?: number, distance?: number, decay?: number);
-    pointLinghtHelper: Sprite;
+    pointLinghtHelper: Sprite<import("three").Object3DEventMap>;
     label: SpriteText;
 }

package/Text3D/Text3D.d.ts

@@ -3,7 +3,7 @@ export type Text3DProps = {
     text?: string;
     fontType?: string;
     size?: number | undefined;
-    height?: number | undefined;
+    depth?: number | undefined;
     curveSegments?: number | undefined;
     bevelEnabled?: boolean | undefined;
     bevelThickness?: number | undefined;

package/Text3D/Text3D.js

@@ -25,7 +25,7 @@ export default class Text3D extends Mesh {
         fontType: "simhei",
         size: 1,
         curveSegments: 10,
-        height: 0.1,
+        depth: 0.1,
         bevelEnabled: true,
         bevelThickness: 0.02,
         bevelSize: 0.015,
@@ -46,7 +46,7 @@ export default class Text3D extends Mesh {
                         font: THREEFont,
                         size: this._config.size,
                         curveSegments: this._config.curveSegments,
-                        height: this._config.height,
+                        depth: this._config.depth,
                         bevelEnabled: this._config.bevelEnabled,
                         bevelThickness: this._config.bevelThickness,
                         bevelSize: this._config.bevelSize,

package/Text3D/Text3D.ts

@@ -15,7 +15,7 @@ export type Text3DProps = {
     text?: string,
     fontType?: string,
     size?: number | undefined;
-    height?: number | undefined;
+    depth?: number | undefined;
     curveSegments?: number | undefined;
     bevelEnabled?: boolean | undefined;
     bevelThickness?: number | undefined;
@@ -48,7 +48,7 @@ export default class Text3D extends Mesh {
         fontType: "simhei",
         size: 1,
         curveSegments: 10,
-        height: 0.1, // 文字的厚度
+        depth: 0.1, // 文字的厚度
         bevelEnabled: true, // 斜角开启
         bevelThickness: 0.02, // 斜角厚度
         bevelSize: 0.015, // 斜角大小
@@ -73,7 +73,7 @@ export default class Text3D extends Mesh {
                         font: THREEFont,
                         size: this._config.size,
                         curveSegments: this._config.curveSegments,
-                        height: this._config.height, // 文字的厚度
+                        depth: this._config.depth, // 文字的厚度
                         bevelEnabled: this._config.bevelEnabled, // 斜角开启
                         bevelThickness: this._config.bevelThickness, // 斜角厚度
                         bevelSize: this._config.bevelSize, // 斜角大小

package/Text3D/fontController.js

@@ -100,8 +100,7 @@ class fontContorl {
                 "original_font_information": {},
                 "familyName": "Source Han Sans CN Normal",
                 "descender": -167,
-                "cssFontWeight": "normal",
-                "cssFontStyle": "normal",
+                "ascender": 0,
                 "boundingBox": {
                     "yMin": -700,
                     "xMin": -1389,

package/Text3D/fontController.ts

@@ -154,8 +154,7 @@ class fontContorl {
                 "original_font_information": {},
                 "familyName": "Source Han Sans CN Normal",
                 "descender": -167,
-                "cssFontWeight": "normal",
-                "cssFontStyle": "normal",
+                "ascender": 0,
                 "boundingBox": {
                     "yMin": -700,
                     "xMin": -1389,
@@ -179,7 +178,7 @@ class fontContorl {
 
     // 加载外部字体.js
     async _loadFontJson({ fontType = "simhei", fontName, fontBasePath }: { fontType: string, fontName: string, fontBasePath: string }) {
-        
+
         let fontJson = await this.getFont({ fontType, fontName });
 
         if (!fontJson) {

package/ThreeBase.js

@@ -20,6 +20,19 @@ import threeUtils from "./threeUtils";
 export default class ThreeBase extends EventDispatcher {
     constructor() {
         super();
+        // 资源加载进度有更新时, 需要渲染
+        threeLoader.addEventListener("loadding", () => {
+            this.dispatchEvent({ type: "loadding" });
+            setTimeout(() => {
+                this.needRender = true;
+            }, 100);
+        });
+        threeLoader.addEventListener("onLoad", () => {
+            this.dispatchEvent({ type: "onLoad" });
+            setTimeout(() => {
+                this.needRender = true;
+            }, 100);
+        });
         this.init();
     }
     // 基础深度纹理
@@ -248,15 +261,6 @@ export default class ThreeBase extends EventDispatcher {
     //TODO 设置帧频率 默认50帧
     frame = 50;
     init() {
-        // 资源加载进度有更新时, 需要渲染
-        threeLoader.addEventListener("loadding", () => {
-            this.dispatchEvent({ type: "loadding" });
-            this.needRender = true;
-        });
-        threeLoader.addEventListener("onLoad", () => {
-            this.dispatchEvent({ type: "onLoad" });
-            this.needRender = true;
-        });
     }
     // 重置控制器的位置
     resetLookAt({ position = this.perspectiveCamera.position, center = this.controls.target, }) {

package/ThreeBase.ts

@@ -5,8 +5,8 @@
  * @Last Modified time: 2024-08-10 04:23:41
  */
 
-import { add, round } from "lodash";
-import { AxesHelper, Box3, BufferGeometry, DepthFormat, DepthTexture, EventDispatcher, GridHelper, LinearFilter, LinearSRGBColorSpace, MOUSE, Mesh, MeshBasicMaterial, NoBlending, NormalBlending, Object3D, OrthographicCamera, PerspectiveCamera, RGBAFormat, SRGBColorSpace, Scene, TOUCH, Texture, UnsignedShortType, Vector2, Vector3, WebGLRenderTarget, WebGLRenderer } from "three";
+import { round } from "lodash";
+import { AxesHelper, Box3, BufferGeometry, DepthFormat, DepthTexture, EventDispatcher, GridHelper, LinearFilter, MOUSE, Mesh, MeshBasicMaterial, NoBlending, NormalBlending, Object3D, OrthographicCamera, PerspectiveCamera, RGBAFormat, Scene, TOUCH, Texture, UnsignedShortType, Vector2, Vector3, WebGLRenderTarget, WebGLRenderer } from "three";
 import { OrbitControls } from "three/examples/jsm/controls/OrbitControls.js";
 import { degToRad, generateUUID } from "three/src/math/MathUtils";
 import ThreeMouse from "./ThreeMouse";
@@ -23,6 +23,22 @@ export default class ThreeBase extends EventDispatcher {
 
     constructor() {
         super();
+
+        // 资源加载进度有更新时, 需要渲染
+        threeLoader.addEventListener("loadding", () => {
+            this.dispatchEvent({ type: "loadding" } as never);
+            setTimeout(() => {
+                this.needRender = true;
+            }, 100);
+        });
+
+        threeLoader.addEventListener("onLoad", () => {
+            this.dispatchEvent({ type: "onLoad" } as never);
+            setTimeout(() => {
+                this.needRender = true;
+            }, 100);
+        });
+
         this.init();
     }
 
@@ -292,16 +308,7 @@ export default class ThreeBase extends EventDispatcher {
     frame = 50;
 
     init() {
-        // 资源加载进度有更新时, 需要渲染
-        threeLoader.addEventListener("loadding", () => {
-            this.dispatchEvent({ type: "loadding" } as never);
-            this.needRender = true;
-        });
 
-        threeLoader.addEventListener("onLoad", () => {
-            this.dispatchEvent({ type: "onLoad" } as never);
-            this.needRender = true;
-        });
 
     }
 

package/ThreeMouse.d.ts

@@ -2,6 +2,7 @@ import * as THREE from "three";
 import { Object3D, Scene } from "three";
 import type { Intersection } from "three";
 export interface ThreeMouseEvent extends Intersection {
+    e: MouseEvent;
     renderer: THREE.Renderer;
     camera: THREE.Camera;
     type: string;
@@ -26,6 +27,7 @@ export default class ThreeMouse {
     _frame: number;
     _mouseInRenderer: boolean;
     _mousemoveEvent?: MouseEvent;
+    _mouseEvent?: MouseEvent;
     _object3ds: Object3D[];
     _click_num: number;
     _getSelected(object3ds: Object3D[]): Intersection | undefined;

package/ThreeMouse.js

@@ -42,6 +42,8 @@ export default class ThreeMouse {
     _mouseInRenderer = false;
     // 鼠标滑动的事件
     _mousemoveEvent;
+    // 鼠标事件
+    _mouseEvent;
     // 需要被拾取的对象数组
     _object3ds = [];
     // 点击次数
@@ -110,6 +112,7 @@ export default class ThreeMouse {
             const { face, object } = intersection;
             // face && face.normal.applyMatrix4(object.matrixWorld);
             const MouseEvent = Object.assign(intersection, {
+                e: this._mousemoveEvent,
                 renderer: this._renderer,
                 camera: this._camera,
                 object: intersection.object,
@@ -150,6 +153,7 @@ export default class ThreeMouse {
             if (this.hasEvent(this._mesh_on, ["mouseleave"])) {
                 // 鼠标离开事件
                 this._mesh_on.dispatchEvent({
+                    e: this._mouseEvent,
                     renderer: this._renderer,
                     camera: this._camera,
                     object: this._mesh_on,
@@ -167,10 +171,12 @@ export default class ThreeMouse {
     }
     // 鼠标离开事件
     _mouseleave = (e) => {
+        this._mouseEvent = e;
         this._mouseInRenderer = false;
         // 鼠标离开事件
         if (this._mousemoveEvent && this.hasEvent(this._mesh_on, ["mouseleave"])) {
             this._mesh_on.dispatchEvent({
+                e: this._mouseEvent,
                 renderer: this._renderer,
                 camera: this._camera,
                 object: this._mesh_on,
@@ -200,6 +206,7 @@ export default class ThreeMouse {
     };
     // 鼠标按下事件
     _mousedown = (e) => {
+        this._mouseEvent = e;
         // 记录按下的位置
         this._mouseDownPosition.set(e.offsetX, e.offsetY);
         this._mousemove(e);
@@ -211,6 +218,7 @@ export default class ThreeMouse {
         // 触发鼠标按下事件
         if (this.hasEvent(this._mesh_Down, ["mousedown"])) {
             this._mesh_Down.dispatchEvent({
+                e: this._mouseEvent,
                 ...intersection,
                 renderer: this._renderer,
                 camera: this._camera,
@@ -225,6 +233,7 @@ export default class ThreeMouse {
     };
     // 鼠标弹起事件
     _mouseup = debounce(async (e) => {
+        this._mouseEvent = e;
         // 提取有事件的对象
         const meshs = [];
         let intersection = this._getSelected(this._object3ds);
@@ -234,6 +243,7 @@ export default class ThreeMouse {
         this._mesh_on = intersection.object;
         if (this.hasEvent(this._mesh_on, ["mouseup"])) {
             this._mesh_on.dispatchEvent({
+                e: this._mouseEvent,
                 ...intersection,
                 renderer: this._renderer,
                 camera: this._camera,
@@ -258,6 +268,7 @@ export default class ThreeMouse {
                 if (this._click_num === 1) {
                     if (this.hasEvent(this._mesh_Down, ["click"])) {
                         this._mesh_Down.dispatchEvent({
+                            e: this._mouseEvent,
                             ...intersection,
                             renderer: this._renderer,
                             camera: this._camera,
@@ -271,6 +282,7 @@ export default class ThreeMouse {
                     }
                     if (this.hasEvent(this._mesh_Down, ["leftclick"]) && (e.button === 0)) {
                         this._mesh_Down.dispatchEvent({
+                            e: this._mouseEvent,
                             ...intersection,
                             renderer: this._renderer,
                             camera: this._camera,
@@ -284,6 +296,7 @@ export default class ThreeMouse {
                     }
                     if (this.hasEvent(this._mesh_Down, ["rightclick"]) && (e.button === 2)) {
                         this._mesh_Down.dispatchEvent({
+                            e: this._mouseEvent,
                             ...intersection,
                             renderer: this._renderer,
                             camera: this._camera,
@@ -299,6 +312,7 @@ export default class ThreeMouse {
                 else if (this._click_num > 1) {
                     if (this.hasEvent(this._mesh_Down, ["dbclick"]) && (new Date().valueOf() - this._click_num > 1) && (e.button === 0)) {
                         this._mesh_Down.dispatchEvent({
+                            e: this._mouseEvent,
                             ...intersection,
                             renderer: this._renderer,
                             camera: this._camera,
@@ -315,6 +329,7 @@ export default class ThreeMouse {
             else {
                 if (this.hasEvent(this._mesh_Down, ["click"])) {
                     this._mesh_Down.dispatchEvent({
+                        e: this._mouseEvent,
                         ...intersection,
                         renderer: this._renderer,
                         camera: this._camera,
@@ -328,6 +343,7 @@ export default class ThreeMouse {
                 }
                 if (this.hasEvent(this._mesh_Down, ["leftclick"]) && (e.button === 0)) {
                     this._mesh_Down.dispatchEvent({
+                        e: this._mouseEvent,
                         ...intersection,
                         renderer: this._renderer,
                         camera: this._camera,
@@ -341,6 +357,7 @@ export default class ThreeMouse {
                 }
                 if (this.hasEvent(this._mesh_Down, ["rightclick"]) && (e.button === 2)) {
                     this._mesh_Down.dispatchEvent({
+                        e: this._mouseEvent,
                         ...intersection,
                         renderer: this._renderer,
                         camera: this._camera,

package/ThreeMouse.ts

@@ -10,6 +10,7 @@ import type { Intersection } from "three";
 import { debounce } from "lodash";
 
 export interface ThreeMouseEvent extends Intersection {
+    e: MouseEvent;
     renderer: THREE.Renderer;
     camera: THREE.Camera;
     type: string;
@@ -72,6 +73,9 @@ export default class ThreeMouse {
     // 鼠标滑动的事件
     _mousemoveEvent?: MouseEvent;
 
+    // 鼠标事件
+    _mouseEvent?: MouseEvent;
+
     // 需要被拾取的对象数组
     _object3ds: Object3D[] = [];
 
@@ -154,6 +158,7 @@ export default class ThreeMouse {
             const { face, object } = intersection;
             // face && face.normal.applyMatrix4(object.matrixWorld);
             const MouseEvent: ThreeMouseEvent = Object.assign(intersection, {  // 将来可能用到的对象
+                e: this._mousemoveEvent,
                 renderer: this._renderer,
                 camera: this._camera,
                 object: intersection.object,
@@ -200,6 +205,7 @@ export default class ThreeMouse {
             if (this.hasEvent(this._mesh_on, ["mouseleave"])) {
                 // 鼠标离开事件
                 this._mesh_on!.dispatchEvent({
+                    e: this._mouseEvent,
                     renderer: this._renderer,
                     camera: this._camera,
                     object: this._mesh_on as Object3D,
@@ -222,11 +228,13 @@ export default class ThreeMouse {
 
     // 鼠标离开事件
     _mouseleave = (e: MouseEvent) => {
+        this._mouseEvent = e;
         this._mouseInRenderer = false;
 
         // 鼠标离开事件
         if (this._mousemoveEvent && this.hasEvent(this._mesh_on, ["mouseleave"])) {
             this._mesh_on!.dispatchEvent({
+                e: this._mouseEvent,
                 renderer: this._renderer,
                 camera: this._camera,
                 object: this._mesh_on as Object3D,
@@ -266,6 +274,7 @@ export default class ThreeMouse {
 
     // 鼠标按下事件
     _mousedown = (e: MouseEvent) => {
+        this._mouseEvent = e;
         // 记录按下的位置
         this._mouseDownPosition.set(e.offsetX, e.offsetY);
 
@@ -283,6 +292,7 @@ export default class ThreeMouse {
         if (this.hasEvent(this._mesh_Down, ["mousedown"])) {
 
             this._mesh_Down.dispatchEvent({
+                e: this._mouseEvent,
                 ...intersection,
                 renderer: this._renderer,
                 camera: this._camera,
@@ -300,7 +310,7 @@ export default class ThreeMouse {
 
     // 鼠标弹起事件
     _mouseup = debounce(async (e: PointerEvent) => {
-
+        this._mouseEvent = e;
         // 提取有事件的对象
         const meshs: Object3D[] = [];
 
@@ -315,6 +325,7 @@ export default class ThreeMouse {
         if (this.hasEvent(this._mesh_on, ["mouseup"])) {
 
             this._mesh_on.dispatchEvent({
+                e: this._mouseEvent,
                 ...intersection,
                 renderer: this._renderer,
                 camera: this._camera,
@@ -347,6 +358,7 @@ export default class ThreeMouse {
 
                     if (this.hasEvent(this._mesh_Down, ["click"])) {
                         this._mesh_Down.dispatchEvent({
+                            e: this._mouseEvent,
                             ...intersection,
                             renderer: this._renderer,
                             camera: this._camera,
@@ -361,6 +373,7 @@ export default class ThreeMouse {
 
                     if (this.hasEvent(this._mesh_Down, ["leftclick"]) && (e.button === 0)) {
                         this._mesh_Down.dispatchEvent({
+                            e: this._mouseEvent,
                             ...intersection,
                             renderer: this._renderer,
                             camera: this._camera,
@@ -375,6 +388,7 @@ export default class ThreeMouse {
 
                     if (this.hasEvent(this._mesh_Down, ["rightclick"]) && (e.button === 2)) {
                         this._mesh_Down.dispatchEvent({
+                            e: this._mouseEvent,
                             ...intersection,
                             renderer: this._renderer,
                             camera: this._camera,
@@ -392,6 +406,7 @@ export default class ThreeMouse {
                     if (this.hasEvent(this._mesh_Down, ["dbclick"]) && (new Date().valueOf() - this._click_num > 1) && (e.button === 0)) {
 
                         this._mesh_Down.dispatchEvent({
+                            e: this._mouseEvent,
                             ...intersection,
                             renderer: this._renderer,
                             camera: this._camera,
@@ -411,6 +426,7 @@ export default class ThreeMouse {
 
                 if (this.hasEvent(this._mesh_Down, ["click"])) {
                     this._mesh_Down.dispatchEvent({
+                        e: this._mouseEvent,
                         ...intersection,
                         renderer: this._renderer,
                         camera: this._camera,
@@ -425,6 +441,7 @@ export default class ThreeMouse {
 
                 if (this.hasEvent(this._mesh_Down, ["leftclick"]) && (e.button === 0)) {
                     this._mesh_Down.dispatchEvent({
+                        e: this._mouseEvent,
                         ...intersection,
                         renderer: this._renderer,
                         camera: this._camera,
@@ -439,6 +456,7 @@ export default class ThreeMouse {
 
                 if (this.hasEvent(this._mesh_Down, ["rightclick"]) && (e.button === 2)) {
                     this._mesh_Down.dispatchEvent({
+                        e: this._mouseEvent,
                         ...intersection,
                         renderer: this._renderer,
                         camera: this._camera,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "three-base",
-    "version": "2.0.77",
+    "version": "2.0.79",
     "description": "three 3d three-base",
     "publishConfig": {
         "registry": "https://registry.npmjs.org/"
@@ -38,8 +38,8 @@
     "dependencies": {
         "apng-js": "^1",
         "lodash": "^4",
-        "@types/three": "^0.159.0",
-        "three": "^0.159.0",
+        "@types/three": "0.167.0",
+        "three": "0.167.0",
         "dexie": "^3",
         "vite": "*",
         "html2canvas": "^1.4.1"