three-base 2.0.20 → 2.0.21

package/ApngTexture.ts

@@ -86,6 +86,6 @@ export default class ApngTexture extends CanvasTexture {
 }
 
 // 定时更新时间戳
-threeUtils.addEventListener("requestAnimationFrame", (e) => {
+threeUtils.addEventListener("requestAnimationFrame", (e: any) => {
     ApngTexture.TimeTemp = e.timeTemp;
 });

package/ApngTextureManage.ts

@@ -18,7 +18,7 @@ class apngTextureManage {
         // 初始化定时更新时间戳
         if (apngTextureManage.isInit) {
             apngTextureManage.isInit = false;
-            threeUtils.addEventListener("requestAnimationFrame5000", (e) => {
+            threeUtils.addEventListener("requestAnimationFrame5000", (e: any) => {
                 apngTextureManage.TimeTemp = e.timeTemp;
             });
         }

package/ExtrudeMesh.ts

@@ -564,7 +564,7 @@ export default class ExtrudeMesh extends Mesh<BufferGeometry, Material> {
         this.geometry.dispose();
         this.geometry = geometry;
 
-        this.dispatchEvent({ type: "loaded" });
+        this.dispatchEvent({ type: "loaded" } as never);
     }
 
 

package/KeyFrameAnimation.ts

@@ -109,7 +109,7 @@ export default class KeyframeAnimation extends Object3D {
             (endKeyframe.rotation.z - startKeyframe.rotation.z) * progress + startKeyframe.rotation.z,
         );
 
-        this.dispatchEvent({ type: "update" });
+        this.dispatchEvent({ type: "update" } as never);
     }
 
     //更新关键帧的实例矩阵

package/PlaneModal1/PlaneModal1.d.ts

@@ -16,7 +16,7 @@ export default class PlaneModal1 extends Mesh {
     static img: HTMLImageElement;
     canvas: HTMLCanvasElement;
     context: CanvasRenderingContext2D;
-    texture: import("three").CanvasTexture | import("three").Texture;
+    texture: import("three").Texture;
     _config: {
         size: number;
         title: string;

package/PlaneModal1/PlaneModal1.ts

@@ -144,7 +144,7 @@ export default class PlaneModal1 extends Mesh {
 
         this.texture.needsUpdate = true;
 
-        this.dispatchEvent({ type: "loaded" });
+        this.dispatchEvent({ type: "loaded" } as never);
     }
 
 

package/PlaneText.d.ts

@@ -22,16 +22,23 @@ export default class PlaneText extends Mesh {
     spriteText: SpriteText;
     material: MeshBasicMaterial;
     set(parame: Props): void;
-    get(prop: keyof SpriteText): string | number | boolean | ((event: import("three").Event) => void) | Vector3 | import("three").Object3D<import("three").Event> | import("three").BufferGeometry<import("three").NormalBufferAttributes> | ((force?: boolean) => void) | import("three").Object3D<import("three").Event>[] | HTMLCanvasElement | import("three").Vector2 | import("three").Material | import("three").Matrix4 | import("three").Quaternion | import("three").Euler | ((callback: (object: import("three").Object3D<import("three").Event>) => any) => void) | import("three").Matrix3 | import("three").Layers | import("three").AnimationClip[] | {
-        [key: string]: any;
-    } | ((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) => 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) => 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) | {
+    get(prop: keyof SpriteText): string | number | boolean | Vector3 | import("three").Object3D<import("three").Object3DEventMap> | import("three").BufferGeometry<import("three").NormalBufferAttributes> | ((force?: boolean) => void) | import("three").Object3D<import("three").Object3DEventMap>[] | HTMLCanvasElement | import("three").Vector2 | import("three").Material | Record<string, any> | import("three").Matrix4 | import("three").Quaternion | (<T extends keyof import("three").Object3DEventMap>(event: import("three").BaseEvent<T> & import("three").Object3DEventMap[T]) => void) | import("three").Euler | ((callback: (object: import("three").Object3D<import("three").Object3DEventMap>) => any) => void) | import("three").Matrix3 | import("three").Layers | import("three").AnimationClip[] | ((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").Event>) | ((name: string) => import("three").Object3D<import("three").Event>) | ((name: string, value: any) => import("three").Object3D<import("three").Event>) | ((name: string, value: any) => import("three").Object3D<import("three").Event>[]) | ((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").Event>>[]) => void) | ((callback: (object: import("three").Object3D<import("three").Event>) => any) => void) | ((callback: (object: import("three").Object3D<import("three").Event>) => any) => void) | (() => void) | ((updateParents: boolean, updateChildren: boolean) => void) | ((meta?: {
+    } | ((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) | 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").Event>[]) => SpriteText) | ((...object: import("three").Object3D<import("three").Event>[]) => SpriteText) | (() => SpriteText) | (() => SpriteText) | ((object: import("three").Object3D<import("three").Event>) => SpriteText) | ((recursive?: boolean) => SpriteText) | (<T extends string>(type: T, listener: import("three").EventListener<import("three").Event, T, SpriteText>) => void) | (<T_1 extends string>(type: T_1, listener: import("three").EventListener<import("three").Event, T_1, SpriteText>) => boolean) | (<T_2 extends string>(type: T_2, listener: import("three").EventListener<import("three").Event, T_2, SpriteText>) => void);
+    }) => any) | 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) | {
+        <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;
+    } | {
+        <T_3 extends keyof import("three").Object3DEventMap>(type: T_3, listener: import("three").EventListener<import("three").Object3DEventMap[T_3], T_3, SpriteText>): boolean;
+        <T_4 extends string>(type: T_4, listener: import("three").EventListener<{}, T_4, SpriteText>): boolean;
+    } | {
+        <T_5 extends keyof import("three").Object3DEventMap>(type: T_5, listener: import("three").EventListener<import("three").Object3DEventMap[T_5], T_5, SpriteText>): void;
+        <T_6 extends string>(type: T_6, listener: import("three").EventListener<{}, T_6, SpriteText>): void;
+    };
 }
 export {};

package/PlaneWithHtml.ts

@@ -78,7 +78,7 @@ export default class PlaneWithHtml extends Mesh {
 
         });
 
-        this.dispatchEvent({ type: "loaded" });
+        this.dispatchEvent({ type: "loaded" } as never);
     }
 
 

package/SpriteModal1/SpriteModal1.d.ts

@@ -1,4 +1,4 @@
-import { Sprite, CanvasTexture, Raycaster, Intersection } from "three";
+import { Sprite, Raycaster, Intersection } from "three";
 export type SpritModal1Config = {
     size?: number;
     title?: string;
@@ -14,7 +14,7 @@ export default class SpritModal1 extends Sprite {
     static img: HTMLImageElement;
     canvas: HTMLCanvasElement;
     context: CanvasRenderingContext2D;
-    texture: CanvasTexture | import("three").Texture;
+    texture: import("three").Texture;
     _config: {
         size: number;
         title: string;

package/SpriteModal1/SpriteModal1.ts

@@ -141,7 +141,7 @@ export default class SpritModal1 extends Sprite {
 
         this.texture.needsUpdate = true;
 
-        this.dispatchEvent({ type: "loaded" });
+        this.dispatchEvent({ type: "loaded" } as never);
     }
 
     //鼠标拾取计算

package/SpriteWithHtml.ts

@@ -55,7 +55,7 @@ export default class SpriteWithHtml extends Sprite {
 
         });
 
-        this.dispatchEvent({ type: "loaded" });
+        this.dispatchEvent({ type: "loaded" } as never);
     }
 
 

package/Text3D/Text3D.ts

@@ -81,7 +81,7 @@ export default class Text3D extends Mesh {
                         bevelSegments: this._config.bevelSegments,//斜角分段
                     });
                     this.geometry.center();
-                    this.dispatchEvent({ type: "loaded" });
+                    this.dispatchEvent({ type: "loaded" } as never);
                 }
             })
 

