three-base 2.0.125 → 2.0.127

package/InstancedMeshBase.d.ts

@@ -26,7 +26,13 @@ export default class InstancedMeshBase extends MeshBase {
         rotation?: Euler;
         scale?: Vector3;
     }): Promise<void>;
+    getTRS(index?: number): Promise<{
+        positon: Vector3;
+        rotation: Euler;
+        scale: Vector3;
+    }>;
     setColorAt(index: number, color: (instancedMesh: InstancedMesh) => Color | undefined): Promise<void>;
+    getColorAt(index?: number): Promise<Color>;
     updateMatrixWorld(force?: boolean): void;
     addEventListener(name: string, callback: (e: any) => void): Promise<void>;
     removeEventListener(name: string, callback: (e: any) => void): void;

package/InstancedMeshBase.js

@@ -4,8 +4,8 @@
  * @Last Modified by: xiaosihan
  * @Last Modified time: 2024-06-07 22:14:53
  */
-import { isString, throttle } from "lodash";
-import { Euler, InstancedBufferAttribute, InstancedMesh, Matrix4, Quaternion, Vector3, } from "three";
+import { first, isString, throttle } from "lodash";
+import { Color, Euler, InstancedBufferAttribute, InstancedMesh, Matrix4, Quaternion, Vector3, } from "three";
 import MeshBase from "./MeshBase";
 import threeUtils from "./threeUtils";
 import threeLoader from "./threeLoader";
@@ -225,6 +225,21 @@ export default class InstancedMeshBase extends MeshBase {
         });
         this.computeBoundingSphere();
     }
+    //获取指定位置的移动旋转缩放
+    async getTRS(index = 0) {
+        await this.awaitLoaded();
+        const positon = new Vector3();
+        const rotation = new Euler();
+        const scale = new Vector3();
+        const uuid = first(Object.keys(this.instanceCollect));
+        const instancedMesh = this.instanceCollect[uuid];
+        if (instancedMesh) {
+            instancedMesh.getMatrixAt(index, InstancedMeshBase._matrix);
+            InstancedMeshBase._matrix.decompose(positon, InstancedMeshBase._Quaternion, scale);
+            rotation.setFromQuaternion(InstancedMeshBase._Quaternion);
+        }
+        return { positon, rotation, scale };
+    }
     // 设置颜色
     async setColorAt(index, color) {
         await this.awaitLoaded();
@@ -240,6 +255,17 @@ export default class InstancedMeshBase extends MeshBase {
             });
         });
     }
+    // 获取颜色
+    async getColorAt(index = 0) {
+        await this.awaitLoaded();
+        const color = new Color();
+        const uuid = first(Object.keys(this.instanceCollect));
+        const instancedMesh = this.instanceCollect[uuid];
+        if (instancedMesh) {
+            instancedMesh.getColorAt(index, color);
+        }
+        return color;
+    }
     // 同步属性
     updateMatrixWorld(force) {
         super.updateMatrixWorld(force);

package/ThreeBase.d.ts

@@ -4,7 +4,7 @@ import ThreeMouse from "./ThreeMouse";
 import Transition from "./Transition";
 export default class ThreeBase extends EventDispatcher {
     constructor();
-    devicePixelRatio: number;
+    minDevicePixelRatio: number;
     baseDepthTexture: DepthTexture;
     baseRenderTarget: WebGLRenderTarget<Texture>;
     renderTarget: WebGLRenderTarget<Texture>;

package/ThreeBase.js

@@ -38,8 +38,8 @@ export default class ThreeBase extends EventDispatcher {
         });
         this.init();
     }
-    // 设置分辨率
-    devicePixelRatio = Math.max(window.devicePixelRatio, 2);
+    // 设置最小分辨率
+    minDevicePixelRatio = 1;
     // 基础深度纹理
     baseDepthTexture = (() => {
         const baseDepthTexture = new DepthTexture(4096, 4096);
@@ -101,8 +101,8 @@ export default class ThreeBase extends EventDispatcher {
             this.rendererLost = false;
         }, false);
         renderer.localClippingEnabled = true;
-        renderer.setPixelRatio(this.devicePixelRatio);
-        renderer.autoClear = false;
+        renderer.setPixelRatio(Math.max(window.devicePixelRatio, this.minDevicePixelRatio)),
+            renderer.autoClear = false;
         renderer.clear();
         renderer.outputColorSpace = SRGBColorSpace;
         // 缓解过暗或者过亮
@@ -194,14 +194,14 @@ export default class ThreeBase extends EventDispatcher {
         // this.orthographicCamera.bottom = -height / width;
         this.orthographicCamera.left = -width / height;
         this.orthographicCamera.right = width / height;
-        this.renderer.setPixelRatio(this.devicePixelRatio);
-        this.renderer.setSize(width, height);
+        this.renderer.setPixelRatio(Math.max(window.devicePixelRatio, this.minDevicePixelRatio)),
+            this.renderer.setSize(width, height);
         // 设置帧缓存区的尺寸
-        this.baseRenderTarget.setSize(width * this.devicePixelRatio, height * this.devicePixelRatio);
+        this.baseRenderTarget.setSize(width * Math.max(window.devicePixelRatio, this.minDevicePixelRatio), height * Math.max(window.devicePixelRatio, this.minDevicePixelRatio));
         // 设置深度纹理的尺寸
-        this.baseDepthTexture.image.width = width * this.devicePixelRatio;
-        this.baseDepthTexture.image.height = height * this.devicePixelRatio;
-        this.size.set(width, height);
+        this.baseDepthTexture.image.width = width * Math.max(window.devicePixelRatio, this.minDevicePixelRatio),
+            this.baseDepthTexture.image.height = height * Math.max(window.devicePixelRatio, this.minDevicePixelRatio),
+            this.size.set(width, height);
         setTimeout(() => {
             this.needRender = true;
         }, 100);
@@ -489,15 +489,15 @@ export default class ThreeBase extends EventDispatcher {
         this.renderer.render(this.scene, camera);
         // 后处理特效渲染(描边,发光,颜色覆盖,bloom,磨砂玻璃)
         this.scene.traverseVisible((obj) => {
-            stroke_pass(this.renderer, camera, obj, this.baseDepthTexture, this.devicePixelRatio);
-            glow_pass(this.renderer, camera, obj, this.baseDepthTexture, this.devicePixelRatio);
-            bloom_pass(this.renderer, camera, obj, this.baseRenderTarget, this.baseDepthTexture, this.devicePixelRatio);
+            stroke_pass(this.renderer, camera, obj, this.baseDepthTexture, Math.max(window.devicePixelRatio, this.minDevicePixelRatio));
+            glow_pass(this.renderer, camera, obj, this.baseDepthTexture, Math.max(window.devicePixelRatio, this.minDevicePixelRatio));
+            bloom_pass(this.renderer, camera, obj, this.baseRenderTarget, this.baseDepthTexture, Math.max(window.devicePixelRatio, this.minDevicePixelRatio));
         });
         this.renderer.setRenderTarget(null);
         this.renderer.clear();
         this.renderRendererTarget(this.baseRenderTarget);
         this.scene.traverseVisible((obj) => {
-            cover_pass(this.renderer, camera, obj, this.baseDepthTexture, this.devicePixelRatio);
+            cover_pass(this.renderer, camera, obj, this.baseDepthTexture, Math.max(window.devicePixelRatio, this.minDevicePixelRatio));
         });
         this.dispatchEvent({ type: "afterRender" });
     }

package/package.json

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