@realsee/dnalogel 3.23.1 → 3.23.2

package/libs/ModelMakerPlugin/item/prismItem.js

@@ -1,13 +1,13 @@
 var c = Object.defineProperty, l = Object.defineProperties;
 var x = Object.getOwnPropertyDescriptors;
-var m = Object.getOwnPropertySymbols;
+var p = Object.getOwnPropertySymbols;
 var d = Object.prototype.hasOwnProperty, b = Object.prototype.propertyIsEnumerable;
-var p = (t, o, r) => o in t ? c(t, o, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[o] = r, i = (t, o) => {
+var i = (t, o, r) => o in t ? c(t, o, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[o] = r, e = (t, o) => {
   for (var r in o || (o = {}))
-    d.call(o, r) && p(t, r, o[r]);
-  if (m)
-    for (var r of m(o))
-      b.call(o, r) && p(t, r, o[r]);
+    d.call(o, r) && i(t, r, o[r]);
+  if (p)
+    for (var r of p(o))
+      b.call(o, r) && i(t, r, o[r]);
   return t;
 }, s = (t, o) => l(t, x(o));
 import { boundingBox as M, boxVertex as n } from "../../shared-utils/Object3DHelper/utils/boundingBox.js";
@@ -18,15 +18,61 @@ import "../../shared-utils/Subscribe.js";
 import "../../shared-utils/tag.js";
 import "../../shared-utils/positionToVector3.js";
 import "../../shared-utils/five/vector3ToScreen.js";
-import "../../shared-utils/five/FiveDomEvents.js";
+import "../Controller.js";
+import "../../base/BasePluginWithData.js";
+import "../../base/BasePlugin.js";
+import "hammerjs";
+import "@realsee/five";
+import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
+import "../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
+import "../../CSS3DRenderPlugin/utils/three/CSS3DRenderer.js";
+import "three/examples/jsm/renderers/CSS3DRenderer";
+import "../../CSS3DRenderPlugin/utils/getAllCSS3DObject.js";
+import "../../shared-utils/util.js";
+import "../../CSS3DRenderPlugin/utils/createResizeObserver.js";
+import "../../CSS3DRenderPlugin/utils/even.js";
+import "../../CSS3DRenderPlugin/utils/three/CSS3DObject.js";
+import "../../CSS3DRenderPlugin/utils/three/OpacityMesh.js";
+import "../../shared-utils/three/centerPoint.js";
 import "../../shared-utils/three/getObjectVisible.js";
+import "../../CSS3DRenderPlugin/utils/three/CSS3DScene.js";
+import "../../CSS3DRenderPlugin/utils/three/CSS3DGroup.js";
+import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
+import "../../shared-utils/url/absoluteUrl.js";
+import "./boxItem.js";
+import "./polygonItem.js";
+import "../../Sculpt/Meshes/Prism.js";
+import "../../shared-utils/three/IObject3D.js";
+import "../../shared-utils/isNil.js";
+import "../../Sculpt/Meshes/Polygon.js";
+import "../../shared-utils/three/generatePolygonGeometry.js";
+import "../../shared-utils/three/earcut3D.js";
+import "earcut";
+import "../../shared-utils/three/getNormal.js";
+import "../../Sculpt/utils/color.js";
+import "../../Sculpt/utils/three/ColoredMesh.js";
+import "../../shared-utils/three/geometryUtil.js";
+import "../../Sculpt/Meshes/Line.js";
+import "@realsee/five/line";
+import "../../Sculpt/Meshes/PolygonWithEdge.js";
+import "../../Sculpt/Meshes/Polyline.js";
+import "../../Sculpt/Meshes/LineWithDots.js";
+import "../../Sculpt/Meshes/Point.js";
+import "../../shared-utils/three/closeVectors.js";
+import "../utils/tagRenderer.js";
+import "../utils/Text.js";
+import "../../vendor/svelte/internal/index.js";
+import "../../components/AreaLabel/LabelItem.js";
+import "../../components/AreaLabel/Assets/roomLabelBg.js";
+import "./prismItem.js";
+import "../../shared-utils/five/FiveDomEvents.js";
 import "../../shared-utils/five/calculateThreeMouse.js";
-class R extends f {
+class Io extends f {
   constructor(...o) {
-    const r = o[0], e = M(r.model), a = new u.Vector3().lerpVectors(n(e, 0), n(e, 5), 0.5);
-    super(s(i({}, r), { position: a })), this.enable();
+    const r = o[0], m = M(r.model), a = new u.Vector3().lerpVectors(n(m, 0), n(m, 5), 0.5);
+    super(s(e({}, r), { position: a })), this.enable();
   }
 }
 export {
-  R as ModelMakerPrismItem
+  Io as ModelMakerPrismItem
 };

package/libs/PanoTagPlugin/controller/TagRender.js

@@ -233,10 +233,10 @@ class Ti extends I {
     this.contentTypeMap.set(t, e);
   }
   clearTags() {
-    this.tags.forEach((t) => {
+    this.tags.length && (this.tags.forEach((t) => {
       var e, o;
       (o = (e = t.mediaPlane) == null ? void 0 : e.parent) == null || o.remove(t.mediaPlane);
-    }), this.tags = [], this.enabledModelTagSet.clear(), this.clearCache(), this.disposeAllCSS3DContainer(), this.updateRenderAllTags();
+    }), this.tags = [], this.disposeAllCSS3DContainer(), this.updateRenderAllTags()), this.enabledModelTagSet.clear(), this.clearCache();
   }
   /**
    * @description: 更新所有标签
@@ -476,16 +476,16 @@ class Ti extends I {
     }
   }
   updateDomView(t = {}) {
-    var o, i;
+    var o, i, r;
     const e = this.filterPointTag;
     if (this.TagContainerSvelte)
       this.TagContainerSvelte.$set({ tags: e, state: this.state, temporaryState: this.temporaryState });
     else {
-      const r = (o = this.five.getElement()) == null ? void 0 : o.parentElement;
-      if (!r)
+      const a = (o = this.five.getElement()) == null ? void 0 : o.parentElement;
+      if (!a)
         return console.error("updateRenderPlaneTag: tag2DContainer not found");
-      this.TagContainerSvelte = new O({
-        target: r,
+      console.trace({ withAnimation: (i = t == null ? void 0 : t.withAnimation) != null ? i : this.store.visibleWithAnimation }), this.TagContainerSvelte = new O({
+        target: a,
         props: {
           hooks: this.hooks,
           tags: e,
@@ -494,7 +494,7 @@ class Ti extends I {
           mediaStore: this.mediaStore,
           rendererMap: this.rendererMap,
           contentTypeMap: this.contentTypeMap,
-          withAnimation: (i = t == null ? void 0 : t.withAnimation) != null ? i : this.store.visibleWithAnimation
+          withAnimation: (r = t == null ? void 0 : t.withAnimation) != null ? r : this.store.visibleWithAnimation
         }
       });
     }

package/libs/PanoTagPlugin/controller/index.js

@@ -9,7 +9,7 @@ var u = (d, a, e) => a in d ? E(d, a, { enumerable: !0, configurable: !0, writab
     for (var e of A(a))
       F.call(a, e) && u(d, e, a[e]);
   return d;
-}, b = (d, a) => I(d, R(a));
+}, v = (d, a) => I(d, R(a));
 var l = (d, a, e) => (u(d, typeof a != "symbol" ? a + "" : a, e), e);
 var c = (d, a, e) => new Promise((t, i) => {
   var s = (r) => {
@@ -27,7 +27,7 @@ var c = (d, a, e) => new Promise((t, i) => {
   }, n = (r) => r.done ? t(r.value) : Promise.resolve(r.value).then(s, o);
   n((e = e.apply(d, a)).next());
 });
-import * as v from "three";
+import * as b from "three";
 import { Subscribe as M } from "@realsee/five";
 import { objectAssignDeepExports as f } from "../../vendor/object-assign-deep/objectAssignDeep.js";
 import { addDebugPoints as O } from "../utils/addDebugPoints.js";
@@ -223,7 +223,6 @@ class Mi extends z {
      * @description: 走点/切换模型后显示
      */
     // private temporaryShow({ withAnimation }: { withAnimation?: boolean } = { withAnimation: false }) {
-    //   this.store.visibleWithAnimation = withAnimation
     //   this.temporaryState.visible = true
     //   this.updateTagContainerVisible()
     // }
@@ -231,7 +230,6 @@ class Mi extends z {
      * @description: 走点/切换模型时临时隐藏
      */
     // private temporaryHide({ withAnimation }: { withAnimation?: boolean } = { withAnimation: false }) {
-    //   this.store.visibleWithAnimation = withAnimation
     //   this.temporaryState.visible = false
     //   this.updateTagContainerVisible()
     // }
@@ -250,13 +248,13 @@ class Mi extends z {
     });
     l(this, "handleFivePanoArrived", () => c(this, null, function* () {
       this.setVisible(), this.updatePointTagPosition(), yield this.setVisibleAndUnfolded(), this.tags.forEach((e) => {
-        e.temporaryState = b(g({}, e.temporaryState), { visible: !0 });
+        e.temporaryState = v(g({}, e.temporaryState), { visible: !0 });
       }), this.tags.filter(_).filter((e) => {
         var t;
         return (t = this.getTagConfig(e).modelConfig) == null ? void 0 : t.autoLookAtEnabled;
       }).forEach((e) => {
         var h;
-        const t = new v.Mesh(new v.BoxGeometry(), new v.MeshBasicMaterial()), i = (h = e.model) == null ? void 0 : h.object;
+        const t = new b.Mesh(new b.BoxGeometry(), new b.MeshBasicMaterial()), i = (h = e.model) == null ? void 0 : h.object;
         if (!i)
           return;
         t.position.copy(i.position), t.quaternion.copy(i.quaternion);
@@ -291,9 +289,9 @@ class Mi extends z {
       this.clearTags(), console.debug(w, " load:", { data: JSON.parse(JSON.stringify(e)) }), this.config = f({}, this.config, {
         globalConfig: (s = e.globalConfig) != null ? s : {},
         contentTypeConfig: (o = e.contentTypeConfig) != null ? o : {}
-      });
+      }), this.store.visibleWithAnimation = !0;
       const i = yield this.addTag(e.tagList, t);
-      if (this.debug)
+      if (this.store.visibleWithAnimation = void 0, this.debug)
         try {
           O(this.five, this.tags);
         } catch (n) {
@@ -312,7 +310,7 @@ class Mi extends z {
         const n = JSON.parse(JSON.stringify(o.data)), r = o.config ? JSON.parse(JSON.stringify(o.config)) : {};
         o.initialConfig = r;
         const h = this.calculateTagConfig(o), p = this.getTagConfig(o);
-        return o.config = p, b(g({}, o), {
+        return o.config = p, v(g({}, o), {
           enabled: (T = o.enabled) != null ? T : !0,
           id: (y = o.id) != null ? y : x(),
           data: (C = p.initialData) != null && C.important ? f(o.data, n, p.initialData) : f(o.data, p.initialData, n),
@@ -465,7 +463,7 @@ class Mi extends z {
    */
   setVisibleAndUnfolded() {
     return c(this, arguments, function* ({ withAnimation: e } = { withAnimation: !1 }) {
-      return this.setVisible(), e ? new Promise((t) => {
+      return this.store.visibleWithAnimation = e, this.setVisible(), e ? new Promise((t) => {
         setTimeout(() => {
           this.setUnfoldedByPanoIndex(), t();
         }, 10);

package/libs/base/BasePlugin.js

@@ -14,7 +14,7 @@ let b = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.23.1");
+    i(this, "VERSION", "3.23.2");
     i(this, "five");
     /**
      * @description: 插件事件钩子

package/libs/shared-utils/five/FiveDomEvents.js

@@ -1,16 +1,16 @@
 var L = Object.defineProperty;
 var b = Object.getOwnPropertySymbols;
-var D = Object.prototype.hasOwnProperty, H = Object.prototype.propertyIsEnumerable;
+var D = Object.prototype.hasOwnProperty, w = Object.prototype.propertyIsEnumerable;
 var p = (h, e, t) => e in h ? L(h, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : h[e] = t, y = (h, e) => {
   for (var t in e || (e = {}))
     D.call(e, t) && p(h, t, e[t]);
   if (b)
     for (var t of b(e))
-      H.call(e, t) && p(h, t, e[t]);
+      w.call(e, t) && p(h, t, e[t]);
   return h;
 };
 var d = (h, e, t) => (p(h, typeof e != "symbol" ? e + "" : e, t), t);
-import * as w from "three";
+import * as H from "three";
 import { getObjectVisible as M } from "../three/getObjectVisible.js";
 import { calculateThreeMouse as $ } from "./calculateThreeMouse.js";
 class I {
@@ -69,27 +69,22 @@ class I {
     });
     // eslint-disable-next-line complexity
     d(this, "onDomEvent", (e, t, n, i = this.boundObject[e]) => {
-      var f, c, r;
-      if (!t || !i || (i == null ? void 0 : i.length) === 0)
+      var f, m, s;
+      if (!t || !i || (i == null ? void 0 : i.length) === 0 || !this.five.model.loaded)
         return;
       const o = (f = t.raycaster) != null ? f : this.getRaycaster(t);
       o.params.Points.threshold = 0.02;
-      const s = o.intersectObjects(i, !0);
-      if (s.length === 0)
+      const r = o.intersectObjects(i, !0), l = this.five.model.intersectRaycaster(o), u = 0.01;
+      if (l.length > 0 && r.length > 0 && l[0].distance + u < r[0].distance)
         return;
-      const l = this.five.model.intersectRaycaster(o), u = 0.01;
-      if (l.length > 0 && s.length > 0 && l[0].distance + u < s[0].distance)
-        return;
-      const a = (c = s[0]) == null ? void 0 : c.object;
-      if (a) {
-        if (e === "wantDblclick")
-          return !1;
-        if ((!a || !this.objectIsBound(a)) && (e === "hover" || e === "unHover"))
-          for (const v of (r = this.boundObject.hover) != null ? r : [])
-            v._hovered && this.notify({ eventName: "unHover", object: v });
-        if (a && this.notify({ eventName: e, object: a, originEvent: n, raycaster: o, intersects: s }))
-          return !1;
-      }
+      const a = (m = r == null ? void 0 : r[0]) == null ? void 0 : m.object;
+      if (e === "wantDblclick")
+        return !1;
+      if ((!a || !this.objectIsBound(a)) && e === "hover")
+        for (const v of (s = this.boundObject.hover) != null ? s : [])
+          v._hovered && this.notify({ eventName: "unHover", object: v });
+      if (a && a && this.notify({ eventName: e, object: a, originEvent: n, raycaster: o, intersects: r }))
+        return !1;
     });
     d(this, "objectIsBound", (e) => {
       let t = e._domEvent, n = e.parent;
@@ -98,43 +93,43 @@ class I {
       return !!t;
     });
     d(this, "notify", (e) => {
-      var c;
-      const { eventName: t, object: n, originEvent: i, raycaster: o, intersects: s } = e;
+      var m;
+      const { eventName: t, object: n, originEvent: i, raycaster: o, intersects: r } = e;
       let l = !1, u = [];
       const a = [];
       let f = n;
       for (a.push(f); f.parent; )
         f = f.parent, a.push(f);
-      for (const r of a) {
+      for (const s of a) {
         if (l)
           break;
-        r.draggable && (t === "dragstart" && (r._dragging = !0, this.dragging = !0), t === "dragend" && (r._dragging = !1, this.dragging = !1));
-        const v = r._domEvent;
+        s.draggable && (t === "dragstart" && (s._dragging = !0, this.dragging = !0), t === "dragend" && (s._dragging = !1, this.dragging = !1));
+        const v = s._domEvent;
         if (!v)
           continue;
         const _ = v[`${t}Handler`];
         if (_)
           for (const [O, E] of _) {
-            if (E != null && E.noEmitWhenHide && !M(r))
+            if (E != null && E.noEmitWhenHide && !M(s))
               continue;
             if (t === "hover") {
-              if (r._hovered)
+              if (s._hovered)
                 continue;
-              r._hovered = !0;
-              for (const m of (c = this.boundObject.hover) != null ? c : [])
-                m !== r && m._hovered && this.notify({ eventName: "unHover", object: m });
+              s._hovered = !0;
+              for (const c of (m = this.boundObject.hover) != null ? m : [])
+                c !== s && c._hovered && this.notify({ eventName: "unHover", object: c });
             }
             if (t === "unHover") {
-              if (!r._hovered)
+              if (!s._hovered)
                 continue;
-              r._hovered = !1;
+              s._hovered = !1;
             }
             const g = O({
               type: t,
-              target: r,
+              target: s,
               origDomEvent: i,
               raycaster: o,
-              intersects: s,
+              intersects: r,
               stopPropagation: () => {
                 l = !0;
               }
@@ -143,7 +138,7 @@ class I {
           }
       }
       if (t === "click" || t === "wantDblclick")
-        return u.some((r) => r === !0);
+        return u.some((s) => s === !0);
     });
     this.five = e, e.on("wantsGesture", this.handleWantsGesture), document.addEventListener("mousedown", this.handleMousedown), document.addEventListener("dblclick", this.handleMouseEvent), document.addEventListener("mouseup", this.handleMouseup), document.addEventListener("mousemove", this.handleMousemove);
   }
@@ -156,9 +151,9 @@ class I {
    * @todo: added 和 removed 还是不太智能
    */
   addAutoBindEventListener(e, t, n, i) {
-    const o = () => this.addEventListener(e, t, n, i), s = () => this.removeEventListener(e, t, n, i);
-    return e.addEventListener("added", o), e.addEventListener("removed", s), e.addEventListener("dispose", s), () => {
-      e.removeEventListener("added", o), e.removeEventListener("removed", s), e.removeEventListener("dispose", s);
+    const o = () => this.addEventListener(e, t, n, i), r = () => this.removeEventListener(e, t, n, i);
+    return e.addEventListener("added", o), e.addEventListener("removed", r), e.addEventListener("dispose", r), () => {
+      e.removeEventListener("added", o), e.removeEventListener("removed", r), e.removeEventListener("dispose", r);
     };
   }
   /**
@@ -172,13 +167,13 @@ class I {
     e._domEvent || (e._domEvent = {}), e._domEvent[`${t}Handler`] || (e._domEvent[`${t}Handler`] = []), this.boundObject[t] || (this.boundObject[t] = []), e._domEvent[`${t}Handler`].push([n, y({ noEmitWhenHide: !1 }, i)]), this.boundObject[t].push(e);
   }
   removeEventListener(e, t, n, ...i) {
-    var s, l;
+    var r, l;
     if (!e._domEvent || !e._domEvent[`${t}Handler`])
       return;
     n === void 0 && delete e._domEvent[`${t}Handler`];
     const o = e._domEvent[`${t}Handler`].findIndex((u) => u[0] === n);
     if (o !== -1 && (e._domEvent[`${t}Handler`].splice(o, 1), e._domEvent[`${t}Handler`].length === 0 && delete e._domEvent[`${t}Handler`], e._domEvent && Object.keys(e._domEvent).length === 0 && delete e._domEvent, !e._domEvent)) {
-      const u = (s = this.boundObject[t]) == null ? void 0 : s.findIndex((a) => a === e);
+      const u = (r = this.boundObject[t]) == null ? void 0 : r.findIndex((a) => a === e);
       u !== -1 && ((l = this.boundObject[t]) == null || l.splice(u, 1));
     }
   }
@@ -190,7 +185,7 @@ class I {
     const t = this.five.getElement();
     if (!t)
       return;
-    const n = $(e, t), i = new w.Raycaster();
+    const n = $(e, t), i = new H.Raycaster();
     return i.setFromCamera(n, this.five.camera), i;
   }
 }

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.23.1",
+    "%c %c@realsee/dnalogel %cv3.23.2",
     [
       "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",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realsee/dnalogel",
-  "version": "3.23.1",
+  "version": "3.23.2",
   "main": "./dist/index.js",
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",