@realsee/dnalogel 3.50.10 → 3.50.12

package/libs/PanoTagPlugin/controller/index.js

@@ -34,10 +34,10 @@ import { isModelTag as A, isMediaModelTag as w } from "../utils/tag/tagCheck.js"
 import { debounce as M } from "../utils/debounce.js";
 import { throttle as b } from "../utils/throttle.js";
 import _, { getTagStickType as I } from "../utils/tag/format.js";
-import { generateBlankAudio as L, AudioNamespace as B } from "../../shared-utils/audio.js";
-import { resizeObserver as C } from "../../shared-utils/dom/resizeObserver.js";
-import { TagRender as O } from "./TagRender.js";
-import { isModelLike as R } from "../../shared-utils/five/mode.js";
+import { generateBlankAudio as L, AudioNamespace as R } from "../../shared-utils/audio.js";
+import { resizeObserver as T } from "../../shared-utils/dom/resizeObserver.js";
+import { TagRender as B } from "./TagRender.js";
+import { isModelLike as O } from "../../shared-utils/five/mode.js";
 import "hammerjs";
 import "three/examples/jsm/renderers/CSS3DRenderer";
 import "@realsee/five/line";
@@ -48,7 +48,7 @@ import "animejs";
 import { nextFrame as G } from "../../shared-utils/animationFrame/index.js";
 import { waitFiveModelLoaded as N } from "../../shared-utils/five/fiveModelLoad.js";
 import { DebugUtil as V } from "../utils/DebugUtil.js";
-import { safeObj as T } from "../../shared-utils/safeObj.js";
+import { safeObj as C } from "../../shared-utils/safeObj.js";
 import { PointTag as z } from "./Tag/PointTag.js";
 import { ModelTag as Q } from "./Tag/ModelTag.js";
 import { PlaneTag as x } from "./Tag/PlaneTag.js";
@@ -193,7 +193,7 @@ import "../utils/addDebugPoints.js";
 import "../Components/TagItem.js";
 import "../Components/Common/TagPoint.js";
 const S = "Dnalogel-PanoTagPlugin", Ji = (d) => `${S}--${d}`;
