three-base 2.0.101 → 2.0.104

package/ThreeBase.js

@@ -104,9 +104,9 @@ export default class ThreeBase extends EventDispatcher {
         return renderer;
     })();
     //透视相机
-    perspectiveCamera = new PerspectiveCamera(45, 1, 0.01, 10000);
+    perspectiveCamera = new PerspectiveCamera(45, 1, 0.01, 20000);
     //正交相机
-    orthographicCamera = new OrthographicCamera(-1, 1, 1, -1, 0.01, 10000);
+    orthographicCamera = new OrthographicCamera(-1, 1, 1, -1, 0.01, 20000);
     //相机的类型 有透视相机和正交相机
     cameraType = "perspectiveCamera";
     setCameraType(cameraType) {
@@ -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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "three-base",
-  "version": "2.0.101",
+  "version": "2.0.104",
   "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;