three-base 2.0.100 → 2.0.102

package/InstancedMeshBase.d.ts

@@ -1,4 +1,4 @@
-import { Color, Euler, InstancedBufferAttribute, InstancedMesh, Matrix4, Mesh, Quaternion, Vector3 } from "three";
+import { Color, Euler, InstancedBufferAttribute, InstancedMesh, Matrix4, Mesh, Object3D, Quaternion, Vector3 } from "three";
 import MeshBase from "./MeshBase";
 export default class InstancedMeshBase extends MeshBase {
     constructor(url?: string);
@@ -16,6 +16,7 @@ export default class InstancedMeshBase extends MeshBase {
     static _matrix: Matrix4;
     instanceMatrix: InstancedBufferAttribute;
     instanceColor: InstancedBufferAttribute;
+    reset(...object: Object3D[]): this;
     loadModel(url: string | File | Array<File>, filename?: string): Promise<void>;
     computeBoundingSphere: import("lodash").DebouncedFunc<() => void>;
     setCount(count?: number): Promise<void>;

package/InstancedMeshBase.js

@@ -27,6 +27,12 @@ export default class InstancedMeshBase extends MeshBase {
     static _matrix = new Matrix4();
     instanceMatrix = new InstancedBufferAttribute(new Float32Array(0 * 16), 16);
     instanceColor = new InstancedBufferAttribute(new Float32Array(0 * 3), 3);
+    // 重置子元素
+    reset(...object) {
+        super.clear();
+        super.add(...object);
+        return this;
+    }
     // 重构加载模型的方法
     async loadModel(url, filename = "") {
         //获取模型文件的地址
@@ -59,7 +65,6 @@ export default class InstancedMeshBase extends MeshBase {
         })();
         this.url = modelurl || "";
         if (!url) {
-            this.clear();
             return;
         }
         this.loaded = false;
@@ -77,7 +82,6 @@ export default class InstancedMeshBase extends MeshBase {
             await new Promise((resolve) => setTimeout(resolve, 50));
         } while (MeshBase.loadModeling.get(this.url));
         if (MeshBase.models.get(this.url)) {
-            this.clear();
             const mesh = MeshBase.models.get(this.url);
             // // 判断是否有动画
             // this.hasAnimation = mesh.animations.length > 0;
@@ -119,6 +123,7 @@ export default class InstancedMeshBase extends MeshBase {
                     obj.rotation.set(0, 0, 0);
                 }
             });
+            this.clear();
             // create all instances
             Object.keys(meshCollect).forEach((uuid) => {
                 const meshes = meshCollect[uuid];

package/MeshBase.d.ts

@@ -11,6 +11,7 @@ export default class MeshBase extends Group {
         [key: string]: AnimationAction;
     };
     getSuffix(filename: string): string;
+    reset(...object: Object3D[]): this;
     loadModel(url: string | File | Array<File>, filename?: string): Promise<void>;
     frustumCulled: boolean;
     castShadow: boolean;

package/MeshBase.js

@@ -27,6 +27,12 @@ export default class MeshBase extends Group {
         const match = filename.match(/\.([^\.]+)$/);
         return match ? match[1].toLowerCase() : "";
     }
+    // 重置子元素
+    reset(...object) {
+        super.clear();
+        super.add(...object);
+        return this;
+    }
     // 如果url 是blob地址的话,就用suffix字段来制定模型的类型
     async loadModel(url, filename = "") {
         //获取模型文件的地址
@@ -59,7 +65,6 @@ export default class MeshBase extends Group {
         })();
         this.url = modelurl || "";
         if (!modelurl) {
-            this.clear();
             return;
         }
         this.loaded = false;
@@ -77,7 +82,6 @@ export default class MeshBase extends Group {
             await new Promise((resolve) => setTimeout(resolve, 50));
         } while (MeshBase.loadModeling.get(modelurl));
         if (MeshBase.models.get(modelurl)) {
-            this.clear();
             const mesh = MeshBase.models.get(modelurl);
             // 判断是否有动画
             this.hasAnimation = mesh.animations.length > 0;
@@ -90,10 +94,10 @@ export default class MeshBase extends Group {
                     animationAction.weight = 0;
                     this.animationActions[animation.name] = animationAction;
                 });
-                this.add(model);
+                this.reset(model);
             }
             else {
-                this.add(mesh.clone(true));
+                this.reset(mesh.clone(true));
             }
         }
         await new Promise((resolve) => requestAnimationFrame(resolve));

package/ThreeBase.js

@@ -539,7 +539,6 @@ export default class ThreeBase extends EventDispatcher {
     async download(fileName = "download") {
         this.render();
         const blob = await this.getThumbBlob();
-        const base64 = this.renderer.domElement.toDataURL("image/png");
         let saveLink = document.createElement("a");
         saveLink.download = `${fileName}.png`;
         saveLink.href = URL.createObjectURL(blob);

package/Transition.d.ts

@@ -30,7 +30,7 @@ export default class Transition<T extends TransitionParame, K extends Extract<ke
     onChange(onChangeCall: (josn: T) => void): this;
     onDone(onDoneCall: (josn: T) => void): this;
     get(key: Extract<keyof T, string>): T[K];
-    set(param: T): Promise<this>;
+    set(param: Partial<T>): Promise<this>;
     reset(param: Partial<T>): this;
     getKeys(): Array<Extract<keyof T, string>>;
     hasKey(key: Extract<keyof T, string>): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "three-base",
-  "version": "2.0.100",
+  "version": "2.0.102",
   "description": "three 3d three-base",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"

package/threeLoader.d.ts

@@ -7,6 +7,7 @@ import { STLLoader } from "three/examples/jsm/loaders/STLLoader";
 import { USDZLoader } from "three/examples/jsm/loaders/USDZLoader";
 declare class ThreeLoader extends EventDispatcher {
     constructor();
+    getFilename(url: string): string;
     uuid: string;
     anisotropy: number;
     setAnisotropy(v: number): void;

package/threeLoader.js

@@ -49,18 +49,30 @@ class ThreeLoader extends EventDispatcher {
         };
         // 资源替换
         DefaultLoadingManager.setURLModifier((url) => {
+            //全路径匹配资源
+            if (this._blobs[url]) {
+                return this._blobs[url];
+            }
             const filename = url
                 .replace(`blob:${location.origin}/`, "")
                 .replace(/^\.\//, "");
             let new_url = this._blobs[filename] || url;
             //如果全匹配没有匹配到资源,就尝试文件名匹配
             if (!this._blobs[filename]) {
-                const blobKey = Object.keys(this._blobs).find((key) => new RegExp(`${key}$`).test(filename)) || "";
+                const blobKey = Object.keys(this._blobs).find((key) => this.getFilename(key) === this.getFilename(filename)) || "";
                 new_url = this._blobs[blobKey] || url;
             }
             return new_url;
         });
     }
+    // 从url 中提取文件名
+    getFilename(url) {
+        // 移除URL的查询字符串和哈希部分
+        const path = url.split("?")[0].split("#")[0];
+        // 使用lastIndexOf和substring从路径中提取文件名
+        const filename = path.substring(path.lastIndexOf("/") + 1);
+        return filename;
+    }
     uuid = generateUUID();
     // 各向异性
     anisotropy = 16;