@realsee/dnalogel 2.18.1 → 2.18.2

package/libs/GuideLinePlugin/GuideLineModeItem/index.js

@@ -2,15 +2,15 @@ var C = Object.defineProperty, y = Object.defineProperties;
 var k = Object.getOwnPropertyDescriptors;
 var c = Object.getOwnPropertySymbols;
 var w = Object.prototype.hasOwnProperty, F = Object.prototype.propertyIsEnumerable;
-var m = (a, e, i) => e in a ? C(a, e, { enumerable: !0, configurable: !0, writable: !0, value: i }) : a[e] = i, u = (a, e) => {
+var m = (o, e, i) => e in o ? C(o, e, { enumerable: !0, configurable: !0, writable: !0, value: i }) : o[e] = i, u = (o, e) => {
   for (var i in e || (e = {}))
-    w.call(e, i) && m(a, i, e[i]);
+    w.call(e, i) && m(o, i, e[i]);
   if (c)
     for (var i of c(e))
-      F.call(e, i) && m(a, i, e[i]);
-  return a;
-}, g = (a, e) => y(a, k(e));
-var t = (a, e, i) => (m(a, typeof e != "symbol" ? e + "" : e, i), i);
+      F.call(e, i) && m(o, i, e[i]);
+  return o;
+}, g = (o, e) => y(o, k(e));
+var t = (o, e, i) => (m(o, typeof e != "symbol" ? e + "" : e, i), i);
 import * as l from "three";
 import { logWarning as V, logError as T } from "../../shared-utils/log.js";
 import { createLineGeometry as U } from "../utils/createLineGeometry.js";
@@ -180,15 +180,15 @@ class B {
       this.mesh.material.uniforms.vOffset.value = i, this.mesh.material.uniformsNeedUpdate = !0, this.five.needsRender = !0;
     });
     t(this, "onFlickerAnimeUpdate", (e) => {
-      var o, s;
+      var n, s;
       const { progress: i } = e, r = 1 - i;
-      this.mesh.material.uniforms.flicker.value = r, this.mesh.material.uniformsNeedUpdate = !0, this.five.needsRender = !0, this.startTagContainer.tag && f(this.startTagContainer.tag) && ((o = this.startTagContainer.app) == null || o.$set(g(u({}, this.startTagContainer.tag.data), { opacity: r }))), this.endTagContainer.tag && f(this.endTagContainer.tag) && ((s = this.endTagContainer.app) == null || s.$set(g(u({}, this.endTagContainer.tag.data), { opacity: r })));
+      this.mesh.material.uniforms.flicker.value = r, this.mesh.material.uniformsNeedUpdate = !0, this.five.needsRender = !0, this.startTagContainer.tag && f(this.startTagContainer.tag) && ((n = this.startTagContainer.app) == null || n.$set(g(u({}, this.startTagContainer.tag.data), { opacity: r }))), this.endTagContainer.tag && f(this.endTagContainer.tag) && ((s = this.endTagContainer.app) == null || s.$set(g(u({}, this.endTagContainer.tag.data), { opacity: r })));
     });
     t(this, "logWarning", (e) => V("GuideLineModeItem: ", e));
     t(this, "logError", (e) => T("GuideLineModeItem: ", e));
-    var s, n;
+    var s, a;
     this.five = e, this.mode = i.mode, this.plugin = i.plugin, this.parent = i.parent, this.startTagContainer = { tag: null, plugin: new b(this.five) }, this.endTagContainer = { tag: null, plugin: new b(this.five) };
