@realsee/dnalogel 3.50.8 → 3.50.9

package/libs/CruisePlugin/Work.js

@@ -262,18 +262,18 @@ class Sr extends G {
       this.data = g({ id: s.keyframesId }, s), this.hooks.emit("dataChange", s, i);
       let p = [], n;
       const a = this.data.keyframes.filter((f) => f.data.panoIndex !== void 0);
-      a.filter((f, u) => {
-        var d;
-        return f.data.panoIndex !== ((d = a[u - 1]) == null ? void 0 : d.data.panoIndex);
+      a.filter((f, d) => {
+        var u;
+        return f.data.panoIndex !== ((u = a[d - 1]) == null ? void 0 : u.data.panoIndex);
       }).map((f) => f.data.panoIndex).forEach((f) => {
-        var d, v;
-        const u = (d = this.workUtil.getObserver(f)) == null ? void 0 : d.floorIndex;
-        if (u !== void 0)
-          if (n === u) {
+        var u, v;
+        const d = (u = this.workUtil.getObserver(f)) == null ? void 0 : u.floorIndex;
+        if (d !== void 0)
+          if (n === d) {
             const c = p.length - 1;
             p[c] = [...(v = p[c]) != null ? v : [], f];
           } else {
-            n = u;
+            n = d;
             const c = p.length;
             p[c] = [f];
           }
@@ -323,11 +323,11 @@ class Sr extends G {
             const m = e.panoIndexList.slice(a).find((P) => P !== n);
             if (m === void 0)
               return;
-            const f = this.workUtil.getObserverPosition(n), u = this.workUtil.getObserverPosition(m);
-            if (!u || !f || ((v = this.workUtil.getObserver(n)) == null ? void 0 : v.floorIndex) !== ((c = this.workUtil.getObserver(m)) == null ? void 0 : c.floorIndex))
+            const f = this.workUtil.getObserverPosition(n), d = this.workUtil.getObserverPosition(m);
+            if (!d || !f || ((v = this.workUtil.getObserver(n)) == null ? void 0 : v.floorIndex) !== ((c = this.workUtil.getObserver(m)) == null ? void 0 : c.floorIndex))
               return;
-            const d = new U.Vector3().subVectors(u, f);
-            return A(d.normalize());
+            const u = new U.Vector3().subVectors(d, f);
+            return A(u.normalize());
           })();
           e.moveType === void 0 || e.moveType === "justMove" ? r.push({
             moveIndex: a,
@@ -352,21 +352,21 @@ class Sr extends G {
   // eslint-disable-next-line complexity
   handlePlay(t) {
     return y(this, null, function* () {
-      var u;
+      var d;
       const { data: e, state: r, privateState: i, hooks: s } = this;
       if (i.playing || !(e != null && e.keyframes) || (e == null ? void 0 : e.keyframes.length) === 0)
         return;
       const p = S();
       i.playId = p, i.playing = !0, i.broke = !1;
       const n = e.keyframes, a = this.getPauseData();
-      (t == null ? void 0 : t.notEmitEvent) !== !0 && s.emit("play", { userAction: (u = t == null ? void 0 : t.userAction) != null ? u : !0 });
+      (t == null ? void 0 : t.notEmitEvent) !== !0 && s.emit("play", { userAction: (d = t == null ? void 0 : t.userAction) != null ? d : !0 });
       let o = !1;
       const f = yield (() => y(this, null, function* () {
-        var d, v;
+        var u, v;
         if ((t == null ? void 0 : t.playFromIndex) !== void 0)
           return t.playFromIndex;
         if ((t == null ? void 0 : t.playFromId) !== void 0)
-          return (d = this.data) == null ? void 0 : d.keyframes.findIndex((c) => c.id === t.playFromId);
+          return (u = this.data) == null ? void 0 : u.keyframes.findIndex((c) => c.id === t.playFromId);
         if (a != null && a.id) {
           const c = (v = this.data) == null ? void 0 : v.keyframes.find((P) => P.id === a.id);
           if (a != null && a.fiveState && (yield this.move(a.fiveState, {
@@ -383,15 +383,15 @@ class Sr extends G {
         }
       }))();
       this.clearPauseData();
-      for (const d of n) {
+      for (const u of n) {
         if (i.broke || !r.playing || !i.playing || p !== i.playId)
           return;
-        if (!(f !== void 0 && d.index < f))
+        if (!(f !== void 0 && u.index < f))
           try {
-            s.emit("playIndexChange", d.index, d), yield this.playKeyframe(d, {
+            s.emit("playIndexChange", u.index, u), yield this.playKeyframe(u, {
               moveEffect: o === !1 ? i.moveToFirstPanoEffect : void 0,
               duration: o === !1 && typeof i.moveToFirstPanoDuration == "number" ? i.moveToFirstPanoDuration : void 0
-            }), d.stay && (yield O(d.stay)), o === !1 && (o = !0);
+            }), u.stay && (yield O(u.stay)), o === !1 && (o = !0);
           } catch (v) {
             return console.error(v), Promise.resolve("broke");
           }
@@ -542,8 +542,8 @@ class Sr extends G {
   updateCamera(r) {
     return y(this, arguments, function* (t, e = {}) {
       const { five: i, privateState: s, state: p } = this, n = (() => {
-        var u, d;
-        const m = (u = p.config) == null ? void 0 : u.speedConfig, f = (d = t.rotateSpeed) != null ? d : m == null ? void 0 : m.rotateSpeed;
+        var d, u;
+        const m = (d = p.config) == null ? void 0 : d.speedConfig, f = (u = t.rotateSpeed) != null ? u : m == null ? void 0 : m.rotateSpeed;
         if ((m == null ? void 0 : m.rotateSpeedUnit) === void 0)
           return f;
         if (f !== void 0)
@@ -575,8 +575,8 @@ class Sr extends G {
       const p = r.getCurrentState().mode !== "Panorama";
       p && (this.privateState.modeChanging = !0);
       const n = (() => {
-        var f, u;
-        const o = (f = s.config) == null ? void 0 : f.speedConfig, m = (u = t.moveSpeed) != null ? u : o == null ? void 0 : o.moveSpeed;
+        var f, d;
+        const o = (f = s.config) == null ? void 0 : f.speedConfig, m = (d = t.moveSpeed) != null ? d : o == null ? void 0 : o.moveSpeed;
         if ((o == null ? void 0 : o.moveSpeedUnit) === void 0)
           return m;
         if (m !== void 0)
@@ -591,16 +591,17 @@ class Sr extends G {
         return 800;
       })();
       i.currentPlayKeyframe && (i.currentPlayKeyframe.originDuration = a), yield new Promise((o) => {
-        var m, f, u;
-        this.fiveUtil.moveToPano(t.panoIndex, {
+        var f, d, u;
+        const m = this.fiveUtil.moveToPano(t.panoIndex, {
           latitude: t.latitude,
           longitude: t.longitude,
           fov: t.fov,
           duration: this.getSpeededDuration(a),
-          effect: (u = (f = e == null ? void 0 : e.moveEffect) != null ? f : (m = this.state.config) == null ? void 0 : m.moveEffect) != null ? u : t.moveEffect,
+          effect: (u = (d = e == null ? void 0 : e.moveEffect) != null ? d : (f = this.state.config) == null ? void 0 : f.moveEffect) != null ? u : t.moveEffect,
           moveCancelCallback: () => o(),
           moveEndCallback: () => o()
-        }), p && r.once("panoArrived", () => o());
+        });
+        m instanceof Promise && m.then(() => o()), p && r.once("panoArrived", () => o());
       }), p && (this.privateState.modeChanging = !1);
     });
   }

package/libs/base/BasePlugin.js

@@ -18,7 +18,7 @@ let P = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.50.8");
+    i(this, "VERSION", "3.50.9");
     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.8",
+    "%c %c@realsee/dnalogel %cv3.50.9",
     [
       "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/three/PointSelector/utils/PointHelper.js

@@ -1,9 +1,9 @@
-var i = Object.defineProperty;
-var a = (n, r, e) => r in n ? i(n, r, { enumerable: !0, configurable: !0, writable: !0, value: e }) : n[r] = e;
-var s = (n, r, e) => (a(n, typeof r != "symbol" ? r + "" : r, e), e);
+var o = Object.defineProperty;
+var a = (r, s, e) => s in r ? o(r, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : r[s] = e;
+var n = (r, s, e) => (a(r, typeof s != "symbol" ? s + "" : s, e), e);
 import * as t from "three";
-import { POINT_HELPER_TEXTURE_URL as l } from "../../Assets/index.js";
-import { CSS3DObjectPlus as h } from "../../../../CSS3DRenderPlugin/utils/three/CSS3DObject.js";
+import { POINT_HELPER_TEXTURE_URL as h } from "../../Assets/index.js";
+import { CSS3DObjectPlus as l } from "../../../../CSS3DRenderPlugin/utils/three/CSS3DObject.js";
 import { rangePieceImg as c } from "./html.js";
 import { initialCSS3DRender as d } from "../../../five/initialCSS3DRender.js";
 const p = `
@@ -13,7 +13,7 @@ void main() {
   vec4 mvPosition = modelViewMatrix * vec4(position, 1);
   gl_Position = projectionMatrix * mvPosition;
 }
-`, u = `
+`, M = `
 varying vec2 vUv;
 void main() {
   vec2 uv = vec2(vUv.x, vUv.y);
@@ -22,38 +22,38 @@ void main() {
   gl_FragColor = vec4(1.0,1.0,1.0,match);
 }
 `;
-function M() {
-  const n = new t.PlaneGeometry(0.4, 0.4), r = l, e = new t.TextureLoader().load(r);
+function u() {
+  const r = new t.PlaneGeometry(0.4, 0.4), s = h, e = new t.TextureLoader().load(s);
   e.encoding = t.sRGBEncoding, e.minFilter = t.LinearFilter;
-  const o = new t.MeshBasicMaterial({
+  const i = new t.MeshBasicMaterial({
     map: e,
     transparent: !0,
     depthTest: !1
   });
-  return new t.Mesh(n, o);
+  return new t.Mesh(r, i);
 }
-function m() {
-  const n = new t.CurvePath();
-  n.add(new t.LineCurve3(new t.Vector3(0, 0, 0), new t.Vector3(0, 0, 0.1)));
-  const r = new t.TubeGeometry(n, 8, 3e-3), e = new t.ShaderMaterial({
+function v() {
+  const r = new t.CurvePath();
+  r.add(new t.LineCurve3(new t.Vector3(0, 0, 0), new t.Vector3(0, 0, 0.1)));
+  const s = new t.TubeGeometry(r, 8, 3e-3), e = new t.ShaderMaterial({
     vertexShader: p,
-    fragmentShader: u,
+    fragmentShader: M,
     depthTest: !1,
     transparent: !0
   });
-  return new t.Mesh(r, e);
+  return new t.Mesh(s, e);
 }
-function v() {
-  const n = new t.SphereGeometry(0.01, 20, 20), r = new t.MeshBasicMaterial({
+function m() {
+  const r = new t.SphereGeometry(0.01, 20, 20), s = new t.MeshBasicMaterial({
     color: 10349931,
     depthTest: !1,
     transparent: !0,
     side: t.DoubleSide
-  }), e = new t.Mesh(n, r);
+  }), e = new t.Mesh(r, s);
   return e.position.set(0, 0, 0.1), e;
 }
-function w() {
-  const r = new h({
+function b() {
+  const s = new l({
     pointerEvents: "none",
     cornerPoints: [
       new t.Vector3(-0.2, 0.2, 0),
@@ -62,22 +62,26 @@ function w() {
       new t.Vector3(0.2, 0.2, 0)
     ]
   }), e = document.createElement("div");
-  return e.style.width = "100%", e.style.height = "100%", e.style.backgroundImage = `url(${c})`, e.style.backgroundSize = "100%", e.style.backgroundRepeat = "no-repeat", r.container.appendChild(e), r;
+  return e.style.width = "100%", e.style.height = "100%", e.style.backgroundImage = `url(${c})`, e.style.backgroundSize = "100%", e.style.backgroundRepeat = "no-repeat", s.container.appendChild(e), s;
 }
-class x extends t.Object3D {
+class T extends t.Object3D {
   constructor(e) {
     super();
-    s(this, "planeMesh");
-    s(this, "lineMesh");
-    s(this, "ballMesh");
-    s(this, "borderMesh");
-    this.planeMesh = M(), this.lineMesh = m(), this.ballMesh = v(), this.borderMesh = w(), this.add(this.planeMesh, this.lineMesh, this.ballMesh, this.borderMesh), d(e);
+    n(this, "planeMesh");
+    n(this, "lineMesh");
+    n(this, "ballMesh");
+    n(this, "borderMesh");
+    this.planeMesh = u(), this.lineMesh = v(), this.ballMesh = m(), this.borderMesh = b(), this.addEventListener("added", () => {
+      this.add(this.planeMesh, this.lineMesh, this.ballMesh, this.borderMesh);
+    }), this.addEventListener("removed", () => {
+      this.remove(this.planeMesh, this.lineMesh, this.ballMesh, this.borderMesh);
+    }), d(e);
   }
   updateWithIntersect(e) {
     if (!e.face)
       return;
-    const o = new t.Vector3().addVectors(e.point, e.face.normal);
-    this.position.copy(e.point), this.lookAt(o);
+    const i = new t.Vector3().addVectors(e.point, e.face.normal);
+    this.position.copy(e.point), this.lookAt(i);
   }
   show() {
     this.visible = !0, this.borderMesh.parent || this.add(this.borderMesh);
@@ -91,5 +95,5 @@ class x extends t.Object3D {
   }
 }
 export {
-  x as PointHelper
+  T as PointHelper
 };

package/package.json

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