@realsee/dnalogel 2.8.0 → 2.8.2

package/libs/PanoTagPlugin/controller/TagComputer.js

@@ -1,15 +1,15 @@
-var B = Object.defineProperty, V = Object.defineProperties;
-var j = Object.getOwnPropertyDescriptors;
+var V = Object.defineProperty, j = Object.defineProperties;
+var B = Object.getOwnPropertyDescriptors;
 var P = Object.getOwnPropertySymbols;
 var U = Object.prototype.hasOwnProperty, w = Object.prototype.propertyIsEnumerable;
-var T = (g, d, e) => d in g ? B(g, d, { enumerable: !0, configurable: !0, writable: !0, value: e }) : g[d] = e, C = (g, d) => {
+var T = (g, d, e) => d in g ? V(g, d, { enumerable: !0, configurable: !0, writable: !0, value: e }) : g[d] = e, C = (g, d) => {
   for (var e in d || (d = {}))
     U.call(d, e) && T(g, e, d[e]);
   if (P)
     for (var e of P(d))
       w.call(d, e) && T(g, e, d[e]);
   return g;
-}, I = (g, d) => V(g, j(d));
+}, I = (g, d) => j(g, B(d));
 var m = (g, d, e) => (T(g, typeof d != "symbol" ? d + "" : d, e), e);
 import x from "object-assign-deep";
 import * as k from "three";
@@ -19,13 +19,13 @@ import { anyPositionToVector3 as A } from "../../CSS3DRenderPlugin/utils/positio
 import { planeNormal as E } from "../utils/planeNormal.js";
 import { getTagPosition as D, tagPosition as M } from "../utils/tagPosition.js";
 import { checkRange as y } from "../utils/checkRange.js";
-import { TagCacheController as F } from "./TagCacheController.js";
+import { TagCacheController as S } from "./TagCacheController.js";
 import "hammerjs";
 import "@realsee/five";
 import "@tweenjs/tween.js";
 import "../../CSS3DRenderPlugin/CSS3DRender.js";
 import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
-import { notNil as S } from "../../shared-utils/isNil.js";
+import { notNil as F } from "../../shared-utils/isNil.js";
 import "../../shared-utils/animationFrame/BetterTween.js";
 import "@realsee/five/gltf-loader";
 import "../../CSS3DRenderPlugin/utils/centerPoint.js";
@@ -41,7 +41,7 @@ import "../../CSS3DRenderPlugin/utils/three/OpacityMesh.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DScene.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DGroup.js";
 import "../../shared-utils/animationFrame/index.js";
