three-base 2.0.2 → 2.0.4

package/README.md

@@ -1,7 +1,7 @@
 ```tsx
 .创建一个 homeRender.ts 模块
 import { AmbientLight, BoxGeometry, Mesh, MeshLambertMaterial, PointLight } from "three";
-import ThreeBase, { Transition } from "three-base";
+import ThreeBase from "three-base";
 import Transition from "three-base/Transition";
 
 // 做项目找我 qq:389652405

package/ThreeBase.d.ts

@@ -1,4 +1,4 @@
-import { BufferGeometry, Camera, EventDispatcher, Object3D, Scene, Texture, Vector2, Vector3, WebGLRenderer, WebGLRenderTarget } from "three";
+import { AxesHelper, BufferGeometry, Camera, EventDispatcher, GridHelper, Object3D, Scene, Texture, Vector2, Vector3, WebGLRenderer, WebGLRenderTarget } from "three";
 import { OrbitControls } from "three/examples/jsm/controls/OrbitControls.js";
 import ThreeMouse from "./ThreeMouse";
 import Transition from "./Transition";
@@ -19,8 +19,8 @@ export default class ThreeBase extends EventDispatcher {
     setSize(width: number, height: number): void;
     controlsPosition: Transition;
     controlsCenter: Transition;
-    gridHelper: void;
-    axesHelper: void;
+    gridHelper: GridHelper;
+    axesHelper: AxesHelper;
     init(): void;
     resetLookAt({ position, center, }: {
         position?: Vector3;

package/ThreeBase.js

@@ -130,12 +130,14 @@ export default class ThreeBase extends EventDispatcher {
         const gridHelper = new GridHelper(1000, 100, 0x303030, 0x303030);
         gridHelper.visible = threeUtils.isDev;
         this.scene.add(gridHelper);
+        return gridHelper;
     })();
     //坐标轴线
     axesHelper = (() => {
         const axesHelper = new AxesHelper(10000);
         axesHelper.visible = threeUtils.isDev;
         this.scene.add(axesHelper);
+        return axesHelper;
     })();
     init() {
         // 资源加载进度有更新时, 需要渲染

package/ThreeBase.ts

@@ -154,6 +154,7 @@ export default class ThreeBase extends EventDispatcher {
         const gridHelper = new GridHelper(1000, 100, 0x303030, 0x303030);
         gridHelper.visible = threeUtils.isDev;
         this.scene.add(gridHelper);
+        return gridHelper;
     })();
 
     //坐标轴线
@@ -161,6 +162,7 @@ export default class ThreeBase extends EventDispatcher {
         const axesHelper = new AxesHelper(10000);
         axesHelper.visible = threeUtils.isDev;
         this.scene.add(axesHelper);
+        return axesHelper;
     })();
 
     init() {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "three-base",
-    "version": "2.0.2",
+    "version": "2.0.4",
     "description": "three 3d three-base",
     "repository": {
         "type": "git",

package/threeUtils.d.ts

@@ -35,7 +35,7 @@ declare class ThreeUtils extends EventDispatcher {
     alignBottom(object3d: Object3D | BufferGeometry, y?: number): void;
     centerObject3D(object3d: Object3D | BufferGeometry): void;
     center(object3d: Object3D | BufferGeometry): void;
-    scaleTo(object3d: Object3D | BufferGeometry, size?: number, key?: Partial<["x", "y", "z"]>): void;
+    scaleTo(object3d: Object3D | BufferGeometry, size?: number, key?: Array<"x" | "y" | "z">): void;
     exportGLB(input: Object3D): void;
     getVolume(geometry: BufferGeometry): number;
     signedVolumeOfTriangle(p1: Vector3, p2: Vector3, p3: Vector3): number;

package/threeUtils.ts

@@ -188,9 +188,9 @@ class ThreeUtils extends EventDispatcher {
     }
 
     // 使用指定的纬度计算, 缩放至指定大小
-    scaleTo(object3d: Object3D | BufferGeometry, size: number = 1, key: Partial<["x", "y", "z"]> = ["x", "y", "z"]) {
+    scaleTo(object3d: Object3D | BufferGeometry, size: number = 1, key: Array<"x" | "y" | "z"> = ["x", "y", "z"]) {
         const originSize = this.getSize(object3d);
-        const scale = size / Math.max(...key.map(k => originSize[k as "x" | "y" | "z"]));
+        const scale = size / Math.max(...key.map(k => originSize[k]));
 
         if (object3d instanceof Object3D) {
             object3d.scale.multiplyScalar(scale);