@realsee/dnalogel 2.16.0-13 → 2.16.0-14

package/libs/GuideLinePlugin/GuideLineItem/index.js

@@ -1,118 +1,117 @@
-var G = Object.defineProperty;
+var L = Object.defineProperty;
 var w = Object.getOwnPropertySymbols;
-var L = Object.prototype.hasOwnProperty, P = Object.prototype.propertyIsEnumerable;
-var d = (o, e, t) => e in o ? G(o, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : o[e] = t, c = (o, e) => {
+var S = Object.prototype.hasOwnProperty, _ = Object.prototype.propertyIsEnumerable;
+var d = (o, e, t) => e in o ? L(o, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : o[e] = t, h = (o, e) => {
   for (var t in e || (e = {}))
-    L.call(e, t) && d(o, t, e[t]);
+    S.call(e, t) && d(o, t, e[t]);
   if (w)
     for (var t of w(e))
-      P.call(e, t) && d(o, t, e[t]);
+      _.call(e, t) && d(o, t, e[t]);
   return o;
 };
 var s = (o, e, t) => (d(o, typeof e != "symbol" ? e + "" : e, t), t);
-var h = (o, e, t) => new Promise((r, n) => {
-  var l = (i) => {
+var c = (o, e, t) => new Promise((r, n) => {
+  var l = (a) => {
     try {
-      a(t.next(i));
-    } catch (m) {
-      n(m);
+      i(t.next(a));
+    } catch (p) {
+      n(p);
     }
-  }, p = (i) => {
+  }, m = (a) => {
     try {
-      a(t.throw(i));
-    } catch (m) {
-      n(m);
+      i(t.throw(a));
+    } catch (p) {
+      n(p);
     }
-  }, a = (i) => i.done ? r(i.value) : Promise.resolve(i.value).then(l, p);
-  a((t = t.apply(o, e)).next());
+  }, i = (a) => a.done ? r(a.value) : Promise.resolve(a.value).then(l, m);
+  i((t = t.apply(o, e)).next());
 });
-import { objectAssignDeepExports as S } from "../../vendor/object-assign-deep/objectAssignDeep.js";
-import { GuideLineModeItem as x } from "../GuideLineModeItem/index.js";
-import _ from "../../CruisePlugin/Controller.js";
-import { logError as k } from "../../shared-utils/log.js";
-import { to as v } from "../../shared-utils/to.js";
-import { Subscribe as C } from "@realsee/five";
-import { changeMode as b } from "../../shared-utils/five/changeMode.js";
-class E {
+import { GuideLineModeItem as y } from "../GuideLineModeItem/index.js";
+import P from "../../CruisePlugin/Controller.js";
+import { logError as x } from "../../shared-utils/log.js";
+import { to as k } from "../../shared-utils/to.js";
+import { Subscribe as v } from "@realsee/five";
+import { changeMode as C } from "../../shared-utils/five/changeMode.js";
+class M {
   constructor(e) {
     s(this, "id");
     s(this, "renderID");
     s(this, "isGuideLine", !0);
     s(this, "panoramaItem");
     s(this, "modelItem");
-    s(this, "hooks", new C());
+    s(this, "hooks", new v());
     s(this, "plugin");
     s(this, "five");
-    s(this, "logError", (e) => k("GuideLineItem: ", e));
-    this.id = e.id, this.five = e.five, this.plugin = e.plugin, this.panoramaItem = new x(this.five, { mode: "panorama", plugin: this.plugin, parent: this }), this.modelItem = new x(this.five, { mode: "model", plugin: this.plugin, parent: this });
+    s(this, "logError", (e) => x("GuideLineItem: ", e));
+    this.id = e.id, this.five = e.five, this.plugin = e.plugin, this.panoramaItem = new y(this.five, { mode: "panorama", plugin: this.plugin, parent: this }), this.modelItem = new y(this.five, { mode: "model", plugin: this.plugin, parent: this });
   }
   setData(e) {
     this.setDataByMode("panorama", e), this.setDataByMode("model", e);
   }
   setDataByMode(e, t) {
-    const r = e === "panorama" ? this.panoramaItem : this.modelItem, n = e === "panorama" ? t.panorama_style : t.model_style, l = t.path, p = { url: this.plugin.staticPrefix + "/release/web/arrow6.b6ce0c62.png" }, a = n, i = S({ texture: p }, n);
+    const r = e === "panorama" ? this.panoramaItem : this.modelItem, n = e === "panorama" ? t.panorama_style : t.model_style, l = t.path, m = n, i = n;
     if (t.pano_group) {
-      const m = e === "panorama";
-      r.setGeometryByPanoGroup(t.pano_group, c({ skipPanoGroup: m }, a));
+      const a = e === "panorama";
+      r.setGeometryByPanoGroup(t.pano_group, h({ skipPanoGroup: a }, m));
     } else
-      t.path && r.setGeometryByPath(l, a);
+      t.path && r.setGeometryByPath(l, m);
     r.setMartial(i), n != null && n.start_tag && r.setStartTag(n.start_tag), n != null && n.end_tag && r.setEndTag(n.end_tag);
   }
   dispose() {
     this.panoramaItem.dispose(), this.modelItem.dispose();
   }
   walk(e) {
-    return h(this, null, function* () {
+    return c(this, null, function* () {
       if (!this.panoramaItem.panoGroup)
         return;
-      const t = c({ panoIndexList: this.panoramaItem.panoGroup }, e);
+      const t = h({ panoIndexList: this.panoramaItem.panoGroup }, e);
       this.hooks.emit("walkStart", { userAction: !0 });
-      const [r] = yield v(M(this.five, t));
+      const [r] = yield k(E(this.five, t));
       if (this.hooks.emit("walkEnded", { userAction: !0 }), r)
         return this.logError(r.message);
     });
   }
 }
-function M(o, e) {
-  return h(this, null, function* () {
+function E(o, e) {
+  return c(this, null, function* () {
     if (e.panoIndexList.length === 0)
       return;
     const t = o.getCurrentState();
-    t.mode !== "Panorama" && (yield b(o, ["Panorama", { longitude: t.longitude, latitude: 0, panoIndex: e.panoIndexList[0] }]));
-    const r = new _(o, { useGuideLine: !1 });
+    t.mode !== "Panorama" && (yield C(o, ["Panorama", { longitude: t.longitude, latitude: 0, panoIndex: e.panoIndexList[0] }]));
+    const r = new P(o, { useGuideLine: !1 });
     yield r.load(e), yield new Promise((n, l) => {
-      const p = o.getCurrentState();
-      let a = e.panoIndexList.slice();
-      p.panoIndex === a[0] && m(p.panoIndex), r.playFromStart();
-      function i(u) {
+      const m = o.getCurrentState();
+      let i = e.panoIndexList.slice();
+      m.panoIndex === i[0] && p(m.panoIndex), r.playFromStart();
+      function a(u) {
         if (u !== "Panorama")
           return f(new Error("mode not match"));
       }
-      function m(u) {
-        const I = a[0];
-        if (a = a.slice(1), u !== I)
+      function p(u) {
+        const I = i[0];
+        if (i = i.slice(1), u !== I)
           return f(new Error("panoIndex not match, wanted: " + I + ", got: " + u));
-        if (a.length === 0)
-          return y();
+        if (i.length === 0)
+          return G();
       }
       function g() {
-        o.off("modeChange", i), o.off("panoArrived", m);
+        o.off("modeChange", a), o.off("panoArrived", p);
       }
       function f(u) {
         g(), l(u);
       }
-      function y() {
+      function G() {
         g(), n();
       }
-      o.on("modeChange", i), o.on("panoArrived", m);
+      o.on("modeChange", a), o.on("panoArrived", p);
     });
   });
 }
-const z = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const O = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  GuideLineItem: E
+  GuideLineItem: M
 }, Symbol.toStringTag, { value: "Module" }));
 export {
-  E as GuideLineItem,
-  z as GuideLineItem$1
+  M as GuideLineItem,
+  O as GuideLineItem$1
 };

package/libs/GuideLinePlugin/GuideLineItem.js

@@ -1,4 +1,3 @@
-import "../vendor/object-assign-deep/objectAssignDeep.js";
 import "./GuideLineModeItem/index.js";
 import "../CruisePlugin/Controller.js";
 import "../shared-utils/log.js";
@@ -36,6 +35,7 @@ import "../shared-utils/animationFrame/BetterTween.js";
 import "../shared-utils/animationFrame/index.js";
 import "../shared-utils/three/loadTexture.js";
 import "../PanoTagPlugin/controller/index.js";
+import "../vendor/object-assign-deep/objectAssignDeep.js";
 import "../PanoTagPlugin/utils/addDebugPoints.js";
 import "../PanoTagPlugin/utils/tag/tagCheck.js";
 import "../PanoTagPlugin/utils/actionAfterFiveModelLoad.js";

package/libs/GuideLinePlugin/GuideLineModeItem/index.js

@@ -1,31 +1,31 @@
 var v = Object.defineProperty;
 var g = Object.getOwnPropertySymbols;
-var b = Object.prototype.hasOwnProperty, k = Object.prototype.propertyIsEnumerable;
-var h = (r, e, i) => e in r ? v(r, e, { enumerable: !0, configurable: !0, writable: !0, value: i }) : r[e] = i, f = (r, e) => {
+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) => {
   for (var i in e || (e = {}))
-    b.call(e, i) && h(r, i, e[i]);
+    b.call(e, i) && d(s, i, e[i]);
   if (g)
     for (var i of g(e))
-      k.call(e, i) && h(r, i, e[i]);
-  return r;
+      y.call(e, i) && d(s, i, e[i]);
+  return s;
 };
-var t = (r, e, i) => (h(r, typeof e != "symbol" ? e + "" : e, i), i);
+var t = (s, e, i) => (d(s, typeof e != "symbol" ? e + "" : e, i), i);
 import * as l from "three";
-import { logWarning as y, logError as C } from "../../shared-utils/log.js";
+import { logWarning as C, logError as k } from "../../shared-utils/log.js";
 import { createLineGeometry as w } from "../utils/createLineGeometry.js";
-import { isPanoramaLike as P, isModelLike as U } from "../../shared-utils/five/mode.js";
+import { isPanoramaLike as U, isModelLike as P } 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 T, tweenProgress as x } from "../../shared-utils/animationFrame/BetterTween.js";
-import { loadTexture as E } from "../../shared-utils/three/loadTexture.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 L from "../Components/Tag.js";
-import { filterAdjacentDistinct as V } from "../utils/index.js";
-import { objectAssignDeepExports as G } from "../../vendor/object-assign-deep/objectAssignDeep.js";
-const M = (
+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 = (
   /* glsl */
   `
   varying vec2 vUv;
@@ -35,7 +35,7 @@ const M = (
     gl_Position = projectionMatrix * modelViewMatrix * vec4(position, 1.0);
   }
 `
-), _ = (
+), G = (
   /* glsl */
   `
   // 是否使用颜色
@@ -48,6 +48,10 @@ const M = (
   uniform float mapOpacity;
   // 背景颜色
   uniform vec3 backgroundColor;
+  // 边框颜色
+  uniform vec3 borderColor;
+  // 边框透明度
+  uniform float borderOpacity;
   // 背景透明度
   uniform float backgroundOpacity;
   // 整体透明度
@@ -62,7 +66,7 @@ const M = (
   varying vec2 vUv;
 
   // 获取纹理颜色
-  vec4 getTextureColor() {
+  vec4 getImage() {
     vec2 uv = vUv;
     uv.y = uv.y - vOffset;
     // 原始贴图颜色
@@ -78,24 +82,36 @@ const M = (
 
   // 获取线性渐变的透明度
   float linearGradientOpacity() {
-    // 当前的 u 值
-    float u = vUv.y;
+    // 当前的 v 值
+    float v = vUv.y;
     float gradientLength = 1.0;
-    if (u <= gradientLength) {
-      return u / gradientLength; // 在 [0, gradientLength] 范围内，透明度为 [0, 1]
-    } else if (u <= maxU - gradientLength) {
+    if (v <= gradientLength) {
+      return v / gradientLength; // 在 [0, gradientLength] 范围内，透明度为 [0, 1]
+    } else if (v <= maxU - gradientLength) {
       return 1.0; // 在 (gradientLength, maxU - gradientLength) 范围内，透明度为 1
     } else {
-      return (maxU - u) / gradientLength; // 在 [maxU - gradientLength, maxU] 范围内，透明度为 [1, 0]
+      return (maxU - v) / gradientLength; // 在 [maxU - gradientLength, maxU] 范围内，透明度为 [1, 0]
     }
   }
 
+  vec4 getBorder() {
+    float u = vUv.x;
+    float borderSize = 0.05;
+    if (u <= borderSize || u >= 1.0 - borderSize) {
+      return vec4(borderColor, borderOpacity);
+    }
+    return vec4(0.0, 0.0, 0.0, 0.0);
+  }
+
   void main() {
-    vec4 image = getTextureColor();
+    vec4 image = getImage();
+    vec4 border = getBorder();
     // 设置背景颜色
     gl_FragColor = vec4(backgroundColor, backgroundOpacity);
     // 混合颜色和背景
     gl_FragColor = mix(gl_FragColor, image, image.a);
+    // 混合边框
+    gl_FragColor = mix(gl_FragColor, border, border.a);
     // 设置整体透明度
     gl_FragColor.a = gl_FragColor.a * opacity;
     gl_FragColor.a = gl_FragColor.a * linearGradientOpacity();
@@ -103,7 +119,7 @@ const M = (
   }
 `
 );
-class A {
+class M {
   constructor(e, i) {
     t(this, "startTagContainer");
     t(this, "endTagContainer");
@@ -129,12 +145,12 @@ class A {
     t(this, "plugin");
     t(this, "textureHasLoaded", !1);
     t(this, "disposed", !1);
-    t(this, "flowAnime", new T({ progress: 0 }).to({ progress: 1 }).duration(5e3).repeat(1 / 0));
-    t(this, "flickerAnime", x(300).yoyo(!0).repeat(5));
+    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, "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());
     });
-    t(this, "onTagContainerChange", (e, i) => new L({ target: e, intro: !0, props: i.data }).$destroy);
+    t(this, "onTagContainerChange", (e, i) => new T({ target: e, intro: !0, props: i.data }).$destroy);
     /** 当设置 GuideLinePLugin 展示 */
     t(this, "onPluginShow", () => {
       this.updateVisible();
@@ -161,7 +177,7 @@ class A {
     });
     /** 模型状态变更 */
     t(this, "onFiveModeChange", (e) => {
-      this.modeVisible = this.mode === "panorama" ? P(e) : U(e), this.updateVisible();
+      this.modeVisible = this.mode === "panorama" ? U(e) : P(e), this.updateVisible();
     });
     t(this, "onFlowAnimeUpdate", (e) => {
       const { progress: i } = e;
@@ -171,12 +187,12 @@ class A {
       const { progress: i } = e;
       this.mesh.material.uniforms.flicker.value = 1 - i, this.mesh.material.uniformsNeedUpdate = !0, this.five.needsRender = !0;
     });
-    t(this, "logWarning", (e) => y("GuideLineModeItem: ", e));
-    t(this, "logError", (e) => C("GuideLineModeItem: ", e));
+    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) };
-    const s = new l.BufferGeometry(), a = new l.ShaderMaterial({
-      vertexShader: M,
-      fragmentShader: _,
+    const r = new l.BufferGeometry(), a = new l.ShaderMaterial({
+      vertexShader: V,
+      fragmentShader: G,
       transparent: !0,
       uniforms: {
         map: { value: null },
@@ -185,13 +201,15 @@ class A {
         mapOpacity: { value: 1 },
         backgroundColor: { value: new l.Color() },
         backgroundOpacity: { value: 0 },
+        borderColor: { value: new l.Color() },
+        borderOpacity: { value: 0 },
         opacity: { value: 1 },
         flicker: { value: 1 },
         maxU: { value: 0 },
         vOffset: { value: 0 }
       }
     });
-    this.mesh = new l.Mesh(s, 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 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);
   }
   get panoGroup() {
     return this._panoGroup;
@@ -226,25 +244,25 @@ class A {
       return this.logError("disposed");
     if (!this.five.work)
       return this.logError("setPathByPanoGroup: work is not ready");
-    const s = V(e);
-    if (this._panoGroup = s, (i == null ? void 0 : i.skipPanoGroup) !== void 0) {
-      const o = i.skipPanoGroup ? s.map((n) => this.five.work.observers[n]).map((n) => n.standingPosition.clone()) : null;
+    const r = L(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 a = this.getPathFromPanoGroup(s, this.five.work, i);
+    const a = this.getPathFromPanoGroup(r, this.five.work, i);
     this.path = a, this.setGeometryByPath(a, i);
   }
   /** 通过路径设置线条形状 */
   setGeometryByPath(e, i) {
-    var d, u, m;
+    var h, u, m;
     if (this.disposed)
       return this.logError("disposed");
-    const s = (d = i == null ? void 0 : i.scale) != null ? d : 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 = s, this.width = a, this.unitLength = o;
+    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({
       path: e,
-      width: a * s,
-      unitLength: o * s,
+      width: a * r,
+      unitLength: o * r,
       skipPositions: this.skippedPositions
     });
     this.mesh.geometry = n, this.mesh.material.needsUpdate = !0, this.mesh.material.uniforms.maxU.value = c, this.five.needsRender = !0;
@@ -254,25 +272,31 @@ class A {
     var i;
     if (this.disposed)
       return this.logError("disposed");
-    (e == null ? void 0 : e.visible) !== void 0 && this.setDefaultVisible(e.visible), (e == null ? void 0 : e.color) !== void 0 && this.setColor(e.color), (e == null ? void 0 : e.opacity) !== void 0 && this.setOpacity(e.opacity), ((i = e == null ? void 0 : e.texture) == null ? void 0 : i.url) !== void 0 && this.setTextureUrl(e.texture.url), (e == null ? void 0 : e.background_color) !== void 0 && this.setBackgroundColor(e.background_color), (e == null ? void 0 : e.background_opacity) !== void 0 && this.setBackgroundOpacity(e.background_opacity);
+    (e == null ? void 0 : e.visible) !== void 0 && this.setDefaultVisible(e.visible), (e == null ? void 0 : e.color) !== void 0 && this.setColor(e.color), (e == null ? void 0 : e.opacity) !== void 0 && this.setOpacity(e.opacity), ((i = e == null ? void 0 : e.texture) == null ? void 0 : i.url) !== void 0 && this.setTextureUrl(e.texture.url), (e == null ? void 0 : e.background_color) !== void 0 && this.setBackgroundColor(e.background_color), (e == null ? void 0 : e.background_opacity) !== void 0 && this.setBackgroundOpacity(e.background_opacity), (e == null ? void 0 : e.border_color) !== void 0 && this.setBorderColor(e.border_color), (e == null ? void 0 : e.border_opacity) !== void 0 && this.setBorderOpacity(e.border_opacity);
   }
   /** 设置贴图颜色 */
   setColor(e) {
     if (this.disposed)
       return this.logError("disposed");
-    this.mesh.material.uniforms.useMapColor.value = e ? 1 : 0, this.mesh.material.uniforms.mapColor.value = new l.Color().setRGB(e[0], e[1], e[2]), this.mesh.material.uniformsNeedUpdate = !0, this.five.needsRender = !0;
+    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;
   }
-  /** 设置背景颜色 */
-  setBackgroundColor(e) {
+  /** 设置边框 */
+  setBorderColor(e) {
     if (this.disposed)
       return this.logError("disposed");
-    this.mesh.material.uniforms.backgroundColor.value = new l.Color().setRGB(e[0], e[1], e[2]), this.mesh.material.uniformsNeedUpdate = !0, this.five.needsRender = !0;
+    this.mesh.material.uniforms.borderColor.value = new l.Color().set(e), this.mesh.material.uniformsNeedUpdate = !0, this.five.needsRender = !0;
   }
-  /** 设置整体透明度 */
-  setOpacity(e) {
+  /** 设置边框透明度 */
+  setBorderOpacity(e) {
     if (this.disposed)
       return this.logError("disposed");
-    this.mesh.material.uniforms.opacity.value = e, this.mesh.material.uniformsNeedUpdate = !0, this.five.needsRender = !0;
+    this.mesh.material.uniforms.borderOpacity.value = e, this.mesh.material.uniformsNeedUpdate = !0, this.five.needsRender = !0;
+  }
+  /** 设置背景颜色 */
+  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;
   }
   /** 设置背景透明度 */
   setBackgroundOpacity(e) {
@@ -280,6 +304,12 @@ class A {
       return this.logError("disposed");
     this.mesh.material.uniforms.backgroundOpacity.value = e, this.mesh.material.uniformsNeedUpdate = !0, this.five.needsRender = !0;
   }
+  /** 设置整体透明度 */
+  setOpacity(e) {
+    if (this.disposed)
+      return this.logError("disposed");
+    this.mesh.material.uniforms.opacity.value = e, this.mesh.material.uniformsNeedUpdate = !0, this.five.needsRender = !0;
+  }
   /** 设置贴图透明度 */
   setMapOpacity(e) {
     if (this.disposed)
@@ -290,7 +320,7 @@ class A {
   setTextureUrl(e) {
     if (this.disposed)
       return this.logError("disposed");
-    this.textureUrl = e, E(e).then((i) => {
+    this.textureUrl = e, _(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());
     });
   }
@@ -307,7 +337,7 @@ class A {
     this.flickerAnime.play();
   }
   setTag(e, i) {
-    const a = G({}, {
+    const a = O({}, {
       contentType: "Custom",
       stickType: "2DPoint",
       config: { visibleConfig: { visibleFiveMode: ["Floorplan", "Mapview"] } },
@@ -328,21 +358,21 @@ class A {
     this.mode === "model" && this.flowAnime.stop(), this.five.scene.remove(this.mesh), this.five.needsRender = !0;
   }
   /** 通过 panoIndex 数组计算路径 */
-  getPathFromPanoGroup(e, i, s) {
+  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 }, s)];
+    return [f({ type: "CatmullRomCurve3", points: o }, r)];
   }
 }
-function F(r) {
-  return r.contentType === "Custom";
+function F(s) {
+  return s.contentType === "Custom";
 }
 const Q = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  GuideLineModeItem: A
+  GuideLineModeItem: M
 }, Symbol.toStringTag, { value: "Module" }));
 export {
-  A as GuideLineModeItem,
+  M as GuideLineModeItem,
   Q as GuideLineModeItem$1
 };

package/libs/GuideLinePlugin/GuideLineModeItem.d.ts

@@ -63,13 +63,17 @@ declare class GuideLineModeItem {
     /** 设置线条材质 */
     setMartial(options?: PluginType.GuideLineMaterialStyle): void;
     /** 设置贴图颜色 */
-    setColor(color: null | number[]): void;
+    setColor(color: null | string): void;
+    /** 设置边框 */
+    setBorderColor(color: string): void;
+    /** 设置边框透明度 */
+    setBorderOpacity(opacity: number): void;
     /** 设置背景颜色 */
-    setBackgroundColor(color: number[]): void;
-    /** 设置整体透明度 */
-    setOpacity(opacity: number): void;
+    setBackgroundColor(color: string): void;
     /** 设置背景透明度 */
     setBackgroundOpacity(opacity: number): void;
+    /** 设置整体透明度 */
+    setOpacity(opacity: number): void;
     /** 设置贴图透明度 */
     setMapOpacity(opacity: number): void;
     /** 设置贴图 */

package/libs/GuideLinePlugin/index.js

@@ -34,7 +34,6 @@ import "../CruisePlugin/utils/vectorToCoordinates.js";
 import "../CruisePlugin/utils/formatRad.js";
 import "../CruisePlugin/utils/linerValue.js";
 import "../CruisePlugin/utils/sleep.js";
-import "../vendor/object-assign-deep/objectAssignDeep.js";
 import "../shared-utils/log.js";
 import "./utils/createLineGeometry.js";
 import "../vendor/polyline-normals/index.js";
@@ -49,6 +48,7 @@ import "../shared-utils/animationFrame/BetterTween.js";
 import "../shared-utils/animationFrame/index.js";
 import "../shared-utils/three/loadTexture.js";
 import "../PanoTagPlugin/controller/index.js";
+import "../vendor/object-assign-deep/objectAssignDeep.js";
 import "../PanoTagPlugin/utils/addDebugPoints.js";
 import "../PanoTagPlugin/utils/tag/tagCheck.js";
 import "../PanoTagPlugin/utils/actionAfterFiveModelLoad.js";

package/libs/GuideLinePlugin/typing.d.ts

@@ -103,12 +103,16 @@ export interface GuideLineGeometryStyle {
 export interface GuideLineMaterialStyle {
     /** 是否可见 */
     visible?: boolean;
-    /** rgb 颜色 [r, g, b] */
-    color?: number[];
+    /** hex 颜色 */
+    color?: string;
     /** 背景颜色 */
-    background_color?: number[];
+    background_color?: string;
     /** 背景透明度 */
     background_opacity?: number;
+    /** 边框颜色 */
+    border_color?: string;
+    /** 边框透明度 */
+    border_opacity?: number;
     /** 透明度 */
     opacity?: number;
     /** 贴图 */

package/libs/base/BasePlugin.js

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