package/ThreeBase.ts

@@ -373,7 +373,7 @@ export default class ThreeBase extends EventDispatcher {
         }
 
         // 渲染场景
-        this.dispatchEvent({ type: "beforeRender" });
+        this.dispatchEvent({ type: "beforeRender" } as never);
 
         // this.renderer.setRenderTarget(this.baseRenderTarget);
         this.renderer.clear();
@@ -395,7 +395,7 @@ export default class ThreeBase extends EventDispatcher {
             glow_pass(this.renderer, this.camera, obj, this.baseDepthTexture);
         });
 
-        this.dispatchEvent({ type: "afterRender" });
+        this.dispatchEvent({ type: "afterRender" } as never);
     }
 
     private renderBindThis = this.render.bind(this);

package/ThreeMouse.ts

@@ -168,7 +168,7 @@ export default class ThreeMouse {
             if (this._mesh_on === MouseEvent.object) {
                 if (this.hasEvent(MouseEvent.object, ["mousemove"])) {
                     MouseEvent.type = "mousemove";
-                    MouseEvent.object.dispatchEvent(MouseEvent);
+                    MouseEvent.object.dispatchEvent(MouseEvent as never);
                 }
 
                 // 鼠标划入滑出事件
@@ -176,12 +176,12 @@ export default class ThreeMouse {
 
                 if (this.hasEvent(this._mesh_on, ["mouseleave"])) {
                     MouseEvent.type = "mouseleave";
-                    this._mesh_on!.dispatchEvent(MouseEvent);
+                    this._mesh_on!.dispatchEvent(MouseEvent as never);
                 }
 
                 if (this.hasEvent(MouseEvent.object, ["mouseenter"])) {
                     MouseEvent.type = "mouseenter";
-                    MouseEvent.object.dispatchEvent(MouseEvent);
+                    MouseEvent.object.dispatchEvent(MouseEvent as never);
                 }
 
             }
@@ -208,7 +208,7 @@ export default class ThreeMouse {
                     offsetY: this._mousemoveEvent.offsetY,
                     x: this._mousemoveEvent.x,
                     y: this._mousemoveEvent.y
-                });
+                } as never);
             }
 
 