-    const r = new l.BufferGeometry(), o = new l.ShaderMaterial({
+    const r = new l.BufferGeometry(), n = new l.ShaderMaterial({
       vertexShader: S,
       fragmentShader: A,
       transparent: !0,
@@ -207,7 +207,7 @@ class B {
         vOffset: { value: 0 }
       }
     });
-    this.mesh = new l.Mesh(r, o), this.mesh.name = "GuideLineModeItem", this.mode === "panorama" && (this.parent.hooks.on("walkStart", this.onWalkAnimationStart), this.parent.hooks.on("walkEnded", this.onWalkAnimationEnd)), this.updateVisible(), this.onFiveModeChange(this.five.getCurrentState().mode), this.onFiveModelShownFloorChange((n = (s = this.five.model) == null ? void 0 : s.shownFloor) != null ? n : null), this.flowAnime.onUpdate(this.onFlowAnimeUpdate), this.flickerAnime.onUpdate(this.onFlickerAnimeUpdate), this.parent.hooks.on("show", this.updateVisible), this.parent.hooks.on("hide", this.updateVisible), this.plugin.hooks.on("show", this.updateVisible), this.plugin.hooks.on("hide", this.updateVisible), this.plugin.hooks.on("enable", this.updateVisible), this.plugin.hooks.on("disable", this.updateVisible), this.plugin.hooks.on("dispose", this.dispose), this.five.on("modeChange", this.onFiveModeChange), this.five.on("modelShownFloorChange", this.onFiveModelShownFloorChange);
+    this.mesh = new l.Mesh(r, n), this.mesh.name = "GuideLineModeItem", this.mode === "panorama" && (this.parent.hooks.on("walkStart", this.onWalkAnimationStart), this.parent.hooks.on("walkEnded", this.onWalkAnimationEnd)), this.updateVisible(), this.onFiveModeChange(this.five.getCurrentState().mode), this.onFiveModelShownFloorChange((a = (s = this.five.model) == null ? void 0 : s.shownFloor) != null ? a : null), this.flowAnime.onUpdate(this.onFlowAnimeUpdate), this.flickerAnime.onUpdate(this.onFlickerAnimeUpdate), this.parent.hooks.on("show", this.updateVisible), this.parent.hooks.on("hide", this.updateVisible), this.plugin.hooks.on("show", this.updateVisible), this.plugin.hooks.on("hide", this.updateVisible), this.plugin.hooks.on("enable", this.updateVisible), this.plugin.hooks.on("disable", this.updateVisible), this.plugin.hooks.on("dispose", this.dispose), this.five.on("modeChange", this.onFiveModeChange), this.five.on("modelShownFloorChange", this.onFiveModelShownFloorChange);
   }
   get panoGroup() {
     return this._panoGroup;
@@ -248,26 +248,26 @@ class B {
       return this.logError("setPathByPanoGroup: work is not ready");
     const r = P(e);
     if (this._panoGroup = r, (i == null ? void 0 : i.skipPanoGroup) !== void 0) {
-      const s = i.skipPanoGroup ? r.map((n) => this.five.work.observers[n]).map((n) => n.standingPosition.clone()) : null;
+      const s = i.skipPanoGroup ? r.map((a) => this.five.work.observers[a]).map((a) => a.standingPosition.clone()) : null;
       this.skippedPositions = s;
     }
-    const o = this.getPathFromPanoGroup(r, this.five.work, i);
-    this.path = o, this.setGeometryByPath(o, i);
+    const n = this.getPathFromPanoGroup(r, this.five.work, i);
+    this.path = n, this.setGeometryByPath(n, i);
   }
   /** 通过路径设置线条形状 */
   setGeometryByPath(e, i) {
     var h, p, v;
     if (this.disposed)
       return this.logError("disposed");
-    const r = (h = i == null ? void 0 : i.scale) != null ? h : this.scale, o = (p = i == null ? void 0 : i.width) != null ? p : this.width, s = (v = i == null ? void 0 : i.unit_length) != null ? v : this.unitLength;
-    this.path = e, this.scale = r, this.width = o, this.unitLength = s;
-    const { geometry: n, maxU: d } = U({
+    const r = (h = i == null ? void 0 : i.scale) != null ? h : this.scale, n = (p = i == null ? void 0 : i.width) != null ? p : this.width, s = (v = i == null ? void 0 : i.unit_length) != null ? v : this.unitLength;
+    this.path = e, this.scale = r, this.width = n, this.unitLength = s;
+    const { geometry: a, maxU: d } = U({
       path: e,
-      width: o * r,
+      width: n * r,
       unitLength: s * r,
       skipPositions: this.skippedPositions
     });
-    this.mesh.geometry = n, this.mesh.material.needsUpdate = !0, this.mesh.material.uniforms.maxU.value = d, this.five.needsRender = !0;
+    this.mesh.geometry = a, this.mesh.material.needsUpdate = !0, this.mesh.material.uniforms.maxU.value = d, this.five.needsRender = !0;
   }
   /** 设置线条材质 */
   setMartial(e) {
@@ -345,19 +345,21 @@ class B {
     this.flickerAnime.play();
   }
   setTag(e, i) {
-    const o = G({}, {
+    const r = e === "start" ? this.startTagContainer : this.endTagContainer;
+    i || r.plugin.clearTags();
+    const s = G({}, {
       contentType: "Custom",
       stickType: "2DPoint",
       config: { visibleConfig: { visibleFiveMode: ["Floorplan", "Mapview"], followModelVisibility: !1 } },
       style: { point: { enabled: !1 } },
       data: {}
-    }, i), s = e === "start" ? this.startTagContainer : this.endTagContainer;
-    s.tag = o, f(o) && (s.tag.element = (n) => {
+    }, i);
+    r.tag = s, f(s) && (r.tag.element = (a) => {
       var h;
-      (h = s.app) == null || h.$destroy();
-      const d = new O({ target: n, intro: !0, props: o.data });
-      return s.app = d, () => d.$destroy();
-    }), s.plugin.load({ tagList: [s.tag] });
+      (h = r.app) == null || h.$destroy();
+      const d = new O({ target: a, intro: !0, props: s.data });
+      return r.app = d, () => d.$destroy();
+    }), r.plugin.load({ tagList: [r.tag] });
   }
   doShow() {
     this.mode === "model" && this.flowAnime.play(), this.five.scene.add(this.mesh), this.startTagContainer.plugin.show(), this.endTagContainer.plugin.show(), this.five.needsRender = !0;
@@ -369,12 +371,12 @@ class B {
   getPathFromPanoGroup(e, i, r) {
     if (e.length < 2)
       return [];
-    const s = e.map((n) => i.observers[n]).map((n) => n.standingPosition.toArray());
+    const s = e.map((a) => i.observers[a]).map((a) => a.standingPosition.toArray());
     return [u({ type: "CatmullRomCurve3", points: s }, r)];
   }
 }
-function f(a) {
-  return a.contentType === "Custom";
+function f(o) {
+  return o.contentType === "Custom";
 }
 const Z = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,

package/libs/GuideLinePlugin/GuideLineModeItem.d.ts

@@ -86,8 +86,8 @@ declare class GuideLineModeItem {
     /** 设置贴图 */
     setTextureUrl(url: string): void;
     setVisibleFloorIndexes(floorIndexes: number[]): void;
-    setStartTag(tag: Tag | PluginType.ModelGuideLineTagData): void;
-    setEndTag(tag: Tag | PluginType.ModelGuideLineTagData): void;
+    setStartTag(tag: Tag | PluginType.ModelGuideLineTagData | null): void;
+    setEndTag(tag: Tag | PluginType.ModelGuideLineTagData | null): void;
     /** 闪烁 */
     flicker(): void;
     private setTag;

package/libs/base/BasePlugin.js

@@ -14,7 +14,7 @@ let n = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    e(this, "VERSION", "2.18.1");
+    e(this, "VERSION", "2.18.2");
     e(this, "five");
     /**
      * 插件事件钩子

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.info(
-    "%c %c@realsee/dnalogel %cv2.18.1",
+    "%c %c@realsee/dnalogel %cv2.18.2",
     [
       "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

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