@realsee/dnalogel 2.16.0-16 → 2.16.0-17

package/libs/GuideLinePlugin/GuideLineModeItem/index.js

@@ -1,27 +1,27 @@
 var C = Object.defineProperty, y = Object.defineProperties;
 var k = Object.getOwnPropertyDescriptors;
 var v = Object.getOwnPropertySymbols;
-var w = Object.prototype.hasOwnProperty, U = Object.prototype.propertyIsEnumerable;
+var w = Object.prototype.hasOwnProperty, T = Object.prototype.propertyIsEnumerable;
 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(o, i, e[i]);
   if (v)
     for (var i of v(e))
-      U.call(e, i) && m(o, i, e[i]);
+      T.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 P, logError as T } from "../../shared-utils/log.js";
+import * as h from "three";
+import { logWarning as U, logError as V } from "../../shared-utils/log.js";
 import { createLineGeometry as x } from "../utils/createLineGeometry.js";
-import { isPanoramaLike as E, isModelLike as _ } from "../../shared-utils/five/mode.js";
+import { isPanoramaLike as _, isModelLike as L } 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 L, tweenProgress as O } from "../../shared-utils/animationFrame/BetterTween.js";
-import { loadTexture as V } from "../../shared-utils/three/loadTexture.js";
+import { BetterTween as O, tweenProgress as E } from "../../shared-utils/animationFrame/BetterTween.js";
+import { loadTexture as P } from "../../shared-utils/three/loadTexture.js";
 import b from "../../PanoTagPlugin/controller/index.js";
 import G from "../Components/Tag.js";
 import { filterAdjacentDistinct as M } from "../utils/index.js";
@@ -36,7 +36,7 @@ const A = (
     gl_Position = projectionMatrix * modelViewMatrix * vec4(position, 1.0);
   }
 `
-), S = (
+), B = (
   /* glsl */
   `
   // 是否使用颜色
