@realsee/dnalogel 2.16.0-14 → 2.16.0-16

package/libs/GuideLinePlugin/GuideLineModeItem/index.js

@@ -1,31 +1,32 @@
-var v = Object.defineProperty;
-var g = Object.getOwnPropertySymbols;
-var b = Object.prototype.hasOwnProperty, y = Object.prototype.propertyIsEnumerable;
-var d = (s, e, i) => e in s ? v(s, e, { enumerable: !0, configurable: !0, writable: !0, value: i }) : s[e] = i, f = (s, e) => {
+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 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 = {}))
-    b.call(e, i) && d(s, i, e[i]);
-  if (g)
-    for (var i of g(e))
-      y.call(e, i) && d(s, i, e[i]);
-  return s;
-};
-var t = (s, e, i) => (d(s, typeof e != "symbol" ? e + "" : e, i), i);
+    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]);
+  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 C, logError as k } from "../../shared-utils/log.js";
-import { createLineGeometry as w } from "../utils/createLineGeometry.js";
-import { isPanoramaLike as U, isModelLike as P } from "../../shared-utils/five/mode.js";
+import { logWarning as P, logError as T } 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 "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 x, tweenProgress as E } from "../../shared-utils/animationFrame/BetterTween.js";
-import { loadTexture as _ } from "../../shared-utils/three/loadTexture.js";
-import p from "../../PanoTagPlugin/controller/index.js";
-import T from "../Components/Tag.js";
-import { filterAdjacentDistinct as L } from "../utils/index.js";
-import { objectAssignDeepExports as O } from "../../vendor/object-assign-deep/objectAssignDeep.js";
-const V = (
+import { BetterTween as L, tweenProgress as O } from "../../shared-utils/animationFrame/BetterTween.js";
+import { loadTexture as V } 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";
+import { objectAssignDeepExports as F } from "../../vendor/object-assign-deep/objectAssignDeep.js";
+const A = (
   /* glsl */
   `
   varying vec2 vUv;
@@ -35,7 +36,7 @@ const V = (
     gl_Position = projectionMatrix * modelViewMatrix * vec4(position, 1.0);
   }
 `
-), G = (
+), S = (
   /* glsl */
   `
   // 是否使用颜色
@@ -119,7 +120,7 @@ const V = (
   }
 `
 );
-class M {
+class B {
   constructor(e, i) {
     t(this, "startTagContainer");
     t(this, "endTagContainer");
@@ -145,12 +146,12 @@ class M {
     t(this, "plugin");
     t(this, "textureHasLoaded", !1);
     t(this, "disposed", !1);
-    t(this, "flowAnime", new x({ progress: 0 }).to({ progress: 1 }).duration(5e3).repeat(1 / 0));
-    t(this, "flickerAnime", E(300).yoyo(!0).repeat(5));
+    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, "dispose", () => {
-      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());
+      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());
     });
-    t(this, "onTagContainerChange", (e, i) => new T({ target: e, intro: !0, props: i.data }).$destroy);
     /** 当设置 GuideLinePLugin 展示 */
     t(this, "onPluginShow", () => {
       this.updateVisible();
@@ -177,22 +178,23 @@ class M {
     });
     /** 模型状态变更 */
     t(this, "onFiveModeChange", (e) => {
-      this.modeVisible = this.mode === "panorama" ? U(e) : P(e), this.updateVisible();
+      this.modeVisible = this.mode === "panorama" ? E(e) : _(e), this.updateVisible();
     });
     t(this, "onFlowAnimeUpdate", (e) => {
       const { progress: i } = e;
       this.mesh.material.uniforms.vOffset.value = i, this.mesh.material.uniformsNeedUpdate = !0, this.five.needsRender = !0;
     });
     t(this, "onFlickerAnimeUpdate", (e) => {
-      const { progress: i } = e;
-      this.mesh.material.uniforms.flicker.value = 1 - i, this.mesh.material.uniformsNeedUpdate = !0, this.five.needsRender = !0;
+      var a, 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) && ((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) => C("GuideLineModeItem: ", e));
-    t(this, "logError", (e) => k("GuideLineModeItem: ", e));
-    this.five = e, this.mode = i.mode, this.plugin = i.plugin, this.parent = i.parent, this.startTagContainer = { tag: null, plugin: new p(this.five) }, this.endTagContainer = { tag: null, plugin: new p(this.five) };
+    t(this, "logWarning", (e) => P("GuideLineModeItem: ", e));
+    t(this, "logError", (e) => T("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({
-      vertexShader: V,
-      fragmentShader: G,
+      vertexShader: A,
+      fragmentShader: S,
       transparent: !0,
       uniforms: {
         map: { value: null },
@@ -244,28 +246,28 @@ class M {
       return this.logError("disposed");
     if (!this.five.work)
       return this.logError("setPathByPanoGroup: work is not ready");
-    const r = L(e);
+    const r = M(e);
     if (this._panoGroup = r, (i == null ? void 0 : i.skipPanoGroup) !== void 0) {
-      const o = i.skipPanoGroup ? r.map((n) => this.five.work.observers[n]).map((n) => n.standingPosition.clone()) : null;
-      this.skippedPositions = o;
+      const s = i.skipPanoGroup ? r.map((n) => this.five.work.observers[n]).map((n) => n.standingPosition.clone()) : null;
+      this.skippedPositions = s;
     }
     const a = this.getPathFromPanoGroup(r, this.five.work, i);
     this.path = a, this.setGeometryByPath(a, i);
   }
   /** 通过路径设置线条形状 */
   setGeometryByPath(e, i) {
-    var h, u, m;
+    var d, p, c;
     if (this.disposed)
       return this.logError("disposed");
-    const r = (h = i == null ? void 0 : i.scale) != null ? h : this.scale, a = (u = i == null ? void 0 : i.width) != null ? u : this.width, o = (m = i == null ? void 0 : i.unit_length) != null ? m : this.unitLength;
-    this.path = e, this.scale = r, this.width = a, this.unitLength = o;
-    const { geometry: n, maxU: c } = w({
+    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({
       path: e,
       width: a * r,
-      unitLength: o * r,
+      unitLength: s * r,
       skipPositions: this.skippedPositions
     });
-    this.mesh.geometry = n, this.mesh.material.needsUpdate = !0, this.mesh.material.uniforms.maxU.value = c, this.five.needsRender = !0;
+    this.mesh.geometry = n, this.mesh.material.needsUpdate = !0, this.mesh.material.uniforms.maxU.value = h, this.five.needsRender = !0;
   }
   /** 设置线条材质 */
   setMartial(e) {
@@ -320,7 +322,7 @@ class M {
   setTextureUrl(e) {
     if (this.disposed)
       return this.logError("disposed");
-    this.textureUrl = e, _(e).then((i) => {
+    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());
     });
   }
@@ -337,14 +339,19 @@ class M {
     this.flickerAnime.play();
   }
   setTag(e, i) {
-    const a = O({}, {
+    const a = F({}, {
       contentType: "Custom",
       stickType: "2DPoint",
       config: { visibleConfig: { visibleFiveMode: ["Floorplan", "Mapview"] } },
       style: { point: { enabled: !1 } },
       data: {}
-    }, i), o = e === "start" ? this.startTagContainer : this.endTagContainer;
-    o.tag = a, F(a) && (o.tag.element = (n) => this.onTagContainerChange(n, a)), o.plugin.load({ tagList: [o.tag] });
+    }, i), s = e === "start" ? this.startTagContainer : this.endTagContainer;
+    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();
+    }), s.plugin.load({ tagList: [s.tag] });
   }
   /** 更新可见性 */
   updateVisible() {
@@ -361,18 +368,18 @@ class M {
   getPathFromPanoGroup(e, i, r) {
     if (e.length < 2)
       return [];
-    const o = e.map((n) => i.observers[n]).map((n) => n.standingPosition.toArray());
-    return [f({ type: "CatmullRomCurve3", points: o }, r)];
+    const s = e.map((n) => i.observers[n]).map((n) => n.standingPosition.toArray());
+    return [u({ type: "CatmullRomCurve3", points: s }, r)];
   }
 }
-function F(s) {
-  return s.contentType === "Custom";
+function f(o) {
+  return o.contentType === "Custom";
 }
-const Q = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const Z = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  GuideLineModeItem: M
+  GuideLineModeItem: B
 }, Symbol.toStringTag, { value: "Module" }));
 export {
-  M as GuideLineModeItem,
-  Q as GuideLineModeItem$1
+  B as GuideLineModeItem,
+  Z as GuideLineModeItem$1
 };

package/libs/GuideLinePlugin/GuideLineModeItem.d.ts

@@ -5,11 +5,13 @@ import type * as PluginType from './typing';
 import type { GuideLineItem } from './GuideLineItem';
 import * as THREE from 'three';
 import { PanoTagPluginController } from '../PanoTagPlugin';
+import CustomTag from './Components/Tag.svelte';
 /** @link https://threejs.org/docs/index.html#api/en/extras/curves/CatmullRomCurve3 */
 type CatmullRomCurve3RestParams = Omit<PluginType.CatmullRomCurve3, 'type' | 'points'>;
 export interface GuideLineTagContainer {
     tag: Tag | null;
     plugin: PanoTagPluginController;
+    app?: CustomTag;
 }
 /** 在不同模态下的 GuideLine */
 declare class GuideLineModeItem {
@@ -78,12 +80,11 @@ declare class GuideLineModeItem {
     setMapOpacity(opacity: number): void;
     /** 设置贴图 */
     setTextureUrl(url: string): void;
-    setStartTag(tag: Tag): void;
-    setEndTag(tag: Tag): void;
+    setStartTag(tag: Tag | PluginType.ModelGuideLineTagData): void;
+    setEndTag(tag: Tag | PluginType.ModelGuideLineTagData): void;
     /** 闪烁 */
     flicker(): void;
     private setTag;
-    private onTagContainerChange;
     /** 当设置 GuideLinePLugin 展示 */
     private onPluginShow;
     /** 当设置 GuideLinePLugin 隐藏 */

package/libs/GuideLinePlugin/typing.d.ts

@@ -70,7 +70,7 @@ export type GuideLineItem = RequireAtLeastOne<{
     /** 可展示的楼层 */
     visible_floor_indexes?: null | number[];
     /** 点位数组 */
-    pano_group?: number[];
+    pano_group?: null | number[];
     /** 路径：由多个曲线组合而成的路径，路径为空时，会使用 pano_group 自动创建 */
     path?: PathItem[];
     /** 全景态使用的数据 */
@@ -85,8 +85,8 @@ export interface PanoramaGuideLineStyle extends GuideLineStyle {
 }
 /** 模型路径样式 */
 export interface ModelGuideLineStyle extends GuideLineStyle {
-    start_tag?: ModelGuideLineTag;
-    end_tag?: ModelGuideLineTag;
+    start_tag?: ModelGuideLineTagData;
+    end_tag?: ModelGuideLineTagData;
 }
 /** 不同模态下的路线数据 */
 export type GuideLineStyle = GuideLineGeometryStyle & GuideLineMaterialStyle;
@@ -116,19 +116,20 @@ export interface GuideLineMaterialStyle {
     /** 透明度 */
     opacity?: number;
     /** 贴图 */
-    texture?: {
+    texture?: null | {
         /** 贴图地址 */
         url: string;
     };
 }
-/** 模型路线引导标签 */
-export interface ModelGuideLineTag extends Tag<'Custom', '2DPoint'> {
+export interface ModelGuideLineTagData {
     position: number[];
     data: {
         text: string;
         icon_url: string;
     };
 }
+/** 模型路线引导标签 */
+export type ModelGuideLineTag = Tag<'Custom', '2DPoint'> & ModelGuideLineTagData;
 /** 目前只支持 CatmullRomCurve3 */
 export type PathItem = CatmullRomCurve3;
 /** @link https://threejs.org/docs/index.html?q=cu#api/zh/extras/curves/CatmullRomCurve3 */

package/libs/PanoTagPlugin/controller/TagComputer.d.ts

@@ -24,11 +24,11 @@ export declare abstract class TagComputer extends TagUtil {
     /**
      * @description: 获取是否展开
      */
-    getUnfoldedByPanoIndex(tag: Tag<any>, panoIndex?: number): boolean;
+    getUnfoldedByPanoIndex(tag: TagElement<any>, panoIndex?: number): boolean;
     /**
      * @description: 获取是否展开
      */
-    getUnfoldedByCamera(tag: Tag<any, any>): boolean;
+    getUnfoldedByCamera(tag: TagElement<any, any>): boolean;
     protected sort<T extends Tag<any, any>>(tags: T[]): T[];
     /**
      * @description: 一个点的标签
@@ -41,7 +41,7 @@ export declare abstract class TagComputer extends TagUtil {
     /**
      * @description: 一个点的标签
      */
-    protected getTagProject(tag: Tag<any, any>): {
+    protected getTagProject(tag: TagElement<any, any>): {
         x: number;
         y: number;
         z: number;

package/libs/PanoTagPlugin/controller/TagComputer.js

@@ -1,15 +1,15 @@
-var B = Object.defineProperty, U = Object.defineProperties;
+var U = Object.defineProperty, B = Object.defineProperties;
 var M = Object.getOwnPropertyDescriptors;
 var x = Object.getOwnPropertySymbols;
 var R = Object.prototype.hasOwnProperty, D = Object.prototype.propertyIsEnumerable;
-var y = (d, f, e) => f in d ? B(d, f, { enumerable: !0, configurable: !0, writable: !0, value: e }) : d[f] = e, I = (d, f) => {
+var y = (d, f, e) => f in d ? U(d, f, { enumerable: !0, configurable: !0, writable: !0, value: e }) : d[f] = e, I = (d, f) => {
   for (var e in f || (f = {}))
     R.call(f, e) && y(d, e, f[e]);
   if (x)
     for (var e of x(f))
       D.call(f, e) && y(d, e, f[e]);
   return d;
-}, P = (d, f) => U(d, M(f));
+}, P = (d, f) => B(d, M(f));
 var T = (d, f, e) => (y(d, typeof f != "symbol" ? f + "" : f, e), e);
 import * as C from "three";
 import { isMediaModelTag as m, is3DTag as j } from "../utils/tag/tagCheck.js";
@@ -188,7 +188,8 @@ class be extends S {
    * @description: 获取是否展开
    */
   getUnfoldedByCamera(e) {
-    return this.getVisibleByPanoIndex(e) ? (() => {
+    const i = this.getVisible(e);
+    return console.log("🐶 ==> visible:", i), i ? (() => {
       var l;
       const s = this.getDistance(e), t = this.getTagConfig(e).unfoldedConfig;
       if (t) {
@@ -290,7 +291,7 @@ class be extends S {
    * @description: 一个点的标签
    */
   getTagProject(e) {
-    if (!this.getVisibleByPanoIndex(e))
+    if (!this.getVisible(e))
       return;
     const n = V(e.position);
     if (!n)

package/libs/base/BasePlugin.js

@@ -14,7 +14,7 @@ let n = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    e(this, "VERSION", "2.16.0-14");
+    e(this, "VERSION", "2.16.0-16");
     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-14", "background-color: #12ce9b;color:black;padding:0 6px;border-radius: 3px");
+console.info("@realsee/dnalogel %cv2.16.0-16", "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-14",
+  "version": "2.16.0-16",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
     "clean": "rm -rf components dist docs libs types ./vite.config.js.timestamp*",