@realsee/dnalogel 3.64.12 → 3.64.13

package/dist/index.js

@@ -43,7 +43,7 @@ import { LineGeometry as wA, LineMaterial as CA, THREE_Line2 as PA, Line as IA }
 import { GLTFLoader as EA } from "@realsee/five/gltf-loader";
 function MA() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.64.12",
+    "%c %c@realsee/dnalogel %cv3.64.13",
     [
       "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",
@@ -3839,7 +3839,7 @@ class Di extends ni {
       const c = new y.Color(e.lineColor);
       this.line1.material.three_color = c, this.line2.material.three_color = c;
     }
-    Be(e.lineWidth) && (this.line1.material.linewidth = e.lineWidth, this.line2.material.linewidth = e.lineWidth), Be(e.dashed) && (this.line1.material.dashed = e.dashed), Be(e.lineOpacity) && (this.line1.material.opacity = e.lineOpacity, this.line2.material.opacity = e.lineOpacity), this.updateDomItems();
+    Be(e.lineWidth) && (this.line1.material.linewidth = e.lineWidth, this.line2.material.linewidth = e.lineWidth), Be(e.dashed) && (this.line1.material.dashed = e.dashed), Be(e.lineOpacity) && (this.line1.material.opacity = e.lineOpacity, this.line2.material.opacity = e.lineOpacity), this.updateDomItems({ force: !0 });
     const i = (r = (o = e.occlusionVisibility) != null ? o : this.paramsStyle.occlusionVisibility) != null ? r : !0, s = (l = (a = e.occlusionMode) != null ? a : this.paramsStyle.occlusionMode) != null ? l : "translucence";
     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.doms.forEach((c) => c.intersectCheck = !i), this.needsRender = !0;
   }
