soonspacejs 2.14.33 → 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.33", bi = {
+const Vc = "soonspacejs", Hc = "2.14.34", bi = {
   name: Vc,
   version: Hc
 }, wa = "[soonspacejs]: ";
@@ -7210,16 +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; ) {
-    if (e instanceof De && e.stype !== "Group") {
-      t = e;
+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;
     }
-    e = e.parent;
+    t = t.parent;
   }
-  return t;
+  return n;
 }
 function is(i, e) {
   return i[e] || (i[e] = new ae.Signal()), i[e];
@@ -7254,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];
@@ -7281,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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "soonspacejs",
-  "version": "2.14.33",
+  "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>[];
     /**