@@ -235,7 +235,7 @@ export default class ThreeMouse {
                 offsetY: this._mousemoveEvent.offsetY,
                 x: this._mousemoveEvent.x,
                 y: this._mousemoveEvent.y
-            });
+            } as never);
         }
 
         // 置空当前鼠标上面的对象
@@ -292,7 +292,7 @@ export default class ThreeMouse {
                 offsetY: this._mousemoveEvent.offsetY,
                 x: this._mousemoveEvent.x,
                 y: this._mousemoveEvent.y
-            });
+            } as never);
 
         }
 
@@ -324,7 +324,7 @@ export default class ThreeMouse {
                 offsetY: this._mousemoveEvent.offsetY,
                 x: this._mousemoveEvent.x,
                 y: this._mousemoveEvent.y
-            });
+            } as never);
         }
 
         // 触发鼠标弹起事件
@@ -356,7 +356,7 @@ export default class ThreeMouse {
                             offsetY: this._mousemoveEvent.offsetY,
                             x: this._mousemoveEvent.x,
                             y: this._mousemoveEvent.y
-                        });
+                        } as never);
                     }
 
                     if (this.hasEvent(this._mesh_Down, ["leftclick"]) && (e.button === 0)) {
@@ -370,7 +370,7 @@ export default class ThreeMouse {
                             offsetY: this._mousemoveEvent.offsetY,
                             x: this._mousemoveEvent.x,
                             y: this._mousemoveEvent.y
-                        });
+                        } as never);
                     }
 
                     if (this.hasEvent(this._mesh_Down, ["rightclick"]) && (e.button === 2)) {
@@ -384,7 +384,7 @@ export default class ThreeMouse {
                             offsetY: this._mousemoveEvent.offsetY,
                             x: this._mousemoveEvent.x,
                             y: this._mousemoveEvent.y
-                        });
+                        } as never);
                     }
 
                 } else if (this._click_num > 1) {
@@ -401,7 +401,7 @@ export default class ThreeMouse {
                             offsetY: this._mousemoveEvent.offsetY,
                             x: this._mousemoveEvent.x,
                             y: this._mousemoveEvent.y
-                        });
+                        } as never);
 
                     }
 
@@ -420,7 +420,7 @@ export default class ThreeMouse {
                         offsetY: this._mousemoveEvent.offsetY,
                         x: this._mousemoveEvent.x,
                         y: this._mousemoveEvent.y
-                    });
+                    } as never);
                 }
 
                 if (this.hasEvent(this._mesh_Down, ["leftclick"]) && (e.button === 0)) {
@@ -434,7 +434,7 @@ export default class ThreeMouse {
                         offsetY: this._mousemoveEvent.offsetY,
                         x: this._mousemoveEvent.x,
                         y: this._mousemoveEvent.y
-                    });
+                    } as never);
                 }
 
                 if (this.hasEvent(this._mesh_Down, ["rightclick"]) && (e.button === 2)) {
@@ -448,7 +448,7 @@ export default class ThreeMouse {
                         offsetY: this._mousemoveEvent.offsetY,
                         x: this._mousemoveEvent.x,
                         y: this._mousemoveEvent.y
-                    });
+                    } as never);
                 }
 
             }

package/keyContorls.d.ts