@@ -3858,39 +3858,40 @@ class Di extends ni {
   unhighlight() {
     this.highlighted && (this.highlighted = !1, Be(this.opacityBeforeHighlight) && (this.line1.material.opacity = this.opacityBeforeHighlight, this.line2.material.opacity = this.line1.material.opacity, this.opacityBeforeHighlight = void 0), Be(this.colorBeforeHighlight) && (this.line1.material.three_color = this.colorBeforeHighlight, this.line2.material.three_color = this.colorBeforeHighlight, this.colorBeforeHighlight = void 0), this.needsRender = !0);
   }
-  updateDomItems() {
-    const e = () => {
-      this.doms.forEach((s) => s.destroy()), this.doms = [];
+  updateDomItems(e) {
+    const i = () => {
+      this.doms.forEach((o) => o.destroy()), this.doms = [];
     };
     if (!this.points || this.points.length < 2 || !this.paramsStyle.lengthEnable && !this.paramsStyle.tip)
-      return e();
+      return i();
     if (!this.five)
       return console.error("Five not found");
-    const i = this.points.map((s, o) => {
-      if (o !== 0)
-        return [this.points[o - 1], s];
-    }).filter(Be).map((s) => yr(this, s));
-    i.forEach(([s, o], r) => {
-      var c;
-      const a = ui(s, o);
-      this.doms[r] = (c = this.doms[r]) != null ? c : (() => {
-        var f;
-        const h = new Or(this.five), u = (f = this.paramsStyle.occlusionVisibility) != null ? f : !0;
-        return h.intersectCheck = !u, h.simulate3D = !0, h;
-      })(), this.doms[r].setPosition(a, [s, o]);
-      const l = (h) => {
-        var u;
-        this.doms[r].__text !== h && (this.doms[r].__text = h, h instanceof HTMLElement ? (this.doms[r].container.innerHTML = "", this.doms[r].container.appendChild(h)) : h ? this.doms[r].container.innerHTML = sh(h, {
-          style: `color: #${Be((u = this.style) == null ? void 0 : u.lineColor) ? new y.Color(this.style.lineColor).getHexString() : "ffffff"}; ${this.paramsStyle.cssStyle}`
-        }) : this.doms[r].container.innerHTML = "");
+    const s = this.points.map((o, r) => {
+      if (r !== 0)
+        return [this.points[r - 1], o];
+    }).filter(Be).map((o) => yr(this, o));
+    s.forEach(([o, r], a) => {
+      var h;
+      const l = ui(o, r);
+      this.doms[a] = (h = this.doms[a]) != null ? h : (() => {
+        var p;
+        const u = new Or(this.five), f = (p = this.paramsStyle.occlusionVisibility) != null ? p : !0;
+        return u.intersectCheck = !f, u.simulate3D = !0, u;
+      })(), this.doms[a].setPosition(l, [o, r]);
+      const c = (u, f) => {
+        var v, g;
+        const p = (v = f == null ? void 0 : f.force) != null ? v : !1;
+        this.doms[a].__text === u && !p || (this.doms[a].__text = u, u instanceof HTMLElement ? (this.doms[a].container.innerHTML = "", this.doms[a].container.appendChild(u)) : u ? this.doms[a].container.innerHTML = sh(u, {
+          style: `color: #${Be((g = this.style) == null ? void 0 : g.lineColor) ? new y.Color(this.style.lineColor).getHexString() : "ffffff"}; ${this.paramsStyle.cssStyle}`
+        }) : this.doms[a].container.innerHTML = "");
       };
       if (this.paramsStyle.tip)
-        l(this.paramsStyle.tip);
+        c(this.paramsStyle.tip, e);
       else {
-        const h = hb(s.distanceTo(o), this.paramsStyle.lengthUnit);
-        l(h || null);
+        const u = hb(o.distanceTo(r), this.paramsStyle.lengthUnit);
+        c(u || null, e);
       }
-    }), this.doms.length > i.length && (this.doms.slice(i.length).forEach((s) => s.destroy()), this.doms.length = i.length);
+    }), this.doms.length > s.length && (this.doms.slice(s.length).forEach((o) => o.destroy()), this.doms.length = s.length);
   }
 }
 class db extends Ta {
@@ -11712,7 +11713,7 @@ let Zn = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    d(this, "VERSION", "3.64.12");
+    d(this, "VERSION", "3.64.13");
     d(this, "NAME");
     d(this, "five");
     d(this, "workUtil");
@@ -21250,7 +21251,12 @@ class vs extends Di {
     d(this, "pointGroup", new ni());
     d(this, "_paramsStyle");
     d(this, "setStyle", (e) => {
-      super.setStyle(e), this._paramsStyle = B(B({}, this._paramsStyle), e), this.pointMeshes.forEach((i) => i.setStyle(le(B({}, this._paramsStyle), { color: e.lineColor, tip: void 0 }))), this.updateEdgePointsVisibility(), this.needsRender = !0;
+      super.setStyle(e), this._paramsStyle = B(B({}, this._paramsStyle), e), this.pointMeshes.forEach(
+        (i) => {
+          var s, o, r;
+          return i.setStyle(le(B({}, this._paramsStyle), { color: (r = (s = this._paramsStyle) == null ? void 0 : s.pointColor) != null ? r : (o = this._paramsStyle) == null ? void 0 : o.lineColor, tip: void 0 }));
+        }
+      ), this.updateEdgePointsVisibility(), this.needsRender = !0;
     });
     d(this, "highlight", (e) => {
       super.highlight(e), this.pointMeshes.forEach((i) => i.highlight());
@@ -21280,8 +21286,11 @@ class vs extends Di {
     super.setPoints(e);
     const i = e.map(_e).filter(Be);
     this.pointGroup.removeChildren(), this.addIfNotExists(this.pointGroup), i.forEach((s) => {
-      var r;
-      const o = new Es(le(B({}, this.style), { color: (r = this._paramsStyle) == null ? void 0 : r.lineColor, tip: void 0 }));
+      var r, a, l;
+      const o = new Es(le(B({}, this.style), {
+        color: (l = (r = this._paramsStyle) == null ? void 0 : r.pointColor) != null ? l : (a = this._paramsStyle) == null ? void 0 : a.lineColor,
+        tip: void 0
+      }));
       o.position.copy(s), this.pointGroup.add(o);
     }), this.updateEdgePointsVisibility(), this.needsRender = !0;
   }
@@ -21961,8 +21970,20 @@ class mE extends yt {
         lineStyle: this.lineStyle,
         polygonStyle: this.polygonStyle
       });
-      this.currentMeasureMesh = e, this.pointSelector.actionIfNoIntersection = "disable", this.updateSelectAdsorbedHelper();
-      const i = new Es(), s = new vs(le(B({}, this.lineStyle), { dashed: !0 })), o = new Ro(this.polygonStyle), r = new vs(le(B({}, this.lineStyle), { lineOpacity: 0.5, dashed: !0 })), a = new vs(le(B({}, this.lineStyle), { lineOpacity: 0.5, dashed: !0 })), l = () => {
+      this.currentMeasureMesh = e, e.line.setStyle({ cssStyle: "pointer-events: none;" }), this.pointSelector.actionIfNoIntersection = "disable", this.updateSelectAdsorbedHelper();
+      const i = new Es(), s = new vs(le(B({}, this.lineStyle), { dashed: !0, cssStyle: "pointer-events: none;" })), o = new Ro(this.polygonStyle), r = new vs(le(B({}, this.lineStyle), {
+        lineOpacity: 0.5,
+        lineColor: 3407837,
+        pointColor: 16777215,
+        dashed: !0,
+        cssStyle: "pointer-events: none; color: #fff;"
+      })), a = new vs(le(B({}, this.lineStyle), {
+        lineOpacity: 0.5,
+        lineColor: 3407837,
+        pointColor: 16777215,
+        dashed: !0,
+        cssStyle: "pointer-events: none; color: #fff;"
+      })), l = () => {
         i.removeFromParent(), s.removeFromParent(), o.removeFromParent(), r.removeFromParent(), a.removeFromParent();
       };
       this.group.add(e);
@@ -21995,7 +22016,7 @@ class mE extends yt {
         var p, v;
         e == null || e.setPoints(e.points.slice(0, -1)), l(), (v = (p = this.pointSelector.pointSelectorHelper) == null ? void 0 : p.magnifier) == null || v.render(), this.updateSelectAdsorbedHelper(), this.five.needsRender = !0;
       }, f = () => {
-        this.pointSelector.off("intersectionUpdate", c), this.pointSelector.off("select", h), this.pointSelector.off("disable", f), this.off("undo", u), l(), e.points.length < 2 && e.removeFromParent(), e.__five_pano_index = this.five.panoIndex, this.currentMeasureMesh = null, this.listener.addClickListener(), this.listener.removeMeasureListener(), this.emit("measureEnd");
+        this.pointSelector.off("intersectionUpdate", c), this.pointSelector.off("select", h), this.pointSelector.off("disable", f), this.off("undo", u), e.line.setStyle({ cssStyle: "pointer-events: auto;" }), l(), e.points.length < 2 && e.removeFromParent(), e.__five_pano_index = this.five.panoIndex, this.currentMeasureMesh = null, this.listener.addClickListener(), this.listener.removeMeasureListener(), this.emit("measureEnd");
       };
       this.on("undo", u), this.pointSelector.on("intersectionUpdate", c), this.pointSelector.on("select", h), this.pointSelector.on("disable", f), this.pointSelector.enable();
     });