-class Zi extends O {
+class Zi extends B {
   constructor(e, t) {
     super(e);
     /** state */
@@ -263,7 +263,7 @@ class Zi extends O {
       this.tags.forEach((e) => e.updateVisible());
     });
     p(this, "onFiveEveryReady", () => {
-      this.setUnfoldedByCamera(), R(this.five.getCurrentState().mode) && this.tags.forEach((e) => e.updateVisible());
+      this.setUnfoldedByCamera(), O(this.five.getCurrentState().mode) && this.tags.forEach((e) => e.updateVisible());
     });
     p(this, "render", () => {
       this.renderQueue.forEach((e, t) => {
@@ -301,7 +301,7 @@ class Zi extends O {
         }
       }), this.renderQueue.clear();
     });
-    this.params = m({}, { debug: !1, config: this.config }, f({}, t)), this.debug = this.params.debug, this.config = this.params.config, this.debug && this.debugUtil.bindLog(), L(1, { namespace: B.PlayAudio });
+    this.params = m({}, { debug: !1, config: this.config }, f({}, t)), this.debug = this.params.debug, this.config = this.params.config, this.debug && this.debugUtil.bindLog(), L(1, { namespace: R.PlayAudio });
     try {
       Array.isArray(window.__PANOTAGPLUGIN_DEBUG_LIST__) || (window.__PANOTAGPLUGIN_DEBUG_LIST__ = []), window.__PANOTAGPLUGIN_DEBUG_LIST__.push(this), window.__PANOTAGPLUGIN_DEBUG__ || Object.defineProperty(window, "__PANOTAGPLUGIN_DEBUG__", {
         get: function() {
@@ -520,10 +520,10 @@ class Zi extends O {
     });
   }
   handleShow() {
-    this.state.visible = !0, this.group.visible = !0, this.addRenderQueue({ type: "TagContainerSvelte", keys: ["state"] }), this.five.needsRender = !0;
+    this.state.visible = !0, this.group.visible = !0, this.addRenderQueue({ type: "TagContainerSvelte", keys: ["state"] }), this.updateRender3DDomTag(), this.five.needsRender = !0;
   }
   handleHide() {
-    this.pauseCurrentMedia(), this.state.visible = !1, this.group.visible = !1, this.addRenderQueue({ type: "TagContainerSvelte", keys: ["state"] }), this.five.needsRender = !0;
+    this.pauseCurrentMedia(), this.state.visible = !1, this.group.visible = !1, this.addRenderQueue({ type: "TagContainerSvelte", keys: ["state"] }), this.updateRender3DDomTag(), this.five.needsRender = !0;
   }
   handleEnable() {
     this.state.enabled = !0, this.store.eventListenerDisposer = this.addEventListener(), this.five.scene.children.includes(this.group) || this.five.scene.add(this.group), this.group.traverse((e) => {
@@ -553,12 +553,12 @@ class Zi extends O {
       this.state.enabled && (this.filterPointTag.forEach((h) => h.updateScreenPosition({ force: !0 })), this.temporaryState.visible = !0, this.addRenderQueue({ type: "TagContainerSvelte", keys: ["temporaryState"] }));
     }, i = () => {
       this.state.enabled && (this.temporaryState.visible = !1, this.addRenderQueue({ type: "TagContainerSvelte", keys: ["temporaryState"] }));
-    }, { observe: o, unobserve: s } = C(
+    }, { observe: o, unobserve: s } = T(
       b(() => {
         this.store.resizeObserverDisposer && i();
       }, 500),
       e
-    ), { observe: n, unobserve: r } = C(
+    ), { observe: n, unobserve: r } = T(
       M(() => t(), 400),
       e
     );
@@ -573,13 +573,13 @@ class Zi extends O {
       if (t.state && i !== void 0) {
         if (i === !0 && t.screenPosition) {
           const o = t.getConfig().unfoldedConfig;
-          T(o).keep !== "unfolded" && (e = !0);
+          C(o).keep !== "unfolded" && (e = !0);
         }
         t.state.unfolded = i;
       }
     }), e && this.filterPointTag.forEach((t) => {
       const i = t.getConfig().unfoldedConfig;
-      typeof i == "object" && (i.autoUnfold || i.autoUnfold === !1 || T(i.autoUnfold).enable === !1 || i.keep) || t.state && (t.state.unfolded = !1);
+      typeof i == "object" && (i.autoUnfold || i.autoUnfold === !1 || C(i.autoUnfold).enable === !1 || i.keep) || t.state && (t.state.unfolded = !1);
     });
   }
   changeTagMode(e, t) {

package/libs/Sculpt/index.d.ts

@@ -140,7 +140,11 @@ export declare class Sculpt extends Subscribe<Event> {
     /**
      * @description: 开始绘制线段
      */
-    createline(params?: Parameters<Line['create']>[0]): Promise<Line>;
+    createLine(params?: Parameters<Line['create']>[0]): Promise<Line>;
+    /**
+     * @deprecated use createLine instead
+     */
+    createline(...params: any[]): Promise<void>;
     /**
      * @description: 开始绘制空间折线
      */

package/libs/Sculpt/index.js

@@ -1,31 +1,31 @@
-var U = Object.defineProperty, _ = Object.defineProperties;
-var x = Object.getOwnPropertyDescriptors;
+var B = Object.defineProperty, U = Object.defineProperties;
+var _ = Object.getOwnPropertyDescriptors;
 var f = Object.getOwnPropertySymbols;
-var E = Object.prototype.hasOwnProperty, L = Object.prototype.propertyIsEnumerable;
-var y = (m, i, e) => i in m ? U(m, i, { enumerable: !0, configurable: !0, writable: !0, value: e }) : m[i] = e, r = (m, i) => {
+var x = Object.prototype.hasOwnProperty, E = Object.prototype.propertyIsEnumerable;
+var y = (m, i, e) => i in m ? B(m, i, { enumerable: !0, configurable: !0, writable: !0, value: e }) : m[i] = e, r = (m, i) => {
   for (var e in i || (i = {}))
-    E.call(i, e) && y(m, e, i[e]);
+    x.call(i, e) && y(m, e, i[e]);
   if (f)
     for (var e of f(i))
-      L.call(i, e) && y(m, e, i[e]);
+      E.call(i, e) && y(m, e, i[e]);
   return m;
-}, g = (m, i) => _(m, x(i));
-var a = (m, i, e) => (y(m, typeof i != "symbol" ? i + "" : i, e), e);
-var u = (m, i, e) => new Promise((t, n) => {
-  var l = (c) => {
+}, g = (m, i) => U(m, _(i));
+var u = (m, i, e) => (y(m, typeof i != "symbol" ? i + "" : i, e), e);
+var a = (m, i, e) => new Promise((t, n) => {
+  var c = (l) => {
     try {
-      s(e.next(c));
+      o(e.next(l));
     } catch (d) {
       n(d);
     }
-  }, o = (c) => {
+  }, s = (l) => {
     try {
-      s(e.throw(c));
+      o(e.throw(l));
     } catch (d) {
       n(d);
     }
-  }, s = (c) => c.done ? t(c.value) : Promise.resolve(c.value).then(l, o);
-  s((e = e.apply(m, i)).next());
+  }, o = (l) => l.done ? t(l.value) : Promise.resolve(l.value).then(c, s);
+  o((e = e.apply(m, i)).next());
 });
 import { globalModules as O } from "./utils/Modules/Global.js";
 import { Subscribe as S } from "../shared-utils/Subscribe.js";
@@ -50,33 +50,33 @@ import { Circle as C } from "./Objects/Circle/index.js";
 import { Cylinder as R } from "./Objects/Cylinder/index.js";
 import { Box as D } from "./Objects/Box/index.js";
 import { forReverseEach as z } from "../shared-utils/forReverseEach.js";
-import { Line as j } from "./Objects/Line/index.js";
-import { hotkeys as B } from "../vendor/hotkeys-js/dist/hotkeys.esm.js";
+import { Line as L } from "./Objects/Line/index.js";
+import { hotkeys as j } from "../vendor/hotkeys-js/dist/hotkeys.esm.js";
 const h = class extends S {
   constructor(e, t) {
     super();
-    a(this, "group");
-    a(this, "theme");
-    a(this, "five");
-    a(this, "creatingItem", null);
+    u(this, "group");
+    u(this, "theme");
+    u(this, "five");
+    u(this, "creatingItem", null);
     /**
      * @description: 撤销
      */
-    a(this, "undo", () => {
+    u(this, "undo", () => {
       var e;
       console.log("undo"), (e = this.creatingItem) == null || e.undo(), this.five.needsRender = !0;
     });
     /**
      * @description: 重做
      */
-    a(this, "redo", () => {
+    u(this, "redo", () => {
       var e;
       console.log("redo"), (e = this.creatingItem) == null || e.redo(), this.five.needsRender = !0;
     });
-    this.five = e, this.theme = t, this.group = new k(), this.group.name = "Sculpt", e.scene.add(this.group), h.modules.init(e), B("ctrl+z", this.undo), B("ctrl+shift+z", this.redo), h.modules.fiveDomEvents.addEventListener(this.group, "click", ({ intersects: n, origDomEvent: l }) => {
-      var s;
-      const o = M((s = n == null ? void 0 : n[0]) == null ? void 0 : s.object, (c) => c.isSculptObject);
-      return o && !o.editing ? this.emit("click", l, o) : !1;
+    this.five = e, this.theme = t, this.group = new k(), this.group.name = "Sculpt", e.scene.add(this.group), h.modules.init(e), j("ctrl+z", this.undo), j("ctrl+shift+z", this.redo), h.modules.fiveDomEvents.addEventListener(this.group, "click", ({ intersects: n, origDomEvent: c }) => {
+      var o;
+      const s = M((o = n == null ? void 0 : n[0]) == null ? void 0 : o.object, (l) => l.isSculptObject);
+      return s && !s.editing ? this.emit("click", c, s) : !1;
     }), window.__SCULPT_DEBUG__ = this, window.__SCULPT_MODULES_DEBUG__ = h.modules;
   }
   get data() {
@@ -97,14 +97,14 @@ const h = class extends S {
    * @description: 加载数据 展示
    */
   load(e, t) {
-    var l;
+    var c;
     this.clear();
-    const n = (l = e == null ? void 0 : e.items) == null ? void 0 : l.map((o) => {
-      var c;
-      const s = g(r({}, o), {
-        style: r(r({}, (c = this.theme) == null ? void 0 : c[o.type.toLowerCase()]), o.style)
+    const n = (c = e == null ? void 0 : e.items) == null ? void 0 : c.map((s) => {
+      var l;
+      const o = g(r({}, s), {
+        style: r(r({}, (l = this.theme) == null ? void 0 : l[s.type.toLowerCase()]), s.style)
       });
-      return o.type === "Point" ? new w(s, t) : o.type === "line" ? new j(s, t) : o.type === "Polyline" ? new I(s, t) : o.type === "Polygon" ? new P(s, t) : o.type === "Prism" ? new v(s, t) : o.type === "Rectangle" ? new b(s, t) : o.type === "Circle" ? new C(s, t) : o.type === "Cylinder" ? new R(s, t) : o.type === "Box" ? new D(s, t) : null;
+      return s.type === "Point" ? new w(o, t) : s.type === "line" ? new L(o, t) : s.type === "Polyline" ? new I(o, t) : s.type === "Polygon" ? new P(o, t) : s.type === "Prism" ? new v(o, t) : s.type === "Rectangle" ? new b(o, t) : s.type === "Circle" ? new C(o, t) : s.type === "Cylinder" ? new R(o, t) : s.type === "Box" ? new D(o, t) : null;
     });
     this.group.add(...n), this.five.needsRender = !0;
   }
@@ -118,16 +118,16 @@ const h = class extends S {
    * @description: 放置物体
    */
   putObject(e) {
-    var l;
+    var c;
     this.group.add(e);
     const t = h.modules.object3DHelper, n = t.addObject3DHelper(e);
-    return (l = n == null ? void 0 : n.moveController) == null || l.moveByMouse(), t;
+    return (c = n == null ? void 0 : n.moveController) == null || c.moveByMouse(), t;
   }
   /**
    * @description: 开始绘制点
    */
   createPoint(e) {
-    return u(this, null, function* () {
+    return a(this, null, function* () {
       var t;
       return this.createItem(w, r(r({}, (t = this.theme) == null ? void 0 : t.point), e));
     });
@@ -135,17 +135,25 @@ const h = class extends S {
   /**
    * @description: 开始绘制线段
    */
-  createline(e) {
-    return u(this, null, function* () {
+  createLine(e) {
+    return a(this, null, function* () {
       var t;
-      return this.createItem(j, r(r({}, (t = this.theme) == null ? void 0 : t.line), e));
+      return this.createItem(L, r(r({}, (t = this.theme) == null ? void 0 : t.line), e));
+    });
+  }
+  /**
+   * @deprecated use createLine instead
+   */
+  createline(...e) {
+    return a(this, null, function* () {
+      this.createLine(...e);
     });
   }
   /**
    * @description: 开始绘制空间折线
    */
   createPolyline(e) {
-    return u(this, null, function* () {
+    return a(this, null, function* () {
       var t;
       return this.createItem(I, r(r({}, (t = this.theme) == null ? void 0 : t.polyline), e));
     });
@@ -154,7 +162,7 @@ const h = class extends S {
    * @description: 开始绘制平面多边形
    */
   createPolygon(e) {
-    return u(this, null, function* () {
+    return a(this, null, function* () {
       var t;
       return this.createItem(P, r(r({}, (t = this.theme) == null ? void 0 : t.polygon), e));
     });
@@ -163,7 +171,7 @@ const h = class extends S {
    * @description: 开始绘制多棱柱
    */
   createPrism(e) {
-    return u(this, null, function* () {
+    return a(this, null, function* () {
       var t;
       return this.createItem(v, r(r({}, (t = this.theme) == null ? void 0 : t.prism), e));
     });
@@ -172,7 +180,7 @@ const h = class extends S {
    * @description: 开始绘制矩形
    */
   createRectangle(e) {
-    return u(this, null, function* () {
+    return a(this, null, function* () {
       var t;
       return this.createItem(b, r(r({}, (t = this.theme) == null ? void 0 : t.rectangle), e));
     });
@@ -181,7 +189,7 @@ const h = class extends S {
    * @description: 开始绘制圆形
    */
   createCircle(e) {
-    return u(this, null, function* () {
+    return a(this, null, function* () {
       var t;
       return this.createItem(C, r(r({}, (t = this.theme) == null ? void 0 : t.circle), e));
     });
@@ -190,7 +198,7 @@ const h = class extends S {
    * @description: 开始绘制圆柱
    */
   createCylinder(e) {
-    return u(this, null, function* () {
+    return a(this, null, function* () {
       var t;
       return this.createItem(R, r(r({}, (t = this.theme) == null ? void 0 : t.cylinder), e));
     });
@@ -199,7 +207,7 @@ const h = class extends S {
    * @description: 开始绘制 Box
    */
   createBox(e) {
-    return u(this, null, function* () {
+    return a(this, null, function* () {
       var t;
       return this.createItem(D, r(r({}, (t = this.theme) == null ? void 0 : t.box), e));
     });
@@ -219,19 +227,19 @@ const h = class extends S {
     z(this.items, (e) => e.delete()), this.five.needsRender = !0;
   }
   createItem(e, ...t) {
-    return u(this, null, function* () {
+    return a(this, null, function* () {
       this.creatingItem && (this.creatingItem.stopCreating(), this.creatingItem = null);
       const n = new e();
-      return this.creatingItem = n, this.group.add(n), yield n.create(...t).then((...l) => (this.creatingItem = null, l)).catch((l) => {
-        console.error(l), this.group.remove(n);
+      return this.creatingItem = n, this.group.add(n), yield n.create(...t).then((...c) => (this.creatingItem = null, c)).catch((c) => {
+        console.error(c), this.group.remove(n);
       }), n;
     });
   }
 };
 let p = h;
-a(p, "modules", O);
-const ae = (m) => new p(m);
+u(p, "modules", O);
+const ue = (m) => new p(m);
 export {
   p as Sculpt,
-  ae as SculptPlugin
+  ue as SculptPlugin
 };

package/libs/base/BasePlugin.js

@@ -18,7 +18,7 @@ let P = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.50.10");
+    i(this, "VERSION", "3.50.12");
     i(this, "NAME");
     i(this, "five");
     i(this, "workUtil");

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.50.10",
+    "%c %c@realsee/dnalogel %cv3.50.12",
     [
       "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.50.10",
+  "version": "3.50.12",
   "main": "./dist/index.js",
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",