@realsee/dnalogel 3.32.0 → 3.33.0

package/libs/PanoTagPlugin/controller/TagUtil.js

@@ -1,46 +1,45 @@
 var q = Object.defineProperty, K = Object.defineProperties;
 var Q = Object.getOwnPropertyDescriptors;
-var V = Object.getOwnPropertySymbols;
+var R = Object.getOwnPropertySymbols;
 var Y = Object.prototype.hasOwnProperty, Z = Object.prototype.propertyIsEnumerable;
-var w = (c, s, e) => s in c ? q(c, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : c[s] = e, b = (c, s) => {
+var w = (l, s, e) => s in l ? q(l, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : l[s] = e, b = (l, s) => {
   for (var e in s || (s = {}))
-    Y.call(s, e) && w(c, e, s[e]);
-  if (V)
-    for (var e of V(s))
-      Z.call(s, e) && w(c, e, s[e]);
-  return c;
-}, _ = (c, s) => K(c, Q(s));
-var d = (c, s, e) => (w(c, typeof s != "symbol" ? s + "" : s, e), e);
+    Y.call(s, e) && w(l, e, s[e]);
+  if (R)
+    for (var e of R(s))
+      Z.call(s, e) && w(l, e, s[e]);
+  return l;
+}, U = (l, s) => K(l, Q(s));
+var d = (l, s, e) => (w(l, typeof s != "symbol" ? s + "" : s, e), e);
 import { defaultGlobalConfig as ee } from "../typings/tag/TagConfig.js";
 import { objectAssignDeepExports as y } from "../../vendor/object-assign-deep/objectAssignDeep.js";
 import * as ie from "three";
 import { DefaultConfig as te } from "../tag.config.js";
 import { anyPositionToVector3 as C } from "../../shared-utils/positionToVector3.js";
 import { planeNormal as E } from "../utils/planeNormal.js";
-import { getTagCenterPosition as R } from "../utils/tagPosition.js";
+import { getTagCenterPosition as V } from "../utils/tagPosition.js";
 import { normalPositionToPositions as oe } from "../utils/normalPositionToPositions.js";
 import { TagCache as ne } from "./TagCache.js";
 import { writable as re } from "../../vendor/svelte/store/index.js";
 import { isIOSWX as se } from "../../shared-utils/device.js";
-import { Five as fe } from "@realsee/five";
-import { isMediaPlaneTag as ae, isMediaModelTag as B, isPlaneTag as ce, isPoint3DTag as le } from "../utils/tag/tagCheck.js";
-import { VideoPlane as de } from "../utils/model/mediaPlane.js";
-import { FiveDomEvents as ue } from "../../shared-utils/five/FiveDomEvents.js";
+import { CSS3DRenderPlugin as fe } from "../../CSS3DRenderPlugin/index.js";
+import { Five as ae } from "@realsee/five";
+import { isMediaPlaneTag as le, isMediaModelTag as B, isPlaneTag as ce, isPoint3DTag as de } from "../utils/tag/tagCheck.js";
+import { VideoPlane as ue } from "../utils/model/mediaPlane.js";
+import { FiveDomEvents as me } from "../../shared-utils/five/FiveDomEvents.js";
 import N from "../utils/tag/adaptConfig.js";
 import { isPanoramaLike as A, isModelLike as $ } from "../../shared-utils/five/mode.js";
 import "hammerjs";
 import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
-import "../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
-import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
 import "animejs";
 import { entries as z } from "../../shared-utils/typescript/entries.js";
 import { getUrlExt as H } from "../../shared-utils/url/getUrl.js";
 import { transformPosition as J } from "../../shared-utils/five/transformPosition.js";
-import { WorkUtil as me } from "../../shared-utils/Utils/WorkUtil.js";
+import { WorkUtil as pe } from "../../shared-utils/Utils/WorkUtil.js";
 import "../../shared-utils/three/centerPoint.js";
 import "../../base/BasePlugin.js";
 import "../../shared-utils/Subscribe.js";
-import "../../shared-utils/url/absoluteUrl.js";
+import "../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DRenderer.js";
 import "three/examples/jsm/renderers/CSS3DRenderer";
 import "../../CSS3DRenderPlugin/utils/getAllCSS3DObject.js";
@@ -52,7 +51,11 @@ import "../../CSS3DRenderPlugin/utils/three/OpacityMesh.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 "../../vendor/svelte/internal/index.js";
+import "../../CSS3DRenderPlugin/Controller.js";
+import "../../shared-utils/five/fiveModelLoad.js";
 import "../../shared-utils/three/loadTexture.js";
 import "../../shared-utils/three/Quadrangle.js";
 import "../../shared-utils/math/pointIsRectangle.js";
@@ -63,25 +66,23 @@ import "../../shared-utils/three/FragmentTransparencyMaterial.js";
 import "../../shared-utils/three/getNormal.js";
 import "../../shared-utils/five/calculateThreeMouse.js";
 import "../../shared-utils/Utils/BaseUtil.js";
-class ui extends ne {
+class hi extends ne {
   constructor(e) {
     super(e);
     d(this, "tags", []);
     d(this, "config", te);
     d(this, "tagsLengthWillUpdate", !0);
-    d(this, "workUtil", new me(this.five));
+    d(this, "workUtil", new pe(this.five));
     d(this, "mediaStore", re({
       currentMediaElement: null
     }));
-    /** css3DRenderPlugin */
-    d(this, "css3DRenderPlugin");
     d(this, "store", {
       disposers: [],
       disposed: !1,
       resizeObserverDisposerAdding: !1,
       css3DRenderDisposer: /* @__PURE__ */ new Map()
     });
-    d(this, "domEvents", new ue(this.five));
+    d(this, "domEvents", new me(this.five));
     // private _cache_pointTag?: PointTagInstance[]
     // private _cache_2DPointTag?: TagInstance<TagContentType, '2DPoint'>[]
     // private _cache_imagePlane?: TagInstance<'MediaPlane', 'Plane'>[]
@@ -92,13 +93,14 @@ class ui extends ne {
     //   | TagInstance<TagContentType, '3DPoint'>
     // )[]
     d(this, "_container", null);
+    d(this, "_css3DRenderPlugin");
     d(this, "loadVideoFirstFrame", () => {
       se && this.hooks.emit("loadVideoFirstFrame");
     });
     this.mediaStore.subscribe(({ currentMediaElement: i }) => {
       this.tags.forEach((o) => {
         var t;
-        if (o.mediaPlane instanceof de && i !== o.mediaPlane.videoInstance) {
+        if (o.mediaPlane instanceof ue && i !== o.mediaPlane.videoInstance) {
           if (!((t = o.mediaPlane.videoInstance) != null && t.src) || i === o.mediaPlane.videoInstance)
             return;
           o.mediaPlane.pause();
@@ -119,6 +121,10 @@ class ui extends ne {
   get workCode() {
     return this.workUtil.workCode;
   }
+  /** css3DRenderPlugin */
+  get css3DRenderPlugin() {
+    return this._css3DRenderPlugin || (this._css3DRenderPlugin = fe(this.five)), this._css3DRenderPlugin;
+  }
   getTagById(e) {
     const i = this.tags.find((o) => o.id === e);
     if (!i) {
@@ -135,9 +141,9 @@ class ui extends ne {
    * @description 获取标签配置
    */
   getTagConfig(e, i) {
-    var r, f, l;
+    var r, f, c;
     const o = this.calculateTagConfig(e, { useCache: i == null ? void 0 : i.useCache }), t = (r = i == null ? void 0 : i.fiveMode) != null ? r : this.five.getCurrentState().mode, n = (f = o.configWithFiveMode) == null ? void 0 : f[t];
-    return (l = n != null ? n : o) != null ? l : {};
+    return (c = n != null ? n : o) != null ? c : {};
   }
   /**
    * @description 获取标签当前状态
@@ -184,7 +190,7 @@ class ui extends ne {
         return;
       const t = e.data.mediaData;
       if (!(!t || t.length === 0) && o.renderType === "Mesh") {
-        if (ae(e)) {
+        if (le(e)) {
           if (t.length === 1) {
             if (t[0].type === "Video")
               return navigator.userAgent.toLowerCase().indexOf("firefox") > -1 && navigator.userAgent.toLowerCase().indexOf("mobile") > -1 ? "Dom" : "Mesh";
@@ -214,10 +220,10 @@ class ui extends ne {
       const r = (() => e.stickType === "3DPoint" ? C(e.normal) : E(e.position))();
       if (!r)
         return;
-      const f = R(e);
+      const f = V(e);
       if (!f)
         return;
-      const l = new ie.Vector3().copy(n).sub(f), h = r.angleTo(l) * 180 / Math.PI;
+      const c = new ie.Vector3().copy(n).sub(f), h = r.angleTo(c) * 180 / Math.PI;
       return t.angle = h, t.angle;
     }
   }
@@ -228,14 +234,14 @@ class ui extends ne {
     const o = b(b({}, this.five.getCurrentState()), i), { panoIndex: t, mode: n } = o, r = A(n) ? this.getPanoIndexCache({ panoIndex: t, id: e.id }) : void 0;
     if ((r == null ? void 0 : r.distance) !== void 0)
       return r.distance;
-    const f = R(e);
+    const f = V(e);
     if (!f)
       return -1;
     if (A(n)) {
-      const l = this.workUtil.getObserverPosition(t);
-      if (l === void 0)
+      const c = this.workUtil.getObserverPosition(t);
+      if (c === void 0)
         return -1;
-      const h = l.distanceTo(f);
+      const h = c.distanceTo(f);
       return r && (r.distance = h), h;
     }
     if ($(n))
@@ -246,7 +252,7 @@ class ui extends ne {
       return e.position;
     if (B(e))
       return e.data.mediaPosition;
-    if (le(e))
+    if (de(e))
       return oe(this.five.camera.position, C(e.position), C(e.normal));
   }
   addObjectClickHandler(e, i, o) {
@@ -310,12 +316,12 @@ class ui extends ne {
    * @description 获取merge后的配置
    */
   calculateTagConfig(e, i) {
-    var O, j, S, I, W;
+    var O, S, j, I, W;
     const o = (O = i == null ? void 0 : i.useCache) != null ? O : !0;
     if (!e)
-      return (j = this.config.globalConfig) != null ? j : {};
+      return (S = this.config.globalConfig) != null ? S : {};
     if (o) {
-      if ((S = e == null ? void 0 : e.computedConfig) != null && S._isMerged)
+      if ((j = e == null ? void 0 : e.computedConfig) != null && j._isMerged)
         return e.computedConfig;
       if ((I = e == null ? void 0 : e.config) != null && I._isMerged)
         return e.config;
@@ -336,25 +342,25 @@ class ui extends ne {
         if (g.length === 3) {
           const [p = "Any", M, X] = g;
           if (M === "Audio" && e.contentType === "Audio") {
-            const U = e;
-            (U.stickType === p || p === "Any") && U.data.appearance === X && (v[a] = m);
+            const _ = e;
+            (_.stickType === p || p === "Any") && _.data.appearance === X && (v[a] = m);
           }
         }
       }
     });
-    const f = (W = e.initialConfig) != null ? W : {}, l = y({}, ee, this.config.globalConfig, ...Object.values(t)), h = y({}, l, f), P = {}, G = Object.values(fe.Mode);
+    const f = (W = e.initialConfig) != null ? W : {}, c = y({}, ee, this.config.globalConfig, ...Object.values(t)), h = y({}, c, f), P = {}, G = Object.values(ae.Mode);
     z(n).forEach(([u, m]) => {
       G.forEach((a) => {
-        (u === "PanoramaLike" && A(a) || u === "ModelLike" && $(a)) && (P[a] = y({}, l, ...Object.values(m), f, { _isMerged: !0 }));
+        (u === "PanoramaLike" && A(a) || u === "ModelLike" && $(a)) && (P[a] = y({}, c, ...Object.values(m), f, { _isMerged: !0 }));
       });
     }), z(r).forEach(([u, m]) => {
       const a = P[u];
-      P[u] = y({}, l, a, ...Object.values(m), f, { _isMerged: !0 });
+      P[u] = y({}, c, a, ...Object.values(m), f, { _isMerged: !0 });
     });
-    const k = _(b({}, h), { configWithFiveMode: P });
+    const k = U(b({}, h), { configWithFiveMode: P });
     return N(k), Object.values(P).forEach((u) => N(u)), k._isMerged = !0, k;
   }
 }
 export {
-  ui as TagUtil
+  hi as TagUtil
 };

package/libs/PanoTagPlugin/controller/index.js

@@ -80,6 +80,8 @@ import "../../CSS3DRenderPlugin/utils/three/CSS3DGroup.js";
 import "../../vendor/svelte/store/index.js";
 import "../../vendor/svelte/internal/index.js";
 import "../../shared-utils/device.js";
+import "../../CSS3DRenderPlugin/index.js";
+import "../../CSS3DRenderPlugin/Controller.js";
 import "../utils/model/mediaPlane.js";
 import "../../shared-utils/three/loadTexture.js";
 import "../../shared-utils/three/Quadrangle.js";
@@ -168,8 +170,6 @@ import "../Components/Tag/PanoramaTag.js";
 import "../Components/Tag/CustomTag.js";
 import "../../vendor/classnames/index.js";
 import "../Components/Common/TagPoint.js";
-import "../../CSS3DRenderPlugin/index.js";
-import "../../CSS3DRenderPlugin/Controller.js";
 import "../../shared-utils/three/GLTFLoader.js";
 import "@realsee/five/gltf-loader";
 import "../../shared-utils/animationFrame/index.js";
@@ -282,10 +282,10 @@ class Gi extends j {
     }
   }
   appendTo(e) {
-    var i, s, o;
+    var i, s, o, n;
     this.container = e;
     const t = (s = (i = this.TagContainerSvelte) == null ? void 0 : i.$$) == null ? void 0 : s.root;
-    t && t !== this.container && ((o = this.TagContainerSvelte) == null || o.$destroy(), this.TagContainerSvelte = void 0, this.updateDomView());
+    t && t !== this.container && ((o = this.css3DRenderPlugin) == null || o.appendToFrontFiveContainer(this.container), (n = this.TagContainerSvelte) == null || n.$destroy(), this.TagContainerSvelte = void 0, this.updateDomView());
   }
   /**
    * @description 加载数据

package/libs/PanoTagPlugin/index.js

@@ -47,6 +47,9 @@ import "../shared-utils/url/absoluteUrl.js";
 import "../vendor/svelte/store/index.js";
 import "../vendor/svelte/internal/index.js";
 import "../shared-utils/device.js";
+import "../CSS3DRenderPlugin/index.js";
+import "../CSS3DRenderPlugin/Controller.js";
+import "../shared-utils/five/fiveModelLoad.js";
 import "./utils/model/mediaPlane.js";
 import "../shared-utils/three/loadTexture.js";
 import "../shared-utils/three/Quadrangle.js";
@@ -137,9 +140,6 @@ import "./Components/Tag/PanoramaTag.js";
 import "./Components/Tag/CustomTag.js";
 import "../vendor/classnames/index.js";
 import "./Components/Common/TagPoint.js";
-import "../CSS3DRenderPlugin/index.js";
-import "../CSS3DRenderPlugin/Controller.js";
-import "../shared-utils/five/fiveModelLoad.js";
 import "../shared-utils/three/GLTFLoader.js";
 import "@realsee/five/gltf-loader";
 import "../shared-utils/three/blink.js";

package/libs/base/BasePlugin.js

@@ -15,7 +15,7 @@ let C = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.32.0");
+    i(this, "VERSION", "3.33.0");
     i(this, "five");
     /**
      * @description: 插件事件钩子

package/libs/shared-utils/logger.js

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