@realsee/dnalogel 3.23.0 → 3.23.1

package/libs/ModelMakerPlugin/Controller.js

@@ -1,27 +1,27 @@
-var v = Object.defineProperty;
-var P = (l, n, e) => n in l ? v(l, n, { enumerable: !0, configurable: !0, writable: !0, value: e }) : l[n] = e;
-var h = (l, n, e) => (P(l, typeof n != "symbol" ? n + "" : n, e), e);
-var f = (l, n, e) => new Promise((a, o) => {
-  var c = (r) => {
+var P = Object.defineProperty;
+var E = (a, r, e) => r in a ? P(a, r, { enumerable: !0, configurable: !0, writable: !0, value: e }) : a[r] = e;
+var l = (a, r, e) => (E(a, typeof r != "symbol" ? r + "" : r, e), e);
+var f = (a, r, e) => new Promise((s, o) => {
+  var c = (i) => {
     try {
-      p(e.next(r));
-    } catch (d) {
-      o(d);
+      n(e.next(i));
+    } catch (p) {
+      o(p);
     }
-  }, i = (r) => {
+  }, t = (i) => {
     try {
-      p(e.throw(r));
-    } catch (d) {
-      o(d);
+      n(e.throw(i));
+    } catch (p) {
+      o(p);
     }
-  }, p = (r) => r.done ? a(r.value) : Promise.resolve(r.value).then(c, i);
-  p((e = e.apply(l, n)).next());
+  }, n = (i) => i.done ? s(i.value) : Promise.resolve(i.value).then(c, t);
+  n((e = e.apply(a, r)).next());
 });
-import { Controller as E } from "../base/BasePluginWithData.js";
-import * as s from "three";
-import { ModelMakerBoxItem as V } from "./item/boxItem.js";
+import { Controller as x } from "../base/BasePluginWithData.js";
+import * as h from "three";
+import { ModelMakerBoxItem as R } from "./item/boxItem.js";
 import { PrismMesh as u } from "../Sculpt/Meshes/Prism.js";
-import { anyPositionToVector3 as R } from "../shared-utils/positionToVector3.js";
+import { anyPositionToVector3 as V } from "../shared-utils/positionToVector3.js";
 import { PolygonWithEdgeMesh as k } from "../Sculpt/Meshes/PolygonWithEdge.js";
 import "hammerjs";
 import "@realsee/five";
@@ -30,8 +30,9 @@ import "../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
 import { notNil as y } from "../shared-utils/isNil.js";
 import { tagRendererMap as T } from "./utils/tagRenderer.js";
-import { ModelMakerPrismItem as z } from "./item/prismItem.js";
-import { ModelMakerPolygonItem as C } from "./item/polygonItem.js";
+import { ModelMakerPrismItem as C } from "./item/prismItem.js";
+import { ModelMakerPolygonItem as I } from "./item/polygonItem.js";
+import { boxVertex as m } from "../shared-utils/Object3DHelper/utils/boundingBox.js";
 import "../base/BasePlugin.js";
 import "../shared-utils/Subscribe.js";
 import "../shared-utils/url/absoluteUrl.js";
@@ -66,97 +67,85 @@ import "./utils/Text.js";
 import "../vendor/svelte/internal/index.js";
 import "../components/AreaLabel/LabelItem.js";
 import "../components/AreaLabel/Assets/roomLabelBg.js";
-import "../shared-utils/Object3DHelper/utils/boundingBox.js";
 import "./item/baseItem.js";
 import "../shared-utils/three/addIfNotExists.js";
 import "../shared-utils/tag.js";
 import "../shared-utils/five/vector3ToScreen.js";
 import "../shared-utils/five/FiveDomEvents.js";
 import "../shared-utils/five/calculateThreeMouse.js";
-class He extends E {
+class Be extends x {
   constructor(e) {
     super(e);
-    h(this, "state");
-    h(this, "data");
-    h(this, "group", new s.Group());
-    h(this, "items", []);
-    h(this, "tagRendererMap", {});
-    h(this, "onWantsMovePano", () => {
+    l(this, "state");
+    l(this, "data");
+    l(this, "group", new h.Group());
+    l(this, "items", []);
+    l(this, "tagRendererMap", {});
+    l(this, "onWantsMovePano", () => {
       this.items.forEach((e) => e.tag.hide());
     });
-    h(this, "updateTagRenderer", () => {
+    l(this, "updateTagRenderer", () => {
       this.items.forEach((e) => {
         var o;
-        const a = (o = this.tagRendererMap[e.type]) != null ? o : T[e.type];
-        a && e.__renderer !== a && (e.__renderer = a, typeof e.__disposeRenderer == "function" && e.__disposeRenderer(), e.tag.container.innerHTML = "", e.__disposeRenderer = a(e.tag.container, e));
+        const s = (o = this.tagRendererMap[e.type]) != null ? o : T[e.type];
+        s && e.__renderer !== s && (e.__renderer = s, typeof e.__disposeRenderer == "function" && e.__disposeRenderer(), e.tag.container.innerHTML = "", e.__disposeRenderer = s(e.tag.container, e));
       });
     });
     this.group.name = "ModelMakerPluginGroup", this.state = { enabled: !0, visible: !0 }, e.scene.add(this.group), this.handleEnable();
   }
   load(e) {
     return f(this, null, function* () {
-      var a;
-      this.clear(), this.data = e, (a = e == null ? void 0 : e.list) == null || a.forEach((o) => {
+      var s;
+      this.clear(), this.data = e, (s = e == null ? void 0 : e.list) == null || s.forEach((o) => {
         var c;
         if (o.type === "triangles") {
-          const i = new k();
-          i.setPoints(o.object_data.points), i.setStyle({
+          const t = new k();
+          t.setPoints(o.object_data.points), t.setStyle({
             color: o.object_data.color,
             opacity: o.object_data.opacity,
             lineColor: o.object_data.color,
             occlusionVisibility: !1
           });
-          const p = new C({
+          const n = new I({
             five: this.five,
-            model: i,
+            model: t,
             group: this.group,
             type: o.type,
             rawData: o
           });
-          this.items.push(p);
+          this.items.push(n);
         } else if (o.type === "prism") {
-          const i = new u();
-          i.setPoints({
-            points: o.object_data.points.map((r) => {
-              var d;
-              return [r[0], r[1] + ((d = o.object_data.fixedY) != null ? d : 0), r[2]];
+          const t = new u();
+          t.setPoints({
+            points: o.object_data.points.map((i) => {
+              var p;
+              return [i[0], i[1] + ((p = o.object_data.fixedY) != null ? p : 0), i[2]];
             }),
-            heightPoint: R(o.object_data.points[0]).add(
-              new s.Vector3().setY(o.object_data.height + ((c = o.object_data.fixedHeight) != null ? c : 0))
+            heightPoint: V(o.object_data.points[0]).add(
+              new h.Vector3().setY(o.object_data.height + ((c = o.object_data.fixedHeight) != null ? c : 0))
             )
-          }), i.setStyle({
+          }), t.setStyle({
             color: o.object_data.color,
             opacity: o.object_data.opacity,
             lineColor: o.object_data.color,
             occlusionVisibility: !1
           });
-          const p = new z({
+          const n = new C({
             five: this.five,
-            model: i,
+            model: t,
             group: this.group,
             type: o.type,
             rawData: o
           });
-          this.items.push(p);
+          this.items.push(n);
         } else if (o.type === "box") {
-          const i = new u(), { start: p, end: r, rotation: d, opacity: x, color: b } = o.object_data, w = new s.Vector3().fromArray(p), _ = new s.Vector3().fromArray(r), g = new s.Euler().fromArray(d), M = new s.Quaternion().setFromEuler(g), t = new s.Box3();
-          t.expandByPoint(w), t.expandByPoint(_);
-          const m = [
-            t.max.clone(),
-            new s.Vector3(t.min.x, t.max.y, t.max.z),
-            new s.Vector3(t.min.x, t.min.y, t.max.z),
-            new s.Vector3(t.max.x, t.min.y, t.max.z),
-            new s.Vector3(t.max.x, t.max.y, t.min.z),
-            new s.Vector3(t.min.x, t.max.y, t.min.z),
-            t.min.clone(),
-            new s.Vector3(t.max.x, t.min.y, t.min.z)
-          ];
-          i.setPoints({
-            points: [m[2], m[3], m[7], m[6]],
-            heightPoint: m[0]
-          }), i.applyQuaternion(M), i.setStyle({ color: b, opacity: x, lineColor: b, occlusionVisibility: !1 });
-          const j = new V({ five: this.five, model: i, group: this.group, type: o.type });
-          this.items.push(j);
+          const t = new u(), { start: n, end: i, rotation: p, opacity: _, color: b } = o.object_data, g = new h.Vector3().fromArray(n), w = new h.Vector3().fromArray(i), M = new h.Euler().fromArray(p), j = new h.Quaternion().setFromEuler(M), d = new h.Box3();
+          d.expandByPoint(g), d.expandByPoint(w), t.setPoints({
+            points: [m(d, 2), m(d, 3), m(d, 7), m(d, 6)],
+            heightPoint: m(d, 0)
+          }), t.applyQuaternion(j), t.setStyle({ color: b, opacity: _, lineColor: b, occlusionVisibility: !1 });
+          const v = new R({ five: this.five, model: t, group: this.group, type: o.type });
+          this.items.push(v);
         }
       }), this.five.needsRender = !0, this.handleShow(), this.updateTagRenderer();
     });
@@ -199,5 +188,5 @@ class He extends E {
   }
 }
 export {
-  He as Controller
+  Be as Controller
 };

package/libs/ModelMakerPlugin/utils/Text.js

@@ -1,45 +1,45 @@
-import { SvelteComponent as s, init as r, safe_not_equal as l, append_styles as c, element as d, text as f, attr as m, insert as p, append as u, set_data as v, noop as o, detach as x } from "../../vendor/svelte/internal/index.js";
-function g(n) {
-  c(n, "svelte-7zg6cv", ".withAnimation{transition:opacity 0.2s linear}.model-maker-tag.svelte-7zg6cv{color:#fff;font-size:0.875rem;font-weight:bold;text-shadow:0.125rem 0 0.5rem rgba(0, 0, 0, 0.15)}");
+import { SvelteComponent as s, init as r, safe_not_equal as l, append_styles as f, element as m, text as d, attr as c, insert as p, append as x, set_data as u, noop as i, detach as w } from "../../vendor/svelte/internal/index.js";
+function h(a) {
+  f(a, "svelte-129wfaa", ".withAnimation{transition:opacity 0.2s linear}.model-maker-tag.svelte-129wfaa{position:absolute;width:-moz-max-content;width:max-content;left:50%;top:50%;transform:translate(-50%, -50%);color:#fff;font-size:0.875rem;font-weight:bold;text-shadow:0.125rem 0 0.5rem rgba(0, 0, 0, 0.15)}");
 }
-function _(n) {
-  let t, i;
+function v(a) {
+  let t, o;
   return {
     c() {
-      t = d("div"), i = f(
+      t = m("div"), o = d(
         /*text*/
-        n[0]
-      ), m(t, "class", "model-maker-tag svelte-7zg6cv");
+        a[0]
+      ), c(t, "class", "model-maker-tag svelte-129wfaa");
     },
-    m(e, a) {
-      p(e, t, a), u(t, i);
+    m(e, n) {
+      p(e, t, n), x(t, o);
     },
-    p(e, [a]) {
-      a & /*text*/
-      1 && v(
-        i,
+    p(e, [n]) {
+      n & /*text*/
+      1 && u(
+        o,
         /*text*/
         e[0]
       );
     },
-    i: o,
-    o,
+    i,
+    o: i,
     d(e) {
-      e && x(t);
+      e && w(t);
     }
   };
 }
-function h(n, t, i) {
+function _(a, t, o) {
   let { text: e } = t;
-  return n.$$set = (a) => {
-    "text" in a && i(0, e = a.text);
+  return a.$$set = (n) => {
+    "text" in n && o(0, e = n.text);
   }, [e];
 }
-class w extends s {
+class b extends s {
   constructor(t) {
-    super(), r(this, t, h, _, l, { text: 0 }, g);
+    super(), r(this, t, _, v, l, { text: 0 }, h);
   }
 }
 export {
-  w as default
+  b as default
 };

package/libs/base/BasePlugin.js

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

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.23.0",
+    "%c %c@realsee/dnalogel %cv3.23.1",
     [
       "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/libs/shared-utils/tag.d.ts

@@ -7,6 +7,7 @@ export declare class LightTag {
     private five;
     private position;
     private wrapper;
+    private disposer;
     constructor(five: Five, position: AnyPosition);
     show(): void;
     hide(params?: {
@@ -15,5 +16,6 @@ export declare class LightTag {
     enable(): void;
     disable(): void;
     private onCameraUpdate;
+    private onFiveEveryReady;
 }
 export declare function tag(five: Five, position: AnyPosition): LightTag;

package/libs/shared-utils/tag.js

@@ -1,27 +1,38 @@
-var o = Object.defineProperty;
-var a = (i, t, e) => t in i ? o(i, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[t] = e;
-var n = (i, t, e) => (a(i, typeof t != "symbol" ? t + "" : t, e), e);
-import { anyPositionToVector3 as r } from "./positionToVector3.js";
-import { vector3ToScreen as h } from "./five/vector3ToScreen.js";
-const s = "LightTagContainer_shgjakdhwakjdhsja";
-class l {
+var r = Object.defineProperty;
+var h = (o, t, e) => t in o ? r(o, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[t] = e;
+var n = (o, t, e) => (h(o, typeof t != "symbol" ? t + "" : t, e), e);
+import { anyPositionToVector3 as c } from "./positionToVector3.js";
+import * as l from "three";
+import { vector3ToScreen as d } from "./five/vector3ToScreen.js";
+const a = "LightTagContainer_shgjakdhwakjdhsja";
+class p {
   constructor(t, e) {
-    n(this, "container", (() => {
-      const t = document.createElement("div");
-      return t.style.position = "absolute", t;
-    })());
+    n(this, "container");
     n(this, "visible", !1);
     n(this, "enabled", !1);
     n(this, "five");
     n(this, "position");
     n(this, "wrapper");
+    n(this, "disposer");
     n(this, "onCameraUpdate", () => {
       if (this.visible === !1)
         return;
-      const t = h(this.five.camera, this.position);
+      const t = d(this.five.camera, this.position);
       t ? (this.container.style.opacity = "1", this.container.style.pointerEvents = "auto", this.container.style.left = t.leftPercent + "%", this.container.style.top = t.topPercent + "%") : (this.container.style.opacity = "0", this.container.style.pointerEvents = "none");
     });
-    this.five = t, this.position = r(e).clone(), this.enable(), this.show();
+    n(this, "onFiveEveryReady", () => {
+      var t;
+      if (this.visible && this.five.state.mode !== "Panorama") {
+        const e = new l.Raycaster();
+        e.set(this.five.camera.position, this.position.clone().sub(this.five.camera.position));
+        const i = (t = this.five.model.intersectRaycaster(e)) == null ? void 0 : t[0];
+        (i == null ? void 0 : i.distance) > this.position.distanceTo(this.five.camera.position) ? (this.container.style.opacity = "1", this.container.style.pointerEvents = "auto") : (this.container.style.opacity = "0", this.container.style.pointerEvents = "none");
+      }
+    });
+    this.five = t, this.position = c(e).clone(), this.container = (() => {
+      const i = document.createElement("div");
+      return i.style.width = "0", i.style.height = "0", i.style.position = "absolute", i;
+    })(), this.enable(), this.show();
   }
   show() {
     this.visible = !0, this.container.style.opacity = "1", this.container.style.pointerEvents = "auto", this.container.classList.add("withAnimation"), this.onCameraUpdate();
@@ -30,21 +41,31 @@ class l {
     this.visible = !1, t != null && t.withAnimation ? this.container.classList.add("withAnimation") : this.container.classList.remove("withAnimation"), this.container.style.opacity = "0", this.container.style.pointerEvents = "none";
   }
   enable() {
-    var t;
-    this.enabled || (this.enabled = !0, this.wrapper = (t = document.getElementById(s)) != null ? t : (() => {
-      const e = document.createElement("div");
-      return e.id = s, e.style.position = "absolute", e.style.top = "0", e.style.left = "0", e.style.width = "100%", e.style.height = "100%", e.style.pointerEvents = "none", this.five.getElement().parentElement.appendChild(e), e;
-    })(), this.wrapper.appendChild(this.container), this.five.on("camera.update", this.onCameraUpdate));
+    var i;
+    if (this.enabled)
+      return;
+    this.enabled = !0, this.wrapper = (i = document.getElementById(a)) != null ? i : (() => {
+      const s = document.createElement("div");
+      return s.id = a, s.style.position = "absolute", s.style.top = "0", s.style.left = "0", s.style.width = "100%", s.style.height = "100%", s.style.pointerEvents = "none", this.five.getElement().parentElement.appendChild(s), s;
+    })(), this.wrapper.appendChild(this.container);
+    let t = !1;
+    const e = () => {
+      t || (t = !0, this.five.ready().then(() => {
+        this.onFiveEveryReady(), t = !1;
+      }));
+    };
+    this.five.on("cameraUpdate", e), this.five.on("cameraUpdate", this.onCameraUpdate), this.disposer = () => {
+      this.five.off("cameraUpdate", e), this.five.off("cameraUpdate", this.onCameraUpdate);
+    };
   }
   disable() {
-    this.enabled && (this.enabled = !1, this.wrapper.removeChild(this.container), this.five.off("camera.update", this.onCameraUpdate));
+    var t;
+    this.enabled && (this.enabled = !1, this.wrapper.removeChild(this.container), (t = this.disposer) == null || t.call(this));
   }
-  // private onWantsMovePano = () => {
-  // }
 }
-function f(i, t) {
-  return new l(i, t);
+function m(o, t) {
+  return new p(o, t);
 }
 export {
-  f as tag
+  m as tag
 };

package/package.json

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