soonspacejs 2.14.32 → 2.14.34

package/dist/index.esm.js

@@ -24,7 +24,7 @@ import * as wi from "three/examples/jsm/utils/SkeletonUtils.js";
 import * as jc from "three/examples/jsm/libs/fflate.module.js";
 import { NURBSCurve as Uc } from "three/examples/jsm/curves/NURBSCurve.js";
 import { RectAreaLightHelper as Gc } from "three/examples/jsm/helpers/RectAreaLightHelper.js";
-const Vc = "soonspacejs", Hc = "2.14.32", bi = {
+const Vc = "soonspacejs", Hc = "2.14.34", bi = {
   name: Vc,
   version: Hc
 }, wa = "[soonspacejs]: ";
@@ -7210,11 +7210,20 @@ var ae = ad();
 function er(i) {
   return i.charAt(0).toLowerCase() + i.slice(1);
 }
-function od(i) {
-  let e = i, t;
-  for (; e; )
-    e instanceof De && e.stype !== "BaseObject3D" && (e.stype !== "Group" || !t) && (t = e), e = e.parent;
-  return t;
+function od(i, e) {
+  let t = i, n;
+  for (; t; ) {
+    if (t instanceof De && t.stype !== "Group") {
+      if (e && e.has(t.stype)) {
+        t = t.parent;
+        continue;
+      }
+      n = t;
+      break;
+    }
+    t = t.parent;
+  }
+  return n;
 }
 function is(i, e) {
   return i[e] || (i[e] = new ae.Signal()), i[e];
@@ -7249,6 +7258,8 @@ class ld {
   touchstartTimes = [0, 0];
   // 按 stype 存储当前 hover 选中的对象
   hoverSelectMap = /* @__PURE__ */ new Map();
+  // 根据 stype 排除事件触发的对象类型
+  eventExcludeStypes = /* @__PURE__ */ new Set();
   _getPoiAndModel() {
     const { meshOfModelList: e, poiIconList: t } = this.viewport.scener.intersectsList;
     return [...e, ...t];
@@ -7276,7 +7287,7 @@ class ld {
       point: null
     }, a = /* @__PURE__ */ new Map();
     s.forEach((g) => {
-      const v = od(g.object);
+      const v = od(g.object, this.eventExcludeStypes);
       if (!v) return;
       const w = v.stype;
       r.object || (r.type = w, r.object = g.object, r.point = g.point);
@@ -7771,6 +7782,30 @@ class ud {
   clearSignals() {
     for (const e in this.signals) this.signals[e].removeAll();
   }
+  /**
+   * 隔离显示对象 - 使用 Layers API 仅显示指定对象，隐藏场景中其他对象
+   * @param objects 需要隔离显示的对象
+   * @param layerChannel 使用的 layer 通道，默认 1（0 为默认通道）
+   */
+  isolate(e, t = 1) {
+    const n = Array.isArray(e) ? e : [e], s = /* @__PURE__ */ new Set();
+    for (const r of n)
+      r.traverse((a) => {
+        s.add(a);
+      });
+    this.scene.traverse((r) => {
+      s.has(r) ? r.layers.enable(t) : r.layers.disable(0);
+    }), this.camera.layers.disable(0), this.camera.layers.enable(t), this.render();
+  }
+  /**
+   * 取消隔离 - 恢复场景中所有对象的可见性
+   * @param layerChannel 之前隔离使用的 layer 通道，默认 1
+   */
+  unisolate(e = 1) {
+    this.scene.traverse((t) => {
+      t.layers.enable(0), t.layers.disable(e);
+    }), this.camera.layers.enable(0), this.camera.layers.disable(e), this.render();
+  }
   dispose() {
     cancelAnimationFrame(this._loop), this.bvh.dispose(), this.mixer.stopAllAction(), this.clipsSet.forEach((e) => {
       this.mixer.uncacheAction(e), this.mixer.uncacheClip(e);
@@ -8400,7 +8435,7 @@ class ho extends ze {
       opacity: a = 1,
       gradient: o
     } = e ?? {};
-    super(e), this.params = e, this.updateGeometry(n, s), this.updateMaterialOpacity(a), this.updateMaterial(r, o), this.stype = "Polygon", this.position.set(0, t, 0), this.rotation.set(-Math.PI / 2, 0, 0);
+    super(e), this.params = e, this.updateGeometry(n, s), this.updateMaterialOpacity(a), this.updateMaterial(r, o), this.stype = "Polygon", this.position.set(0, t, 0), this.rotation.set(-Math.PI / 2, 0, 0), this.scale.setScalar(0.999);
   }
   updateGeometry(e, t) {
     this.geometry.dispose();
@@ -14357,6 +14392,21 @@ class If {
   unEmissiveShow(e) {
     return this.viewport.scener.unEmissiveShow(e);
   }
+  /**
+   * 隔离显示对象 - 使用 Layers API 仅显示指定对象，隐藏场景中其他对象
+   * @param objects 需要隔离显示的对象
+   * @param layerChannel 使用的 layer 通道，默认 1（0 为默认通道）
+   */
+  isolate(e, t = 1) {
+    this.viewport.isolate(e, t);
+  }
+  /**
+   * 取消隔离 - 恢复场景中所有对象的可见性
+   * @param layerChannel 之前隔离使用的 layer 通道，默认 1
+   */
+  unisolate(e = 1) {
+    this.viewport.unisolate(e);
+  }
   /******/
   /******/
   /******* Manager methods */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "soonspacejs",
-  "version": "2.14.32",
+  "version": "2.14.34",
   "homepage": "https://www.xwbuilders.com/soonspacejs/",
   "description": "soonspacejs 2.x",
   "module": "./dist/index.esm.js",

package/types/Viewport/EventHandler.d.ts

@@ -18,6 +18,7 @@ declare class EventHandler {
     private touchStartEvent;
     private touchstartTimes;
     private hoverSelectMap;
+    eventExcludeStypes: Set<string>;
     constructor(viewport: Viewport);
     _getPoiAndModel(): Object3D<import('three').Object3DEventMap>[];
     /**

package/types/Viewport/index.d.ts

@@ -1,4 +1,4 @@
-import { Mesh, Timer, Scene, PerspectiveCamera, WebGLRenderer, PMREMGenerator, Vector3, AnimationMixer, Raycaster, Intersection, AnimationClip, Texture, Material, OrthographicCamera } from 'three';
+import { Mesh, Timer, Scene, PerspectiveCamera, WebGLRenderer, PMREMGenerator, Vector3, AnimationMixer, Raycaster, Intersection, AnimationClip, Texture, Material, OrthographicCamera, Object3D } from 'three';
 import { EffectComposer } from 'postprocessing';
 import { default as Stats } from 'three/examples/jsm/libs/stats.module.js';
 import { Sky } from 'three/examples/jsm/objects/Sky.js';
@@ -122,9 +122,20 @@ declare class Viewport {
         top: number;
     };
     getPositionByOffset(offset: OffsetPoint, z?: number, scalar?: number): Vector3;
-    getIntersects(event: MouseEvent | TouchEvent | OffsetPoint, objects?: import('three').Object3D<import('three').Object3DEventMap>[], options?: IntersectsOptions): Intersection<import('three').Object3D<import('three').Object3DEventMap>>[];
-    rayClash(startPoint?: Vector3, dir?: Vector3, objects?: Mesh<import('three').BufferGeometry<import('three').NormalBufferAttributes, import('three').BufferGeometryEventMap>, Material | Material[], import('three').Object3DEventMap>[]): Intersection<import('three').Object3D<import('three').Object3DEventMap>>[];
+    getIntersects(event: MouseEvent | TouchEvent | OffsetPoint, objects?: Object3D<import('three').Object3DEventMap>[], options?: IntersectsOptions): Intersection<Object3D<import('three').Object3DEventMap>>[];
+    rayClash(startPoint?: Vector3, dir?: Vector3, objects?: Mesh<import('three').BufferGeometry<import('three').NormalBufferAttributes, import('three').BufferGeometryEventMap>, Material | Material[], import('three').Object3DEventMap>[]): Intersection<Object3D<import('three').Object3DEventMap>>[];
     clearSignals(): void;
+    /**
+     * 隔离显示对象 - 使用 Layers API 仅显示指定对象，隐藏场景中其他对象
+     * @param objects 需要隔离显示的对象
+     * @param layerChannel 使用的 layer 通道，默认 1（0 为默认通道）
+     */
+    isolate(objects: Object3D | Object3D[], layerChannel?: number): void;
+    /**
+     * 取消隔离 - 恢复场景中所有对象的可见性
+     * @param layerChannel 之前隔离使用的 layer 通道，默认 1
+     */
+    unisolate(layerChannel?: number): void;
     dispose(): void;
     _signalsEventListenr(): void;
 }

package/types/index.d.ts

@@ -407,6 +407,17 @@ declare class SoonSpace {
      * @param objects
      */
     unEmissiveShow(objects?: Object3D | Object3D[]): Promise<void | void[]>;
+    /**
+     * 隔离显示对象 - 使用 Layers API 仅显示指定对象，隐藏场景中其他对象
+     * @param objects 需要隔离显示的对象
+     * @param layerChannel 使用的 layer 通道，默认 1（0 为默认通道）
+     */
+    isolate(objects: Object3D | Object3D[], layerChannel?: number): void;
+    /**
+     * 取消隔离 - 恢复场景中所有对象的可见性
+     * @param layerChannel 之前隔离使用的 layer 通道，默认 1
+     */
+    unisolate(layerChannel?: number): void;
     /******/
     /******/
     /******* Manager methods */