-class ve extends F {
+class ve extends S {
   constructor(e) {
     super(e);
     m(this, "tags", []);
@@ -321,12 +321,18 @@ class ve extends F {
       e.state && (e.state.visible = t);
     });
   }
-  setModelMedialVisibleByPanoIndex() {
-    this.tags.forEach((e) => {
-      if (!b(e))
+  setModelMedialVisible() {
+    const e = this.five.getCurrentState().mode;
+    this.tags.forEach((t) => {
+      var o;
+      if (!b(t))
         return;
-      const t = this.getModelMedialVisibleByPanoIndex(e);
-      e.mediaVisible = t;
+      if (!((o = t.model) != null && o.object)) {
+        t.mediaVisible = !1;
+        return;
+      }
+      const i = e === "Panorama" ? this.getModelMedialVisibleByPanoIndex(t) : !0;
+      t.mediaVisible = i;
     });
   }
   setUnfoldedByPanoIndex() {
@@ -377,7 +383,7 @@ class ve extends F {
       const r = this.tags.filter(b).map((v) => {
         var h;
         return (h = v.model) == null ? void 0 : h.object;
-      }).filter(S);
+      }).filter(F);
       return t.intersectObjects(r, !0)[0];
     })(), s = (() => {
       var r;
@@ -385,7 +391,7 @@ class ve extends F {
     })();
     return Math.min((u = n == null ? void 0 : n.distance) != null ? u : 1 / 0, (a = f == null ? void 0 : f.distance) != null ? a : 1 / 0) + s < o ? {
       value: !1,
-      reason: `intersectRaycaster check failed: distance is ${o}, intersection.point is ${n.point.toArray()},
+      reason: `intersectRaycaster check failed: distance is ${o}, intersection.point is ${n == null ? void 0 : n.point.toArray()},
         customModelIntersection.point is ${f == null ? void 0 : f.point.toArray()} distanceError is ${s}`
     } : { value: !0, reason: "" };
   }

package/libs/PanoTagPlugin/controller/index.js

@@ -1,15 +1,15 @@
-var B = Object.defineProperty, x = Object.defineProperties;
-var G = Object.getOwnPropertyDescriptors;
-var R = Object.getOwnPropertySymbols;
+var B = Object.defineProperty, G = Object.defineProperties;
+var x = Object.getOwnPropertyDescriptors;
+var F = Object.getOwnPropertySymbols;
 var N = Object.prototype.hasOwnProperty, W = Object.prototype.propertyIsEnumerable;
 var P = (h, d, e) => d in h ? B(h, d, { enumerable: !0, configurable: !0, writable: !0, value: e }) : h[d] = e, p = (h, d) => {
   for (var e in d || (d = {}))
     N.call(d, e) && P(h, e, d[e]);
-  if (R)
-    for (var e of R(d))
+  if (F)
+    for (var e of F(d))
       W.call(d, e) && P(h, e, d[e]);
   return h;
-}, T = (h, d) => x(h, G(d));
+}, T = (h, d) => G(h, x(d));
 var l = (h, d, e) => (P(h, typeof d != "symbol" ? d + "" : d, e), e);
 var c = (h, d, e) => new Promise((t, i) => {
   var s = (n) => {
@@ -316,8 +316,8 @@ class pi extends Y {
     this.mediaStore.set({ currentMediaElement: null });
   }
   updateTagCss3DObjectMatrix(e, t) {
-    var D, w, O, F;
-    const i = (O = (w = (D = e.mergedConfig) == null ? void 0 : D.tag3DConfig) == null ? void 0 : w.ratio) != null ? O : 216e-5, s = (F = e.tag3DContentSvelte) == null ? void 0 : F.domContainer.css3DObject;
+    var D, w, O, R;
+    const i = (O = (w = (D = e.mergedConfig) == null ? void 0 : D.tag3DConfig) == null ? void 0 : w.ratio) != null ? O : 216e-5, s = (R = e.tag3DContentSvelte) == null ? void 0 : R.domContainer.css3DObject;
     if (!s)
       return;
     const o = f(e) ? e.data.mediaPosition : e.position;
@@ -400,7 +400,7 @@ class pi extends Y {
     };
   }
   handleFiveModeChange(e) {
-    this.tags.forEach((t) => {
+    this.setModelMedialVisible(), this.tags.forEach((t) => {
       f(t) && e !== "Panorama" && this.changeTagMode(t, "behind"), t.state.visible = this.getVisible(t);
     }), this.updateRenderAllTags(), this.updateRenderAllTags();
   }
@@ -454,9 +454,9 @@ class pi extends Y {
   }
   handleFivePanoArrived() {
     return c(this, null, function* () {
-      yield this.setVisibleAndUnfolded(), this.setModelMedialVisibleByPanoIndex(), this.tags.forEach((e) => {
+      this.setModelMedialVisible(), yield this.setVisibleAndUnfolded(), this.tags.forEach((e) => {
         e.temporaryState = T(p({}, e.temporaryState), { visible: !0 });
-      }), this.store.visibleWithAnimation = !0, this.updateTagContainerVisible();
+      }), this.store.visibleWithAnimation = !0, this.updateTagContainerVisible(), this.updateRenderAllTags();
     });
   }
   setUnfoldedByCamera() {
@@ -566,7 +566,7 @@ class pi extends Y {
   addMediaModelTag(e) {
     return c(this, null, function* () {
       const t = e.filter(f).map(this.loadModel);
-      yield Promise.all(t), this.five.getCurrentState().mode === "Panorama" && this.setModelMedialVisibleByPanoIndex(), this.updateRenderAllTags();
+      yield Promise.all(t), this.setModelMedialVisible(), this.updateRenderAllTags();
     });
   }
   changeTagMode(e, t) {

package/package.json

@@ -7,7 +7,7 @@
   "repository": "https://github.com/realsee-developer/dnalogel.git",
   "description": "如视 VR 看房插件合集",
   "private": false,
-  "version": "2.8.0",
+  "version": "2.8.2",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
     "clean": "rm -rf components dist docs libs types ./vite.config.js.timestamp*",