three-base 2.0.99 → 2.0.101

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

@@ -5,7 +5,7 @@
  * @Last Modified time: 2024-09-23 21:20:32
  */
 import { round } from "lodash";
-import { AxesHelper, Box3, DepthFormat, DepthTexture, EventDispatcher, GridHelper, LinearFilter, MOUSE, Mesh, NoBlending, NormalBlending, OrthographicCamera, PerspectiveCamera, RGBAFormat, Scene, TOUCH, UnsignedShortType, Vector2, Vector3, WebGLRenderTarget, WebGLRenderer, } from "three";
+import { AxesHelper, Box3, DepthFormat, DepthTexture, EventDispatcher, GridHelper, LinearFilter, MOUSE, Mesh, NoBlending, NormalBlending, OrthographicCamera, PerspectiveCamera, RGBAFormat, SRGBColorSpace, Scene, TOUCH, 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";
@@ -99,6 +99,7 @@ export default class ThreeBase extends EventDispatcher {
         renderer.setPixelRatio(window.devicePixelRatio);
         renderer.autoClear = false;
         renderer.clear();
+        renderer.outputColorSpace = SRGBColorSpace;
         threeLoader.setAnisotropy(renderer.capabilities.getMaxAnisotropy());
         return renderer;
     })();
@@ -271,7 +272,7 @@ export default class ThreeBase extends EventDispatcher {
         return axesHelper;
     })();
     //TODO 设置帧频率 默认50帧
-    frame = 50;
+    frame = 30;
     init() { }
     // 重置控制器的位置
     resetLookAt({ position = this.perspectiveCamera.position, center = this.controls.target, }) {
@@ -360,7 +361,7 @@ export default class ThreeBase extends EventDispatcher {
     lookatObjects({ objects, duration = 1000, direction = new Vector3(0.3, 0.3, 1), offset = new Vector3(0, 0, 0), distance = 1, }) {
         const box3 = new Box3();
         objects.map((o) => {
-            o.traverse((oo) => {
+            o.traverseVisible((oo) => {
                 box3.expandByObject(oo);
             });
         });

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.99",
+  "version": "2.0.101",
   "description": "three 3d three-base",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"

package/threeLoader.js

@@ -4,7 +4,7 @@
  * @Last Modified by: xiaosihan
  * @Last Modified time: 2024-09-11 11:43:31
  */
-import { CanvasTexture, DefaultLoadingManager, EventDispatcher, Mesh, MeshStandardMaterial, RepeatWrapping, TextureLoader, VideoTexture, } from "three";
+import { CanvasTexture, DefaultLoadingManager, EventDispatcher, Mesh, MeshStandardMaterial, RepeatWrapping, SRGBColorSpace, TextureLoader, VideoTexture, } from "three";
 import { DRACOLoader } from "three/examples/jsm/loaders/DRACOLoader";
 import { FBXLoader } from "three/examples/jsm/loaders/FBXLoader";
 import { GLTFLoader } from "three/examples/jsm/loaders/GLTFLoader";
@@ -26,6 +26,8 @@ import { isArray, isEmpty, isNull, isString, isUndefined } from "lodash";
 import { generateUUID } from "three/src/math/MathUtils";
 import dracoDecoderWASM from "./lib/draco/draco_decoder.wasm?url";
 import threeUtils from "./threeUtils";
+import { TGALoader } from "three/examples/jsm/Addons.js";
+DefaultLoadingManager.addHandler(/tga$/, new TGALoader());
 // 加载器
 class ThreeLoader extends EventDispatcher {
     constructor() {
@@ -76,7 +78,7 @@ class ThreeLoader extends EventDispatcher {
             const canvasTexture = new CanvasTexture(src);
             canvasTexture.wrapS = canvasTexture.wrapT = RepeatWrapping;
             canvasTexture.anisotropy = this.anisotropy;
-            // canvasTexture.colorSpace = SRGBColorSpace;
+            canvasTexture.colorSpace = SRGBColorSpace;
             return canvasTexture;
         }
         let texture = this.textureMap.get(src);
@@ -110,7 +112,7 @@ class ThreeLoader extends EventDispatcher {
         }
         texture.wrapS = texture.wrapT = RepeatWrapping;
         texture.anisotropy = this.anisotropy;
-        // texture.colorSpace = SRGBColorSpace;
+        texture.colorSpace = SRGBColorSpace;
         return texture;
     }
     // 资源列表
@@ -344,6 +346,11 @@ class ThreeLoader extends EventDispatcher {
                     if (stl) {
                         return await this.loadModel(stl);
                     }
+                    //如果有zip文件就加载zip文件
+                    let zipFile = Object.keys(zip.files).find((filename) => /\.stl$/.test(filename));
+                    if (zipFile) {
+                        return await this.loadModel(zipFile);
+                    }
                     if ([obj, gltf, dae, fbx, usdz, stl].every((v) => !v)) {
                         throw new Error(`${url}压缩包里没有obj.glb.gltf.dae.fbx.usde.stl等模型文件`);
                     }