@realsee/dnalogel 3.61.13 → 3.61.15

package/dist/index.js

@@ -43,7 +43,7 @@ import { LineGeometry as mA, LineMaterial as gA, THREE_Line2 as vA, Line as AA }
 import { GLTFLoader as bA } from "@realsee/five/gltf-loader";
 function yA() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.61.13",
+    "%c %c@realsee/dnalogel %cv3.61.15",
     [
       "background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAMCAMAAACHgmeRAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABLFBMVEUAAAAapPoap/oaqvkbrfkbr/gZnfwZoPsaqfnD4v/E4/8Ylv0clPm93/+/4P/B4f8Yj/683/8Wif+33P8Uhv+x2f8ShP+s1v8Pgf+n0/8Nf/+h0f8Lff8Lff8Nf/9dl/+czv8KfP8KfP+Lxf+Uyv+Xy/+Hwv+Jw/+Mxf+Oxv+RyP8aovsapfoap/oZmfwZm/wZnvsYnPsYkf4YlP0NePsDYfgYcfi43f+63v8Xiv8Xjf4EWfwCV/sWZ/qz2v+02/8Vh/8WiP8EUf8CTf4WXv2u1/+v2P8Thf8Thv8ETf8CR/8VV/+o1f+q1f8Qgv8Rg/8DSv8BRf8UVP+j0v+k0v8OgP8Pgf8DR/8DQv9Nhf+dzv+fz/+Kv/+Vyv+Xy/+azf+Oxv+Qx/+SyP////8MUhLdAAAAK3RSTlMACEWQ2bd98uQECPXxqO7c+Pb49vj2+Pb49vj23Oul8fMHA+TwerXXjEIG2P+bHgAAAAFiS0dEY1y+LaoAAAB+SURBVAjXY2BgZGJmYWVgYGBgY9fW0eVg4ORi4NbTNzDk4eXjZxAwMjYxNTO3EGQQsrSytrG1sxdmEHFwdHJ2cXUTZRBz9/D08vbxFWeQ8PMPCAwKDpFkkAoNC4+IjIqWZpCRlZOPiY2LV2BQVGJQTkhMUlEFWaOmrqGpxQAAyg0S9Dq+VPYAAAAASUVORK5CYII=')",
       "background-repeat: no-repeat",
@@ -3789,7 +3789,7 @@ class Di extends gi {
     }
     Fe(e.lineWidth) && (this.line1.material.linewidth = e.lineWidth, this.line2.material.linewidth = e.lineWidth), Fe(e.dashed) && (this.line1.material.dashed = e.dashed), Fe(e.lineOpacity) && (this.line1.material.opacity = e.lineOpacity, this.line2.material.opacity = e.lineOpacity), this.updateDomItems();
     const i = (o = (r = e.occlusionVisibility) != null ? r : this.paramsStyle.occlusionVisibility) != null ? o : !0, s = (l = (a = e.occlusionMode) != null ? a : this.paramsStyle.occlusionMode) != null ? l : "translucence";
-    i ? s === "depthTest" || this.dashed ? (this.remove(this.line2), this.line1.material.depthTest = !1) : s === "translucence" && (this.line1.material.depthTest = !0, this.line2.material.depthTest = !1, this.line1.material.dashed = !0, this.line2.material.dashed = !0, this.addIfNotExists(this.line2)) : (this.remove(this.line2), this.line1.material.depthTest = !0, this.line1.material.dashed = this.paramsStyle.dashed), this.needsRender = !0;
+    i ? this.dashed ? (this.remove(this.line2), this.line1.material.dashed = !0, this.line1.material.depthTest = !1) : s === "depthTest" ? (this.remove(this.line2), this.line1.material.dashed = !1, this.line1.material.depthTest = !1) : s === "translucence" && (this.line1.material.depthTest = !0, this.line2.material.depthTest = !1, this.line1.material.dashed = !0, this.line2.material.dashed = !0, this.addIfNotExists(this.line2)) : (this.remove(this.line2), this.line1.material.depthTest = !0, this.line1.material.dashed = this.paramsStyle.dashed), this.needsRender = !0;
   }
   highlight() {
     this.highlighted || (this.highlighted = !0, this.opacityBeforeHighlight = this.line1.material.opacity, this.line1.material.opacity = this.opacityBeforeHighlight * $c, this.line2.material.opacity = this.line1.material.opacity, this.needsRender = !0);
@@ -11501,7 +11501,7 @@ let Yn = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    d(this, "VERSION", "3.61.13");
+    d(this, "VERSION", "3.61.15");
     d(this, "NAME");
     d(this, "five");
     d(this, "workUtil");
@@ -24685,7 +24685,7 @@ class Gh {
   computeVisible(t) {
     const e = B(B({}, this.five.getCurrentState()), t), { panoIndex: i, mode: s } = e, r = [];
     return (() => {
-      var c, u, f;
+      var c, u, f, p;
       const l = (c = this.getConfig().visibleConfig) != null ? c : {};
       if (typeof l == "function")
         return {
@@ -24698,13 +24698,13 @@ class Gh {
           return { value: !1, checkedList: r, reason: "config.keep is hidden" };
         if (l.keep === "visible")
           return { value: !0, checkedList: r, reason: "config.keep is visible" };
-        const p = this.computeVisibleByFiveMode(l, s);
-        if ((p == null ? void 0 : p.value) === !1)
-          return p;
+        const g = this.computeVisibleByFiveMode(l, s);
+        if ((g == null ? void 0 : g.value) === !1)
+          return g;
         if (l.followModelVisibility === !0 && ["poincare", "aerophoto", "sand"].includes(this.workUtil.fromType) && (s === "Floorplan" || s === "Mapview")) {
-          const h = this.computeVisibleByFloorIndex(), { value: g } = h, v = Dn(h, ["value"]);
-          if (g === !1)
-            return B({ value: !1, checkedList: r, reason: "followModelVisibility check failed" }, v);
+          const h = this.computeVisibleByFloorIndex(), { value: v } = h, m = Dn(h, ["value"]);
+          if (v === !1)
+            return B({ value: !1, checkedList: r, reason: "followModelVisibility check failed" }, m);
         }
         if (cs(s) && l.visiblePanoIndex !== void 0 && l.visiblePanoIndex !== "all" && i !== void 0) {
           if (r.push("visiblePanoIndex"), Array.isArray(l.visiblePanoIndex) && !l.visiblePanoIndex.includes(i))
@@ -24721,14 +24721,14 @@ class Gh {
             };
         }
         if (l.visibleDistance !== void 0 && (r.push("visibleDistance"), l.visibleDistance !== "unLimited")) {
-          const g = this.getDistance(e, 1);
-          if (ca(g, l.visibleDistance) === !1)
+          const v = this.getDistance(e, 1);
+          if (ca(v, l.visibleDistance) === !1)
             return {
               value: !1,
               checkedList: r,
               panoIndex: i,
               visibleDistance: l.visibleDistance,
-              reason: `distance is not in visibleDistance. distance: ${g}, visibleDistance: ${l.visibleDistance.min} - ${l.visibleDistance.max}`
+              reason: `distance is not in visibleDistance. distance: ${v}, visibleDistance: ${l.visibleDistance.min} - ${l.visibleDistance.max}`
             };
         }
         if (l.intersectRaycaster !== !1 && (typeof l.intersectRaycaster != "object" || l.intersectRaycaster.enabled !== !1)) {
@@ -24738,9 +24738,13 @@ class Gh {
               checkedList: r,
               reason: `intersectRaycaster check failed: panoIndex is ${i}`
             };
-          const g = this.computeVisibleByIntersect(i);
-          if (g.value === !1)
-            return Object.assign(g, { checkedList: r });
+          if (i === ((p = this.fiveState) == null ? void 0 : p.panoIndex))
+            r.push("intersectCheckSkiped");
+          else {
+            const v = this.computeVisibleByIntersect(i);
+            if (v.value === !1)
+              return Object.assign(v, { checkedList: r });
+          }
         }
         return {
           value: !0,
@@ -44088,7 +44092,7 @@ class l5 extends mn {
     d(this, "onFiveModeChange", (e) => {
       const i = this.occlusionVisibility;
       Array.isArray(i) && this.items.forEach((s) => {
-        s.model.setStyle instanceof Function && s.model.setStyle({ occlusionVisibility: i.includes(e) });
+        s.type !== "triangles" && s.model.setStyle instanceof Function && s.model.setStyle({ occlusionVisibility: i.includes(e) });
       });
     });
     d(this, "handleEnable", () => {
@@ -44136,16 +44140,17 @@ class l5 extends mn {
         return;
       this.clear();
       const i = (r) => {
-        var a;
+        var c;
         const o = r.object_data.color ? new y.Color().setHex(parseInt(r.object_data.color.slice(1), 16)) : new y.Color(1, 1, 1);
-        return {
+        let a = typeof this.occlusionVisibility == "boolean" ? this.occlusionVisibility : !1, l = this.occlusionMode;
+        return r.type === "triangles" && (a = !0, l = "depthTest"), {
           color: o,
           lineColor: o,
-          opacity: ((a = r.object_data.opacity) != null ? a : 0.4) / 2,
+          opacity: ((c = r.object_data.opacity) != null ? c : 0.4) / 2,
           lineOpacity: 1,
           lineWidth: 1,
-          occlusionVisibility: typeof this.occlusionVisibility == "boolean" ? this.occlusionVisibility : !1,
-          occlusionMode: this.occlusionMode
+          occlusionVisibility: a,
+          occlusionMode: l
         };
       };
       (s = e == null ? void 0 : e.list) == null || s.forEach((r) => {