@realsee/dnalogel 3.20.3 → 3.20.4

package/libs/GuideLinePlugin/GuideLineModeItem/index.js

@@ -1,32 +1,33 @@
-var P = Object.defineProperty, V = Object.defineProperties;
-var T = Object.getOwnPropertyDescriptors;
+var V = Object.defineProperty, T = Object.defineProperties;
+var U = Object.getOwnPropertyDescriptors;
 var k = Object.getOwnPropertySymbols;
-var U = Object.prototype.hasOwnProperty, x = Object.prototype.propertyIsEnumerable;
-var v = (h, e, t) => e in h ? P(h, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : h[e] = t, d = (h, e) => {
+var x = Object.prototype.hasOwnProperty, F = Object.prototype.propertyIsEnumerable;
+var v = (h, e, t) => e in h ? V(h, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : h[e] = t, d = (h, e) => {
   for (var t in e || (e = {}))
-    U.call(e, t) && v(h, t, e[t]);
+    x.call(e, t) && v(h, t, e[t]);
   if (k)
     for (var t of k(e))
-      x.call(e, t) && v(h, t, e[t]);
+      F.call(e, t) && v(h, t, e[t]);
   return h;
-}, p = (h, e) => V(h, T(e));
+}, p = (h, e) => T(h, U(e));
 var i = (h, e, t) => (v(h, typeof e != "symbol" ? e + "" : e, t), t);
 import * as n from "three";
-import { logWarning as F, logError as L } from "../../shared-utils/log.js";
-import { createLineGeometry as S } from "../utils/createLineGeometry.js";
-import { isPanoramaLike as O, isModelLike as _ } from "../../shared-utils/five/mode.js";
+import { logWarning as L, logError as S } from "../../shared-utils/log.js";
+import { createLineGeometry as O } from "../utils/createLineGeometry.js";
+import { isPanoramaLike as _, isModelLike as M } from "../../shared-utils/five/mode.js";
 import "hammerjs";
 import "@realsee/five";
 import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
-import { BetterTween as M, tweenProgress as E } from "../../shared-utils/animationFrame/BetterTween.js";
-import { loadTexture as A } from "../../shared-utils/three/loadTexture.js";
-import w from "../../PanoTagPlugin/controller/index.js";
-import G from "../Components/Tag.js";
-import { filterAdjacentDistinct as B } from "../utils/index.js";
-import { objectAssignDeepExports as W } from "../../vendor/object-assign-deep/objectAssignDeep.js";
-const I = (
+import { notNil as w } from "../../shared-utils/isNil.js";
+import { BetterTween as E, tweenProgress as A } from "../../shared-utils/animationFrame/BetterTween.js";
+import { loadTexture as G } from "../../shared-utils/three/loadTexture.js";
+import P from "../../PanoTagPlugin/controller/index.js";
+import B from "../Components/Tag.js";
+import { filterAdjacentDistinct as W } from "../utils/index.js";
+import { objectAssignDeepExports as I } from "../../vendor/object-assign-deep/objectAssignDeep.js";
+const R = (
   /* glsl */
   `
   varying vec2 vUv;
@@ -36,7 +37,7 @@ const I = (
     gl_Position = projectionMatrix * modelViewMatrix * vec4(position, 1.0);
   }
 `
-), R = (
+), N = (
   /* glsl */
   `
   // 是否使用颜色
@@ -138,7 +139,7 @@ const I = (
   }
 `
 );
-class N {
+class H {
   constructor(e, t) {
     i(this, "name", "");
     i(this, "startTagContainer");
@@ -173,8 +174,8 @@ class N {
     i(this, "plugin");
     i(this, "textureHasLoaded", !1);
     i(this, "disposed", !1);
-    i(this, "flowAnime", new M({ progress: 0 }).to({ progress: 1 }).duration(1500).repeat(1 / 0));
-    i(this, "flickerAnime", E(300).yoyo(!0).repeat(5));
+    i(this, "flowAnime", new E({ progress: 0 }).to({ progress: 1 }).duration(1500).repeat(1 / 0));
+    i(this, "flickerAnime", A(300).yoyo(!0).repeat(5));
     /** 缓存 panoGroup 中每个点距离起点的长度 */
     i(this, "cacheLengths", []);
     /** 为了让多条路线在高度上错开，每个路线都需要有个额外的 offset */
@@ -193,7 +194,7 @@ class N {
     });
     /** 模型状态变更 */
     i(this, "onFiveModeChange", (e) => {
-      this.modeVisible = this.mode === "panorama" ? O(e) : _(e), this.updateVisible();
+      this.modeVisible = this.mode === "panorama" ? _(e) : M(e), this.updateVisible();
     });
     i(this, "onFiveModelShownFloorChange", (e) => {
       this.floorVisible = e === null || this.visibleFloorIndexes === null || this.visibleFloorIndexes.includes(e), this.updateVisible();
@@ -216,13 +217,13 @@ class N {
         distance: Math.round((a = (r = this.curvePath) == null ? void 0 : r.getLength()) != null ? a : 0)
       }))), this.endTagContainer.tag && b(this.endTagContainer.tag) && ((l = this.endTagContainer.app) == null || l.$set(p(d({}, this.endTagContainer.tag.data), { opacity: s })));
     });
-    i(this, "logWarning", (e) => F("GuideLineModeItem: ", e));
-    i(this, "logError", (e) => L("GuideLineModeItem: ", e));
+    i(this, "logWarning", (e) => L("GuideLineModeItem: ", e));
+    i(this, "logError", (e) => S("GuideLineModeItem: ", e));
     var a, o;
-    this.five = e, this.mode = t.mode, this.plugin = t.plugin, this.parent = t.parent, this.startTagContainer = { tag: null, plugin: new w(this.five) }, this.endTagContainer = { tag: null, plugin: new w(this.five) };
+    this.five = e, this.mode = t.mode, this.plugin = t.plugin, this.parent = t.parent, this.startTagContainer = { tag: null, plugin: new P(this.five) }, this.endTagContainer = { tag: null, plugin: new P(this.five) };
     const s = new n.BufferGeometry(), r = new n.ShaderMaterial({
-      vertexShader: I,
-      fragmentShader: R,
+      vertexShader: R,
+      fragmentShader: N,
       transparent: !0,
       uniforms: {
         map: { value: null },
@@ -288,9 +289,9 @@ class N {
       return this.logError("disposed");
     if (!this.five.work)
       return this.logError("setPathByPanoGroup: work is not ready");
-    const s = B(e);
+    const s = W(e);
     if (this._panoGroup = s, (t == null ? void 0 : t.skipPanoGroup) !== void 0) {
-      const a = t.skipPanoGroup ? s.map((o) => this.plugin.workUtils.getObserverStandingPosition(o)) : null;
+      const a = t.skipPanoGroup ? s.map((o) => this.plugin.workUtils.getObserverStandingPosition(o)).filter(w) : null;
       this.skippedPositions = a;
     }
     const r = this.getPathFromPanoGroup(s, this.five.work, t);
@@ -303,7 +304,7 @@ class N {
       return this.logError("disposed");
     const s = (c = t == null ? void 0 : t.scale) != null ? c : this.scale, r = (y = t == null ? void 0 : t.width) != null ? y : this.width, a = (C = t == null ? void 0 : t.unit_length) != null ? C : this.unitLength;
     this.scale = s, this.width = r, this.unitLength = a;
-    const { geometry: o, maxU: l, curvePath: u, curvePoints: g } = S({
+    const { geometry: o, maxU: l, curvePath: u, curvePoints: g } = O({
       path: e,
       width: r * s,
       unitLength: a * s,
@@ -403,7 +404,7 @@ class N {
   setTextureUrl(e) {
     if (this.disposed)
       return this.logError("disposed");
-    this.textureUrl = e, A(e).then((t) => {
+    this.textureUrl = e, G(e).then((t) => {
       this.disposed || this.textureUrl === e && (t.wrapT = n.RepeatWrapping, this.textureHasLoaded = !0, this.mesh.material.uniforms.map.value = t, this.mesh.material.uniformsNeedUpdate = !0, this.mesh.material.needsUpdate = !0, this.five.needsRender = !0, this.updateVisible());
     });
   }
@@ -452,7 +453,7 @@ class N {
     const s = this.curvePath, r = e === "start" ? this.startTagContainer : this.endTagContainer;
     if (!(t != null && t.data))
       return r.plugin.clearTags();
-    const o = W({}, {
+    const o = I({}, {
       contentType: "Custom",
       stickType: "2DPoint",
       config: { visibleConfig: { visibleFiveMode: ["Floorplan", "Mapview"], followModelVisibility: !1 } },
@@ -462,7 +463,7 @@ class N {
     r.tag = o, b(o) && (r.tag.element = (u) => {
       var f, c;
       (f = r.app) == null || f.$destroy();
-      const g = e === "start" ? p(d({}, o.data), { name: this.name, distance: Math.round((c = s.getLength()) != null ? c : 0), i18n: this.plugin.config.i18n }) : o.data, m = new G({ target: u, intro: !0, props: g });
+      const g = e === "start" ? p(d({}, o.data), { name: this.name, distance: Math.round((c = s.getLength()) != null ? c : 0), i18n: this.plugin.config.i18n }) : o.data, m = new B({ target: u, intro: !0, props: g });
       return r.app = m, () => m.$destroy();
     }), r.plugin.load({ tagList: [r.tag] });
     const l = this.meshStyle.translate;
@@ -483,18 +484,21 @@ class N {
   getPathFromPanoGroup(e, t, s) {
     if (e.length < 2)
       return [];
-    const r = e.map((a) => this.plugin.workUtils.getObserverStandingPosition(a).toArray());
+    const r = e.map((a) => {
+      var o;
+      return (o = this.plugin.workUtils.getObserverStandingPosition(a)) == null ? void 0 : o.toArray();
+    }).filter(w);
     return [d({ type: "CatmullRomCurve3", points: r }, s)];
   }
 }
 function b(h) {
   return h.contentType === "Custom";
 }
-const re = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const oe = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  GuideLineModeItem: N
+  GuideLineModeItem: H
 }, Symbol.toStringTag, { value: "Module" }));
 export {
-  N as GuideLineModeItem,
-  re as GuideLineModeItem$1
+  H as GuideLineModeItem,
+  oe as GuideLineModeItem$1
 };

package/libs/GuideLinePlugin/GuideLineModeItem.js

@@ -7,6 +7,7 @@ import "@realsee/five";
 import "../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
+import "../shared-utils/isNil.js";
 import "../shared-utils/animationFrame/BetterTween.js";
 import "../shared-utils/three/loadTexture.js";
 import "../PanoTagPlugin/controller/index.js";
@@ -47,7 +48,6 @@ import "../PanoTagPlugin/controller/TagRender.js";
 import "../PanoTagPlugin/controller/TagComputer.js";
 import "../PanoTagPlugin/utils/tagPosition.js";
 import "../PanoTagPlugin/utils/checkRange.js";
-import "../shared-utils/isNil.js";
 import "../PanoTagPlugin/controller/TagUtil.js";
 import "../PanoTagPlugin/typings/tag/TagConfig.js";
 import "../PanoTagPlugin/tag.config.js";

package/libs/GuideLinePlugin/index.js

@@ -52,6 +52,7 @@ import "../vendor/gl-vec2/normalize.js";
 import "../vendor/gl-vec2/subtract.js";
 import "../vendor/gl-vec2/dot.js";
 import "../shared-utils/five/mode.js";
+import "../shared-utils/isNil.js";
 import "../shared-utils/animationFrame/BetterTween.js";
 import "../shared-utils/animationFrame/index.js";
 import "../shared-utils/three/loadTexture.js";
@@ -67,7 +68,6 @@ import "../PanoTagPlugin/controller/TagRender.js";
 import "../PanoTagPlugin/controller/TagComputer.js";
 import "../PanoTagPlugin/utils/tagPosition.js";
 import "../PanoTagPlugin/utils/checkRange.js";
-import "../shared-utils/isNil.js";
 import "../PanoTagPlugin/controller/TagUtil.js";
 import "../PanoTagPlugin/typings/tag/TagConfig.js";
 import "../PanoTagPlugin/tag.config.js";

package/libs/base/BasePlugin.js

@@ -14,7 +14,7 @@ let b = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.20.3");
+    i(this, "VERSION", "3.20.4");
     i(this, "five");
     /**
      * @description: 插件事件钩子

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.20.3",
+    "%c %c@realsee/dnalogel %cv3.20.4",
     [
       "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.20.3",
+  "version": "3.20.4",
   "main": "./dist/index.js",
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",
@@ -39,7 +39,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.22.9",
-    "@realsee/five": "alpha",
+    "@realsee/five": "6.0.0-alpha.74",
     "@sveltejs/vite-plugin-svelte": "^2.4.2",
     "@tsconfig/svelte": "^4.0.1",
     "@tweenjs/tween.js": "^23.1.1",