@realsee/dnalogel 2.14.0-alpha.0 → 2.14.0-dev.0

package/libs/PanoTagPlugin/controller/TagUtil.js

@@ -4,7 +4,7 @@ var l = (u, c, e) => (y(u, typeof c != "symbol" ? c + "" : c, e), e);
 import C from "object-assign-deep";
 import * as P from "three";
 import { DefaultConfig as D } from "../tag.config.js";
-import { anyPositionToVector3 as E, arrayPositionToVector3 as h } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
+import { anyPositionToVector3 as E, arrayPositionToVector3 as g } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
 import { planeNormal as p } from "../utils/planeNormal.js";
 import { tagPosition as k, getTagPosition as w } from "../utils/tagPosition.js";
 import { normalPositionToPositions as M } from "../utils/normalPositionToPositions.js";
@@ -31,7 +31,7 @@ import "../../CSS3DRenderPlugin/utils/three/CSS3DObject.js";
 import "../../CSS3DRenderPlugin/utils/three/OpacityMesh.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DScene.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DGroup.js";
-class de extends b {
+class ae extends b {
   constructor(e) {
     super(e);
     l(this, "tags", []);
@@ -53,8 +53,8 @@ class de extends b {
       if ((e = this.mouseInfo) != null && e.isDown)
         return !1;
     });
-    const t = this.five.getElement();
-    t && (this.domEvents = new L(this.five.camera, t)), this.five.on("wantsMoveToPano", this.fiveWantMovePanoHandler), this.store.disposers.push(() => {
+    const i = this.five.getElement();
+    i && (this.domEvents = new L(this.five.camera, i)), this.five.on("wantsMoveToPano", this.fiveWantMovePanoHandler), this.store.disposers.push(() => {
       this.five.off("wantsMoveToPano", this.fiveWantMovePanoHandler);
     });
   }
@@ -62,117 +62,117 @@ class de extends b {
     return this.five.currentMode === "Panorama";
   }
   getTagById(e) {
-    const t = this.tags.find((i) => i.id === e);
-    if (!t) {
+    const i = this.tags.find((o) => o.id === e);
+    if (!i) {
       console.warn(`error: can not find tag id ${e} by getTagById()`);
       return;
     }
-    return t;
+    return i;
   }
   pauseCurrentMedia() {
     this.mediaStore.set({ currentMediaElement: null });
   }
   getTagConfig(e) {
-    var n, r;
+    var t, d;
     if (!e)
-      return (n = this.config.globalConfig) != null ? n : {};
-    const t = {};
+      return (t = this.config.globalConfig) != null ? t : {};
+    const i = {};
     this.config.contentTypeConfig && Object.keys(this.config.contentTypeConfig).forEach((a) => {
-      const s = a;
-      if (t[s])
+      const r = a;
+      if (i[r])
         return;
-      const o = s.split("-");
-      if (o.length === 1) {
-        const [f] = o;
-        e.contentType === f && (t[s] = this.config.contentTypeConfig[s]);
+      const f = r.split("-");
+      if (f.length === 1) {
+        const [s] = f;
+        e.contentType === s && (i[r] = this.config.contentTypeConfig[r]);
       }
-      if (o.length === 2) {
-        const [f = "Any", d = "Any"] = o;
-        (e.stickType === f || f === "Any") && (e.contentType === d || d === "Any") && (t[s] = this.config.contentTypeConfig[s]);
+      if (f.length === 2) {
+        const [s = "Any", n = "Any"] = f;
+        (e.stickType === s || s === "Any") && (e.contentType === n || n === "Any") && (i[r] = this.config.contentTypeConfig[r]);
       }
-      if (o.length === 3) {
-        const [f = "Any", d, g] = o;
-        if (d === "Audio" && e.contentType === "Audio") {
+      if (f.length === 3) {
+        const [s = "Any", n, h] = f;
+        if (n === "Audio" && e.contentType === "Audio") {
           const m = e;
-          (m.stickType === f || f === "Any") && m.data.appearance === g && (t[s] = this.config.contentTypeConfig[s]);
+          (m.stickType === s || s === "Any") && m.data.appearance === h && (i[r] = this.config.contentTypeConfig[r]);
         }
       }
     });
-    const i = C({}, this.config.globalConfig, ...Object.values(t), e.config);
-    return typeof i.unfoldedConfig == "object" && (i.unfoldedConfig.disableFold && (i.unfoldedConfig = { keep: "unfolded" }), i.unfoldedConfig.disableUnfold && (i.unfoldedConfig = { keep: "folded" }), i.unfoldedConfig.keep && (i.unfoldedConfig = { keep: i.unfoldedConfig.keep })), typeof i.visibleConfig == "object" && i.visibleConfig.keep && (i.visibleConfig = { keep: i.visibleConfig.keep, visibleFiveMode: (r = i.visibleConfig) == null ? void 0 : r.visibleFiveMode }), i;
+    const o = C({}, this.config.globalConfig, ...Object.values(i), e.config);
+    return typeof o.unfoldedConfig == "object" && (o.unfoldedConfig.disableFold && (o.unfoldedConfig = { keep: "unfolded" }), o.unfoldedConfig.disableUnfold && (o.unfoldedConfig = { keep: "folded" }), o.unfoldedConfig.keep && (o.unfoldedConfig = { keep: o.unfoldedConfig.keep })), typeof o.visibleConfig == "object" && o.visibleConfig.keep && (o.visibleConfig = { keep: o.visibleConfig.keep, visibleFiveMode: (d = o.visibleConfig) == null ? void 0 : d.visibleFiveMode }), o;
   }
   loadVideoFirstFrame() {
     A && this.hooks.emit("loadVideoFirstFrame");
   }
   updateTagConfig(e) {
-    e != null && e.force && this.clearCache(), this.tags.forEach((t) => {
-      const i = this.getTagConfig(t);
-      t.mergedConfig = i;
+    e != null && e.force && this.clearCache(), this.tags.forEach((i) => {
+      const o = this.getTagConfig(i);
+      i.mergedConfig = o;
     });
   }
-  can(e, t) {
-    const i = t, n = this.getTagConfig(i);
-    if (!n || typeof n != "object")
+  can(e, i) {
+    const o = i, t = this.getTagConfig(o);
+    if (!t || typeof t != "object")
       return !0;
     if (e === "show" || e === "hide") {
-      if (!n.visibleConfig || typeof n.visibleConfig != "object")
+      if (!t.visibleConfig || typeof t.visibleConfig != "object")
         return !0;
-      if (e === "show" && n.visibleConfig.keep === "hidden" || e === "hide" && (n.visibleConfig.keep === "visible" || n.visibleConfig.alwaysShowWhenMovePano))
+      if (e === "show" && t.visibleConfig.keep === "hidden" || e === "hide" && (t.visibleConfig.keep === "visible" || t.visibleConfig.alwaysShowWhenMovePano))
         return !1;
     }
     if (e === "fold" || e === "unfold") {
-      if (!n.unfoldedConfig || typeof n.unfoldedConfig != "object")
+      if (!t.unfoldedConfig || typeof t.unfoldedConfig != "object")
         return !0;
-      if (e === "fold" && n.unfoldedConfig.keep === "unfolded" || e === "unfold" && n.unfoldedConfig.keep === "folded")
+      if (e === "fold" && t.unfoldedConfig.keep === "unfolded" || e === "unfold" && t.unfoldedConfig.keep === "folded")
         return !1;
     }
     if (e === "renderByMesh")
-      if (x(i) || v(i)) {
-        const r = i.data.mediaData;
-        return r.length === 1 && r[0].type === "Image" && n.renderType === "Mesh";
+      if (x(o) || v(o)) {
+        const d = o.data.mediaData;
+        return d.length === 1 && d[0].type === "Image" && t.renderType === "Mesh";
       } else
         return !1;
     return !0;
   }
-  getAngle(e, t) {
-    var r, a, s;
-    const i = (r = this.five.panoIndex) != null ? r : t;
-    if (i === void 0)
-      throw new Error(`getDistance(): fivePanoIndex is ${i}`);
-    const n = this.getCache({ panoIndex: t, id: e.id });
-    if (n.angle !== void 0)
-      return n.angle;
+  getAngle(e, i) {
+    var d, a, r;
+    const o = (d = this.five.panoIndex) != null ? d : i;
+    if (o === void 0)
+      throw new Error(`getDistance(): fivePanoIndex is ${o}`);
+    const t = this.getCache({ panoIndex: i, id: e.id });
+    if (t.angle !== void 0)
+      return t.angle;
     {
-      const o = (s = (a = this.five.work) == null ? void 0 : a.observers[i]) == null ? void 0 : s.position;
-      if (o === void 0)
-        throw new Error(`getAngleRange(): observerPosition is ${o}`);
-      const f = (() => e.stickType === "3DPoint" ? E(e.normal) : p(e.position))();
-      if (!f)
+      const f = (r = (a = this.five.work) == null ? void 0 : a.observers[o]) == null ? void 0 : r.position;
+      if (f === void 0)
+        throw new Error(`getAngleRange(): observerPosition is ${f}`);
+      const s = (() => e.stickType === "3DPoint" ? E(e.normal) : p(e.position))();
+      if (!s)
         return;
-      const d = k(e.position);
-      if (!d)
+      const n = k(e.position);
+      if (!n)
         return;
-      const g = new P.Vector3().copy(o).sub(d), m = f.angleTo(g) * 180 / Math.PI;
-      return n.angle = m, n.angle;
+      const h = new P.Vector3().copy(f).sub(n), m = s.angleTo(h) * 180 / Math.PI;
+      return t.angle = m, t.angle;
     }
   }
-  getDistance(e, t) {
-    var r, a, s;
-    const i = (r = this.five.panoIndex) != null ? r : t;
-    if (i === void 0)
-      throw new Error(`getDistance(): fivePanoIndex is ${i}`);
-    const n = this.getCache({ panoIndex: t, id: e.id });
-    if (n.distance !== void 0)
-      return n.distance;
+  getDistance(e, i) {
+    var d, a, r;
+    const o = (d = this.five.panoIndex) != null ? d : i;
+    if (o === void 0)
+      throw new Error(`getDistance(): fivePanoIndex is ${o}`);
+    const t = this.getCache({ panoIndex: i, id: e.id });
+    if (t.distance !== void 0)
+      return t.distance;
     {
-      const o = (s = (a = this.five.work) == null ? void 0 : a.observers[i]) == null ? void 0 : s.position;
-      if (o === void 0)
-        throw new Error(`getDistance(): observerPosition is ${o}`);
-      const f = w(e);
-      if (!f)
+      const f = (r = (a = this.five.work) == null ? void 0 : a.observers[o]) == null ? void 0 : r.position;
+      if (f === void 0)
+        throw new Error(`getDistance(): observerPosition is ${f}`);
+      const s = w(e);
+      if (!s)
         return -1;
-      const d = o.distanceTo(f);
-      return n.distance = d, d;
+      const n = f.distanceTo(s);
+      return t.distance = n, n;
     }
   }
   getPositions(e) {
@@ -180,47 +180,63 @@ class de extends b {
       return e.position;
     if (v(e))
       return e.data.mediaPosition;
-    const t = e;
+    const i = e;
     return M(
       this.five.camera.position,
-      h(t.position),
-      h(t.normal)
+      g(i.position),
+      g(i.normal)
     );
   }
-  addObjectClickHandler(e, t) {
-    if (!e || !this.domEvents)
+  addObjectClickHandler(e, i, o) {
+    if (!i || !this.domEvents)
       return () => {
       };
-    const i = (s) => {
-      const o = s.origDomEvent;
+    const t = !e.mediaVisible || !e.state.visible || !this.state.visible, d = (s) => {
+      if (t) {
+        this.mouseInfo = void 0;
+        return;
+      }
+      const n = s.origDomEvent;
       this.mouseInfo = {
-        x: o.clientX,
-        y: o.clientY,
+        x: n.clientX,
+        y: n.clientY,
         isDown: !0,
         mouseDownTimestamp: Date.now()
       };
-    }, n = (s) => {
-      const o = s.origDomEvent;
-      !this.mouseInfo || (this.mouseInfo.isDown && this.mouseInfo.x === o.clientX && this.mouseInfo.y === o.clientY && Date.now() - this.mouseInfo.mouseDownTimestamp < 400 && t(o), this.mouseInfo = void 0);
+    }, a = (s) => {
+      if (t) {
+        this.mouseInfo = void 0;
+        return;
+      }
+      const n = s.origDomEvent;
+      !this.mouseInfo || (this.mouseInfo.isDown && this.mouseInfo.x === n.clientX && this.mouseInfo.y === n.clientY && Date.now() - this.mouseInfo.mouseDownTimestamp < 400 && o(n), this.mouseInfo = void 0);
     }, r = (s) => {
-      const o = s.origDomEvent;
+      if (t) {
+        this.mouseInfo = void 0;
+        return;
+      }
+      const n = s.origDomEvent;
       this.mouseInfo = {
-        x: Math.floor(o.touches[0].clientX),
-        y: Math.floor(o.touches[0].clientY),
+        x: Math.floor(n.touches[0].clientX),
+        y: Math.floor(n.touches[0].clientY),
         isDown: !0,
         mouseDownTimestamp: Date.now()
       };
-    }, a = (s) => {
-      const o = s.origDomEvent;
-      !this.mouseInfo || (this.mouseInfo.isDown && this.mouseInfo.x === Math.floor(o.changedTouches[o.changedTouches.length - 1].clientX) && this.mouseInfo.y === Math.floor(o.changedTouches[o.changedTouches.length - 1].clientY) && Date.now() - this.mouseInfo.mouseDownTimestamp < 400 && t(o), this.mouseInfo = void 0);
+    }, f = (s) => {
+      if (t) {
+        this.mouseInfo = void 0;
+        return;
+      }
+      const n = s.origDomEvent;
+      !this.mouseInfo || (this.mouseInfo.isDown && this.mouseInfo.x === Math.floor(n.changedTouches[n.changedTouches.length - 1].clientX) && this.mouseInfo.y === Math.floor(n.changedTouches[n.changedTouches.length - 1].clientY) && Date.now() - this.mouseInfo.mouseDownTimestamp < 400 && o(n), this.mouseInfo = void 0);
     };
-    return this.domEvents.addEventListener(e, "mousedown", i, !1), this.domEvents.addEventListener(e, "mouseup", n, !1), this.domEvents.addEventListener(e, "touchstart", r, !1), this.domEvents.addEventListener(e, "touchend", a, !1), () => {
-      !this.domEvents || (this.mouseInfo = void 0, this.domEvents.removeEventListener(e, "mousedown", i), this.domEvents.removeEventListener(e, "mouseup", n), this.domEvents.removeEventListener(e, "touchstart", r), this.domEvents.removeEventListener(e, "touchend", a));
+    return this.domEvents.addEventListener(i, "mousedown", d, !1), this.domEvents.addEventListener(i, "mouseup", a, !1), this.domEvents.addEventListener(i, "touchstart", r, !1), this.domEvents.addEventListener(i, "touchend", f, !1), () => {
+      !this.domEvents || (this.mouseInfo = void 0, this.domEvents.removeEventListener(i, "mousedown", d), this.domEvents.removeEventListener(i, "mouseup", a), this.domEvents.removeEventListener(i, "touchstart", r), this.domEvents.removeEventListener(i, "touchend", f));
     };
   }
   getTagNormal(e) {
     if (e.normal)
-      return h(e.normal);
+      return g(e.normal);
     if (e.stickType === "Plane")
       return p(e.position);
     if (e.stickType === "Model")
@@ -254,5 +270,5 @@ class de extends b {
   }
 }
 export {
-  de as TagUtil
+  ae as TagUtil
 };

package/libs/base/BasePlugin.js

@@ -2,9 +2,9 @@ var i = Object.defineProperty;
 var a = (e, r, t) => r in e ? i(e, r, { enumerable: !0, configurable: !0, writable: !0, value: t }) : e[r] = t;
 var s = (e, r, t) => (a(e, typeof r != "symbol" ? r + "" : r, t), t);
 import { Subscribe as c } from "../shared-utils/Subscribe.js";
-class o {
+class x {
   constructor(r, t) {
-    s(this, "VERSION", "2.14.0-alpha.0");
+    s(this, "VERSION", "2.14.0-dev.0");
     s(this, "five");
     s(this, "hooks", new c());
     s(this, "staticPrefix", "//vrlab-static.ljcdn.com");
@@ -15,5 +15,5 @@ class o {
   }
 }
 export {
-  o as Controller
+  x as Controller
 };

package/package.json

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