@@ -1,4 +1,4 @@
-import { Event, EventDispatcher, EventListener, Vector3 } from "three";
+import { EventDispatcher, EventListener, Vector3 } from "three";
 /**
  * 键盘 使用 ↑↓←→ 控制 x z 方向, 小键盘 1 0 控制 y 方向
  *
@@ -17,7 +17,7 @@ declare class KeyContorls extends EventDispatcher {
         [key: string]: Array<any>;
     };
     removeEvent: import("lodash").DebouncedFunc<(type: string) => void>;
-    addEventListener<T extends string>(type: T, listener: EventListener<Event, T, this>): void;
+    addEventListener<T extends string>(type: T, listener: EventListener<{}, T, this>): void;
     addEvent(): void;
     dispose(): void;
 }

package/keyContorls.ts

@@ -29,17 +29,17 @@ class KeyContorls extends EventDispatcher {
 
     // 添加事件需要由外部实现
     add(e: any) {
-        this.dispatchEvent({ ...e, type: "add" });
+        this.dispatchEvent({ ...e, type: "add" } as never);
     }
 
     // 删除事件
     delete(e: any) {
-        this.dispatchEvent({ ...e, type: "delete" });
+        this.dispatchEvent({ ...e, type: "delete" } as never);
     }
 
     // 回车按钮
     enter(e: any) {
-        this.dispatchEvent({ ...e, type: "enter" });
+        this.dispatchEvent({ ...e, type: "enter" } as never);
     }
 
     keyDown = (e: any) => {
@@ -96,7 +96,7 @@ class KeyContorls extends EventDispatcher {
         this.dispatchEvent({
             type: "change",
             direction: this.direction
-        });
+        } as never);
 
     }
 
@@ -107,7 +107,7 @@ class KeyContorls extends EventDispatcher {
         this._listeners = undefined;
     }, 1000, { trailing: false });
 
-    addEventListener<T extends string>(type: T, listener: EventListener<Event, T, this>): void {
+    addEventListener<T extends string>(type: T, listener: EventListener<{}, T, this>): void {
         this.removeEvent(type);
         super.addEventListener(type, listener);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "three-base",
-    "version": "2.0.20",
+    "version": "2.0.21",
     "description": "three 3d three-base",
     "publishConfig": {
         "registry": "https://registry.npmjs.org/"
@@ -38,9 +38,10 @@
     "dependencies": {
         "apng-js": "^1",
         "lodash": "^4",
-        "three": "^0.154.0",
+        "@types/three": "^0.159.0",
+        "three": "^0.159.0",
         "dexie": "^3",
         "vite": "*",
         "html2canvas": "^1.4.1"
     }
-}
+}

package/pass/FullScreenQuad.d.ts

@@ -1,7 +1,7 @@
 import { BufferGeometry, Material, Mesh, OrthographicCamera, Scene, WebGLRenderer } from "three";
 export default class FullScreenQuad extends Scene {
     constructor();
-    mesh: Mesh<BufferGeometry<import("three").NormalBufferAttributes>, Material>;
+    mesh: Mesh<BufferGeometry<import("three").NormalBufferAttributes>, Material, import("three").Object3DEventMap>;
     orthographicCamera: OrthographicCamera;
     render(renderer: WebGLRenderer, material: Material): void;
 }

package/threeLoader.d.ts

@@ -1,4 +1,4 @@
-import { CanvasTexture, EventDispatcher, Texture, TextureLoader } from "three";
+import { EventDispatcher, Texture, TextureLoader } from "three";
 import { FBXLoader } from "three/examples/jsm/loaders/FBXLoader";
 import { GLTFLoader } from "three/examples/jsm/loaders/GLTFLoader";
 import { MTLLoader } from "three/examples/jsm/loaders/MTLLoader";
@@ -10,7 +10,7 @@ declare class ThreeLoader extends EventDispatcher {
     setAnisotropy(v: number): void;
     textureMap: Map<string, Texture>;
     textureLoader: TextureLoader;
-    getTexture(src: string | HTMLCanvasElement): CanvasTexture | Texture;
+    getTexture(src: string | HTMLCanvasElement): Texture;
     fbxLoader: FBXLoader;
     objLoader: OBJLoader;
     stlLoader: STLLoader;

package/threeLoader.ts

@@ -33,7 +33,7 @@ class ThreeLoader extends EventDispatcher {
 
         // 有资源加载完成时通知渲染器
         DefaultLoadingManager.onProgress = () => {
-            this.dispatchEvent({ type: "progress" });
+            this.dispatchEvent({ type: "progress" } as never);
         }
 
         DefaultLoadingManager.onLoad = () => {

package/threeUtils.ts

@@ -37,7 +37,7 @@ class ThreeUtils extends EventDispatcher {
             type: "requestAnimationFrame",
             timeTemp,
             accumulate: this._accumulate
-        });
+        } as never);
 
         this._computerDomZoom();