three-base 1.0.87 → 1.0.88

package/lib/ThreeBase.d.ts

@@ -19,6 +19,8 @@ export default class ThreeBase extends EventDispatcher {
     setsize(width: number, height: number): void;
     controlsPosition: Transition;
     controlsCenter: Transition;
+    gridHelper: void;
+    axesHelper: void;
     init(): void;
     resetLookAt({ position, center, }: {
         position?: Vector3;

package/lib/ThreeBase.js

@@ -122,15 +122,19 @@ export default class ThreeBase extends EventDispatcher {
         });
         return controlsCenter;
     })();
+    // 网格辅助线
+    gridHelper = (() => {
+        const gridHelper = new GridHelper(1000, 100, 0x303030, 0x303030);
+        gridHelper.visible = threeUtils.isDev;
+        this.scene.add(gridHelper);
+    })();
+    //坐标轴线
+    axesHelper = (() => {
+        const axesHelper = new AxesHelper(10000);
+        axesHelper.visible = threeUtils.isDev;
+        this.scene.add(axesHelper);
+    })();
     init() {
-        // 非开发模式添加网格辅助线
-        if (threeUtils.isDev) {
-            const gridHelper = new GridHelper(1000, 100, 0x303030, 0x303030);
-            gridHelper.position.set(0, -0.001, 0);
-            this.scene.add(gridHelper);
-            const axesHelper = new AxesHelper(10000);
-            this.scene.add(axesHelper);
-        }
         // 资源加载进度有更新时, 需要渲染
         threeLoader.addEventListener("progress", () => {
             this.needRender = true;

package/lib/ThreeBase.ts

@@ -146,16 +146,21 @@ export default class ThreeBase extends EventDispatcher {
         return controlsCenter;
     })();
 
-    init() {
-        // 非开发模式添加网格辅助线
-        if (threeUtils.isDev) {
-            const gridHelper = new GridHelper(1000, 100, 0x303030, 0x303030);
-            gridHelper.position.set(0, -0.001, 0);
-            this.scene.add(gridHelper);
-            const axesHelper = new AxesHelper(10000);
-            this.scene.add(axesHelper);
-        }
+    // 网格辅助线
+    gridHelper = (() => {
+        const gridHelper = new GridHelper(1000, 100, 0x303030, 0x303030);
+        gridHelper.visible = threeUtils.isDev;
+        this.scene.add(gridHelper);
+    })();
+    
+    //坐标轴线
+    axesHelper=(()=>{
+        const axesHelper = new AxesHelper(10000);
+        axesHelper.visible = threeUtils.isDev;
+        this.scene.add(axesHelper);
+    })();
 
+    init() {
         // 资源加载进度有更新时, 需要渲染
         threeLoader.addEventListener("progress", () => {
             this.needRender = true;

package/lib/stroke_pass/stroke_pass.js

@@ -2,10 +2,9 @@
  * @Author: xiaosihan
  * @Date: 2023-05-09 00:35:17
  * @Last Modified by: xiaosihan
- * @Last Modified time: 2023-05-09 02:26:04
+ * @Last Modified time: 2023-05-09 02:33:28
  */
-import { LinearFilter, RGBAFormat, Vector2, WebGLRenderTarget, ShaderMaterial, NoBlending, Scene, RawShaderMaterial, Color, NormalBlending } from "three";
-import { CopyShader } from "three/examples/jsm/shaders/CopyShader.js";
+import { LinearFilter, RGBAFormat, Vector2, WebGLRenderTarget, NoBlending, Scene, RawShaderMaterial, Color, NormalBlending } from "three";
 import FullScreenQuad from "./FullScreenQuad";
 // 选中对象的纹理
 const selectTextureTarget = new WebGLRenderTarget(512, 512, { minFilter: LinearFilter, magFilter: LinearFilter, format: RGBAFormat });
@@ -16,13 +15,6 @@ const blur2TextureTarget = new WebGLRenderTarget(512, 512, { minFilter: LinearFi
 const size = new Vector2();
 // 创建一个渲染工具 用于处理纹理
 const fsQuad = new FullScreenQuad(); // 渲染辅助器
-//拷贝纹理着色器
-const copyShader = new ShaderMaterial({
-    ...CopyShader,
-    depthTest: false,
-    depthWrite: false,
-    transparent: true
-});
 // 描边着色器
 const blurShader = new RawShaderMaterial({
     uniforms: {

package/lib/stroke_pass/stroke_pass.ts

@@ -2,11 +2,10 @@
  * @Author: xiaosihan 
  * @Date: 2023-05-09 00:35:17 
  * @Last Modified by: xiaosihan
- * @Last Modified time: 2023-05-09 02:26:04
+ * @Last Modified time: 2023-05-09 02:33:28
  */
 
 import { Camera, LinearFilter, Object3D, RGBAFormat, Vector2, WebGLRenderTarget, WebGLRenderer, ShaderMaterial, NoBlending, Scene, RawShaderMaterial, Color, NormalBlending } from "three";
-import { CopyShader } from "three/examples/jsm/shaders/CopyShader.js";
 import FullScreenQuad from "./FullScreenQuad";
 
 // 选中对象的纹理
@@ -23,14 +22,6 @@ const size = new Vector2();
 // 创建一个渲染工具 用于处理纹理
 const fsQuad = new FullScreenQuad(); // 渲染辅助器
 
-//拷贝纹理着色器
-const copyShader = new ShaderMaterial({
-    ...CopyShader,
-    depthTest: false,
-    depthWrite: false,
-    transparent: true
-});
-
 // 描边着色器
 const blurShader = new RawShaderMaterial({
     uniforms: {

package/lib/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): void;
+    scaleTo(object3d: Object3D | BufferGeometry, size?: number, key?: Partial<["x", "y", "z"]>): void;
 }
 declare const threeUtils: ThreeUtils;
 export default threeUtils;

package/lib/threeUtils.js

@@ -162,10 +162,10 @@ class ThreeUtils extends EventDispatcher {
     center(object3d) {
         this.centerObject3D(object3d);
     }
-    //缩放至指定大小
-    scaleTo(object3d, size = 1) {
+    // 使用指定的纬度计算, 缩放至指定大小
+    scaleTo(object3d, size = 1, key = ["x", "y", "z"]) {
         const originSize = this.getSize(object3d);
-        const scale = size / Math.max(originSize.x, originSize.y, originSize.z);
+        const scale = size / Math.max(...key.map(k => originSize[k]));
         if (object3d instanceof Object3D) {
             object3d.scale.multiplyScalar(scale);
             object3d.updateMatrixWorld(true);

package/lib/threeUtils.ts

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

package/package.json

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