@@ -120,7 +120,7 @@ const A = (
   }
 `
 );
-class B {
+class S {
   constructor(e, i) {
     t(this, "startTagContainer");
     t(this, "endTagContainer");
@@ -146,27 +146,11 @@ class B {
     t(this, "plugin");
     t(this, "textureHasLoaded", !1);
     t(this, "disposed", !1);
-    t(this, "flowAnime", new L({ progress: 0 }).to({ progress: 1 }).duration(5e3).repeat(1 / 0));
-    t(this, "flickerAnime", O(300).yoyo(!0).repeat(5));
+    t(this, "flowAnime", new O({ progress: 0 }).to({ progress: 1 }).duration(5e3).repeat(1 / 0));
+    t(this, "flickerAnime", E(300).yoyo(!0).repeat(5));
     t(this, "dispose", () => {
       var e, i;
-      this.disposed || (this.disposed = !0, this.five.off("modeChange", this.onFiveModeChange), this.plugin.hooks.off("show", this.onPluginShow), this.plugin.hooks.off("hide", this.onPluginHide), this.plugin.hooks.off("enable", this.onPluginEnable), this.plugin.hooks.off("disable", this.onPluginDisable), this.doHide(), (e = this.startTagContainer) == null || e.plugin.dispose(), (i = this.endTagContainer) == null || i.plugin.dispose());
-    });
-    /** 当设置 GuideLinePLugin 展示 */
-    t(this, "onPluginShow", () => {
-      this.updateVisible();
-    });
-    /** 当设置 GuideLinePLugin 隐藏 */
-    t(this, "onPluginHide", () => {
-      this.updateVisible();
-    });
-    /** 当设置 GuideLinePLugin 开启 */
-    t(this, "onPluginEnable", () => {
-      this.updateVisible();
-    });
-    /** 当设置 GuideLinePLugin 关闭 */
-    t(this, "onPluginDisable", () => {
-      this.updateVisible();
+      this.disposed || (this.disposed = !0, this.five.off("modeChange", this.onFiveModeChange), this.parent.hooks.off("show", this.updateVisible), this.parent.hooks.off("hide", this.updateVisible), this.plugin.hooks.off("show", this.updateVisible), this.plugin.hooks.off("hide", this.updateVisible), this.plugin.hooks.off("enable", this.updateVisible), this.plugin.hooks.off("disable", this.updateVisible), this.doHide(), (e = this.startTagContainer) == null || e.plugin.dispose(), (i = this.endTagContainer) == null || i.plugin.dispose());
     });
     /** 开始走点动画 */
     t(this, "onWalkAnimationStart", () => {
@@ -178,7 +162,12 @@ class B {
     });
     /** 模型状态变更 */
     t(this, "onFiveModeChange", (e) => {
-      this.modeVisible = this.mode === "panorama" ? E(e) : _(e), this.updateVisible();
+      this.modeVisible = this.mode === "panorama" ? _(e) : L(e), this.updateVisible();
+    });
+    /** 更新可见性 */
+    t(this, "updateVisible", () => {
+      const e = (() => !this.parent.visible || !this.plugin.state.enabled || !this.plugin.state.visible ? !1 : this.customVisible !== null ? this.customVisible : this.inWalkAnimation ? !0 : this.modeVisible && this.textureHasLoaded && this.defaultVisible)();
+      this.visible !== e && (this.visible = e, e ? this.doShow() : this.doHide());
     });
     t(this, "onFlowAnimeUpdate", (e) => {
       const { progress: i } = e;
@@ -189,21 +178,21 @@ class B {
       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) && ((a = this.startTagContainer.app) == null || a.$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) => P("GuideLineModeItem: ", e));
-    t(this, "logError", (e) => T("GuideLineModeItem: ", e));
+    t(this, "logWarning", (e) => U("GuideLineModeItem: ", e));
+    t(this, "logError", (e) => V("GuideLineModeItem: ", e));
     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(), a = new l.ShaderMaterial({
+    const r = new h.BufferGeometry(), a = new h.ShaderMaterial({
       vertexShader: A,
-      fragmentShader: S,
+      fragmentShader: B,
       transparent: !0,
       uniforms: {
         map: { value: null },
         useMapColor: { value: 0 },
-        mapColor: { value: new l.Color() },
+        mapColor: { value: new h.Color() },
         mapOpacity: { value: 1 },
-        backgroundColor: { value: new l.Color() },
+        backgroundColor: { value: new h.Color() },
         backgroundOpacity: { value: 0 },
-        borderColor: { value: new l.Color() },
+        borderColor: { value: new h.Color() },
         borderOpacity: { value: 0 },
         opacity: { value: 1 },
         flicker: { value: 1 },
@@ -211,7 +200,7 @@ class B {
         vOffset: { value: 0 }
       }
     });
-    this.mesh = new l.Mesh(r, a), this.mesh.name = "GuideLineModeItem", this.mode === "panorama" && (this.parent.hooks.on("walkStart", this.onWalkAnimationStart), this.parent.hooks.on("walkEnded", this.onWalkAnimationEnd)), this.flowAnime.onUpdate(this.onFlowAnimeUpdate), this.flickerAnime.onUpdate(this.onFlickerAnimeUpdate), this.plugin.hooks.on("show", this.onPluginShow), this.plugin.hooks.on("hide", this.onPluginHide), this.plugin.hooks.on("enable", this.onPluginEnable), this.plugin.hooks.on("disable", this.onPluginDisable), this.plugin.hooks.on("dispose", this.dispose), this.five.on("modeChange", this.onFiveModeChange), this.onFiveModeChange(this.five.getCurrentState().mode);
+    this.mesh = new h.Mesh(r, a), this.mesh.name = "GuideLineModeItem", this.mode === "panorama" && (this.parent.hooks.on("walkStart", this.onWalkAnimationStart), this.parent.hooks.on("walkEnded", this.onWalkAnimationEnd)), 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.onFiveModeChange(this.five.getCurrentState().mode);
   }
   get panoGroup() {
     return this._panoGroup;
@@ -261,13 +250,13 @@ class B {
       return this.logError("disposed");
     const r = (d = i == null ? void 0 : i.scale) != null ? d : this.scale, a = (p = i == null ? void 0 : i.width) != null ? p : this.width, s = (c = i == null ? void 0 : i.unit_length) != null ? c : this.unitLength;
     this.path = e, this.scale = r, this.width = a, this.unitLength = s;
-    const { geometry: n, maxU: h } = x({
+    const { geometry: n, maxU: l } = x({
       path: e,
       width: a * r,
       unitLength: s * r,
       skipPositions: this.skippedPositions
     });
-    this.mesh.geometry = n, this.mesh.material.needsUpdate = !0, this.mesh.material.uniforms.maxU.value = h, this.five.needsRender = !0;
+    this.mesh.geometry = n, this.mesh.material.needsUpdate = !0, this.mesh.material.uniforms.maxU.value = l, this.five.needsRender = !0;
   }
   /** 设置线条材质 */
   setMartial(e) {
@@ -280,13 +269,13 @@ class B {
   setColor(e) {
     if (this.disposed)
       return this.logError("disposed");
-    e && (this.mesh.material.uniforms.mapColor.value = new l.Color().set(e)), this.mesh.material.uniforms.useMapColor.value = e ? 1 : 0, this.mesh.material.uniformsNeedUpdate = !0, this.five.needsRender = !0;
+    e && (this.mesh.material.uniforms.mapColor.value = new h.Color().set(e)), this.mesh.material.uniforms.useMapColor.value = e ? 1 : 0, this.mesh.material.uniformsNeedUpdate = !0, this.five.needsRender = !0;
   }
   /** 设置边框 */
   setBorderColor(e) {
     if (this.disposed)
       return this.logError("disposed");
-    this.mesh.material.uniforms.borderColor.value = new l.Color().set(e), this.mesh.material.uniformsNeedUpdate = !0, this.five.needsRender = !0;
+    this.mesh.material.uniforms.borderColor.value = new h.Color().set(e), this.mesh.material.uniformsNeedUpdate = !0, this.five.needsRender = !0;
   }
   /** 设置边框透明度 */
   setBorderOpacity(e) {
@@ -298,7 +287,7 @@ class B {
   setBackgroundColor(e) {
     if (this.disposed)
       return this.logError("disposed");
-    console.log("🐶 ==> color:", e), this.mesh.material.uniforms.backgroundColor.value = new l.Color().set(e), this.mesh.material.uniformsNeedUpdate = !0, this.five.needsRender = !0;
+    this.mesh.material.uniforms.backgroundColor.value = new h.Color().set(e), this.mesh.material.uniformsNeedUpdate = !0, this.five.needsRender = !0;
   }
   /** 设置背景透明度 */
   setBackgroundOpacity(e) {
@@ -322,8 +311,8 @@ class B {
   setTextureUrl(e) {
     if (this.disposed)
       return this.logError("disposed");
-    this.textureUrl = e, V(e).then((i) => {
-      this.disposed || this.textureUrl === e && (i.wrapT = l.RepeatWrapping, this.textureHasLoaded = !0, this.mesh.material.uniforms.map.value = i, this.mesh.material.uniformsNeedUpdate = !0, this.mesh.material.needsUpdate = !0, this.five.needsRender = !0, this.updateVisible());
+    this.textureUrl = e, P(e).then((i) => {
+      this.disposed || this.textureUrl === e && (i.wrapT = h.RepeatWrapping, this.textureHasLoaded = !0, this.mesh.material.uniforms.map.value = i, this.mesh.material.uniformsNeedUpdate = !0, this.mesh.material.needsUpdate = !0, this.five.needsRender = !0, this.updateVisible());
     });
   }
   setStartTag(e) {
@@ -349,20 +338,15 @@ class B {
     s.tag = a, f(a) && (s.tag.element = (n) => {
       var d;
       (d = s.app) == null || d.$destroy();
-      const h = new G({ target: n, intro: !0, props: a.data });
-      return s.app = h, () => h.$destroy();
+      const l = new G({ target: n, intro: !0, props: a.data });
+      return s.app = l, () => l.$destroy();
     }), s.plugin.load({ tagList: [s.tag] });
   }
-  /** 更新可见性 */
-  updateVisible() {
-    const e = (() => !this.plugin.state.enabled || !this.plugin.state.visible ? !1 : this.customVisible !== null ? this.customVisible : this.inWalkAnimation ? !0 : this.modeVisible && this.textureHasLoaded && this.defaultVisible)();
-    this.visible !== e && (this.visible = e, e ? this.doShow() : this.doHide());
-  }
   doShow() {
-    this.mode === "model" && this.flowAnime.play(), this.five.scene.add(this.mesh), this.five.needsRender = !0;
+    this.mode === "model" && this.flowAnime.play(), this.five.scene.add(this.mesh), this.startTagContainer.plugin.show(), this.endTagContainer.plugin.show(), this.five.needsRender = !0;
   }
   doHide() {
-    this.mode === "model" && this.flowAnime.stop(), this.five.scene.remove(this.mesh), this.five.needsRender = !0;
+    this.mode === "model" && this.flowAnime.stop(), this.five.scene.remove(this.mesh), this.startTagContainer.plugin.hide(), this.endTagContainer.plugin.hide(), this.five.needsRender = !0;
   }
   /** 通过 panoIndex 数组计算路径 */
   getPathFromPanoGroup(e, i, r) {
@@ -377,9 +361,9 @@ function f(o) {
 }
 const Z = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  GuideLineModeItem: B
+  GuideLineModeItem: S
 }, Symbol.toStringTag, { value: "Module" }));
 export {
-  B as GuideLineModeItem,
+  S as GuideLineModeItem,
   Z as GuideLineModeItem$1
 };

package/libs/GuideLinePlugin/GuideLineModeItem.d.ts

@@ -85,14 +85,6 @@ declare class GuideLineModeItem {
     /** 闪烁 */
     flicker(): void;
     private setTag;
-    /** 当设置 GuideLinePLugin 展示 */
-    private onPluginShow;
-    /** 当设置 GuideLinePLugin 隐藏 */
-    private onPluginHide;
-    /** 当设置 GuideLinePLugin 开启 */
-    private onPluginEnable;
-    /** 当设置 GuideLinePLugin 关闭 */
-    private onPluginDisable;
     /** 开始走点动画 */
     private onWalkAnimationStart;
     /** 结束走点动画 */

package/libs/GuideLinePlugin/typing.d.ts

@@ -41,6 +41,12 @@ export interface EventMap extends BasePluginWithData.EventMap<PluginState, Plugi
     }) => void;
 }
 export type GuideLineItemEventMap = {
+    show: (options: {
+        userAction: boolean;
+    }) => void;
+    hide: (options: {
+        userAction: boolean;
+    }) => void;
     walkStart: (options: {
         userAction: boolean;
     }) => void;

package/libs/PanoTagPlugin/controller/TagComputer.js

@@ -188,8 +188,7 @@ class be extends S {
    * @description: 获取是否展开
    */
   getUnfoldedByCamera(e) {
-    const i = this.getVisible(e);
-    return console.log("🐶 ==> visible:", i), i ? (() => {
+    return this.getVisible(e) ? (() => {
       var l;
       const s = this.getDistance(e), t = this.getTagConfig(e).unfoldedConfig;
       if (t) {

package/libs/base/BasePlugin.js

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

package/libs/index.js

@@ -363,7 +363,7 @@ import "./shared-utils/three/PointHelper.js";
 import "./shared-utils/three/Assets/index.js";
 import "./shared-utils/three/PointDomHelper.js";
 import "./shared-utils/three/FivePointSelector.js";
-console.info("@realsee/dnalogel %cv2.16.0-16", "background-color: #12ce9b;color:black;padding:0 6px;border-radius: 3px");
+console.info("@realsee/dnalogel %cv2.16.0-17", "background-color: #12ce9b;color:black;padding:0 6px;border-radius: 3px");
 export {
   le as CSS3DRender,
   Zm as CSS3DRenderPlugin,

package/package.json

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