@realsee/dnalogel 3.73.1-alpha.1 → 3.73.1-alpha.2

package/libs/PanoTagPlugin/controller/Tag/PlaneTag.d.ts

@@ -9,7 +9,12 @@ export declare class PlaneTag<C extends TagContentType = TagContentType> extends
     rectanglePlane?: Rectangle;
     private _floorIndex?;
     private _floorIndexDirty;
+    private _opacity?;
     constructor(plugin: PanoTagPluginController, tagData: TagData);
+    /** 获取透明度 */
+    get opacity(): number;
+    /** 设置透明度 (0-1) */
+    set opacity(value: number);
     /** 获取楼层索引（惰性计算 + 缓存） */
     get floorIndex(): number | undefined;
     /** 标记 floorIndex 需要重新计算（在位置等相关数据变化时调用） */

package/libs/PanoTagPlugin/controller/Tag/PlaneTag.js

@@ -2,36 +2,36 @@ var j = Object.defineProperty, R = Object.defineProperties;
 var V = Object.getOwnPropertyDescriptors;
 var F = Object.getOwnPropertySymbols;
 var k = Object.prototype.hasOwnProperty, M = Object.prototype.propertyIsEnumerable;
-var y = (d, m, t) => m in d ? j(d, m, { enumerable: !0, configurable: !0, writable: !0, value: t }) : d[m] = t, I = (d, m) => {
-  for (var t in m || (m = {}))
-    k.call(m, t) && y(d, t, m[t]);
+var I = (d, p, t) => p in d ? j(d, p, { enumerable: !0, configurable: !0, writable: !0, value: t }) : d[p] = t, b = (d, p) => {
+  for (var t in p || (p = {}))
+    k.call(p, t) && I(d, t, p[t]);
   if (F)
-    for (var t of F(m))
-      M.call(m, t) && y(d, t, m[t]);
+    for (var t of F(p))
+      M.call(p, t) && I(d, t, p[t]);
   return d;
-}, S = (d, m) => R(d, V(m));
-var b = (d, m, t) => (y(d, typeof m != "symbol" ? m + "" : m, t), t);
-var C = (d, m, t) => new Promise((o, i) => {
-  var a = (r) => {
+}, S = (d, p) => R(d, V(p));
+var y = (d, p, t) => (I(d, typeof p != "symbol" ? p + "" : p, t), t);
+var C = (d, p, t) => new Promise((e, i) => {
+  var n = (r) => {
     try {
-      e(t.next(r));
-    } catch (p) {
-      i(p);
+      o(t.next(r));
+    } catch (m) {
+      i(m);
     }
-  }, n = (r) => {
+  }, a = (r) => {
     try {
-      e(t.throw(r));
-    } catch (p) {
-      i(p);
+      o(t.throw(r));
+    } catch (m) {
+      i(m);
     }
-  }, e = (r) => r.done ? o(r.value) : Promise.resolve(r.value).then(a, n);
-  e((t = t.apply(d, m)).next());
+  }, o = (r) => r.done ? e(r.value) : Promise.resolve(r.value).then(n, a);
+  o((t = t.apply(d, p)).next());
 });
-import { CONST as w } from "../../../shared-utils/constants.js";
-import { CSS3DObjectPlus as O } from "../../../shared-utils/CSS3DRender/CSS3DObject.js";
+import { CONST as _ } from "../../../shared-utils/constants.js";
+import { CSS3DObjectPlus as w } from "../../../shared-utils/CSS3DRender/CSS3DObject.js";
 import { anyPositionToVector3 as T, arrayPositionToVector3 as g } from "../../../shared-utils/positionToVector3.js";
 import * as E from "three";
-import { planeNormal as _ } from "../../utils/planeNormal.js";
+import { planeNormal as O } from "../../utils/planeNormal.js";
 import { centerPoint as G } from "../../../shared-utils/three/centerPoint.js";
 import { VideoPlane as L, ImagePlane as A } from "../../utils/model/mediaPlane.js";
 import N from "../../Components/Tag/index.js";
@@ -301,12 +301,22 @@ import "../../../Sculpt/Editors/RectangleMeshEditor.js";
 import "../../../Sculpt/utils/sortPositionsByCameraPosition.js";
 const Z = /* @__PURE__ */ new Map(), z = /* @__PURE__ */ new Map();
 class Xr extends B {
-  constructor(t, o) {
-    super(t, o);
-    b(this, "_floorIndex");
-    b(this, "_floorIndexDirty", !0);
+  constructor(t, e) {
+    super(t, e);
+    y(this, "_floorIndex");
+    y(this, "_floorIndexDirty", !0);
+    y(this, "_opacity");
     this.state.unfolded = !0, this.loadModel();
   }
+  /** 获取透明度 */
+  get opacity() {
+    var t, e;
+    return this._opacity !== void 0 ? this._opacity : (e = (t = this.data) == null ? void 0 : t.opacity) != null ? e : 1;
+  }
+  /** 设置透明度 (0-1) */
+  set opacity(t) {
+    t !== this._opacity && (this._opacity = t, this.mediaPlane && (this.mediaPlane.opacity = t));
+  }
   /** 获取楼层索引（惰性计算 + 缓存） */
   get floorIndex() {
     return (this._floorIndexDirty || this._floorIndex === void 0) && (this._floorIndex = this.computeFloorIndex(), this._floorIndexDirty = !1), this._floorIndex;
@@ -316,66 +326,66 @@ class Xr extends B {
     this._floorIndexDirty = !0;
   }
   applyVisible() {
-    var o, i, a, n, e, r;
-    this.computeRenderType() === "Mesh" ? (this.initialSculpt(), ((i = (o = this.data.mediaData) == null ? void 0 : o[0]) == null ? void 0 : i.type) === "Video" ? this.renderVideoPlane() : ((n = (a = this.data.mediaData) == null ? void 0 : a[0]) == null ? void 0 : n.type) === "Image" ? this.renderImagePlane() : this.renderEmptyPlane()) : ((e = this.tag3DContentSvelte) == null || e.svelteApp.$set({ tag: this, state: this.plugin.state, temporaryState: this.plugin.temporaryState }), (r = this.tag3DContentSvelte) != null && r.css3DInstance && (this.tag3DContentSvelte.css3DInstance.visible = this.visible, this.five.needsRender = !0));
+    var e, i, n, a, o, r;
+    this.computeRenderType() === "Mesh" ? (this.initialSculpt(), ((i = (e = this.data.mediaData) == null ? void 0 : e[0]) == null ? void 0 : i.type) === "Video" ? this.renderVideoPlane() : ((a = (n = this.data.mediaData) == null ? void 0 : n[0]) == null ? void 0 : a.type) === "Image" ? this.renderImagePlane() : this.renderEmptyPlane()) : ((o = this.tag3DContentSvelte) == null || o.svelteApp.$set({ tag: this, state: this.plugin.state, temporaryState: this.plugin.temporaryState }), (r = this.tag3DContentSvelte) != null && r.css3DInstance && (this.tag3DContentSvelte.css3DInstance.visible = this.visible, this.five.needsRender = !0));
   }
-  set(t, o = !0) {
-    super.set(t, o), x(this.five).then(() => {
+  set(t, e = !0) {
+    super.set(t, e), x(this.five).then(() => {
       this.tag3DContentSvelte && (t.data ? this.tag3DContentSvelte.svelteApp.$set({ tag: this, state: this.plugin.state, temporaryState: this.plugin.temporaryState }) : t.position && this.loadModel());
     });
   }
   setData(...t) {
-    var i, a, n, e, r;
-    super.setData(...t), this.computeRenderType() === "Mesh" ? ((a = (i = this.data.mediaData) == null ? void 0 : i[0]) == null ? void 0 : a.type) === "Video" ? this.renderVideoPlane() : ((e = (n = this.data.mediaData) == null ? void 0 : n[0]) == null ? void 0 : e.type) === "Image" ? this.renderImagePlane() : this.renderEmptyPlane() : (r = this.tag3DContentSvelte) == null || r.svelteApp.$set({ tag: this });
+    var i, n, a, o, r;
+    super.setData(...t), this.computeRenderType() === "Mesh" ? (((n = (i = this.data.mediaData) == null ? void 0 : i[0]) == null ? void 0 : n.type) === "Video" ? this.renderVideoPlane() : ((o = (a = this.data.mediaData) == null ? void 0 : a[0]) == null ? void 0 : o.type) === "Image" ? this.renderImagePlane() : this.renderEmptyPlane(), this.mediaPlane && (this.mediaPlane.opacity = this.opacity)) : (r = this.tag3DContentSvelte) == null || r.svelteApp.$set({ tag: this });
   }
   /** 计算楼层索引 */
   computeFloorIndex() {
     const t = /* @__PURE__ */ new Map();
-    this.five.observers.forEach((n) => {
+    this.five.observers.forEach((a) => {
       var r;
-      const e = (r = n.floorIndex) != null ? r : 0;
-      if (!t.has(e)) {
-        const p = W(this.five, e);
-        p.isEmpty() || t.set(e, p);
+      const o = (r = a.floorIndex) != null ? r : 0;
+      if (!t.has(o)) {
+        const m = W(this.five, o);
+        m.isEmpty() || t.set(o, m);
       }
     });
-    const o = G(...this.position.map(T)), i = [], a = [];
-    if (t.forEach((n, e) => {
-      a.push({ floorIndex: e, box: n }), n.containsPoint(o) && i.push({ floorIndex: e, box: n });
+    const e = G(...this.position.map(T)), i = [], n = [];
+    if (t.forEach((a, o) => {
+      n.push({ floorIndex: o, box: a }), a.containsPoint(e) && i.push({ floorIndex: o, box: a });
     }), i.length === 1)
       return i[0].floorIndex;
     if (i.length > 1) {
-      let n = 1 / 0, e = i[0].floorIndex;
-      return i.forEach(({ floorIndex: r, box: p }) => {
+      let a = 1 / 0, o = i[0].floorIndex;
+      return i.forEach(({ floorIndex: r, box: m }) => {
         const h = new E.Vector3();
-        p.getCenter(h);
-        const c = o.distanceTo(h);
-        c < n && (n = c, e = r);
-      }), e;
+        m.getCenter(h);
+        const c = e.distanceTo(h);
+        c < a && (a = c, o = r);
+      }), o;
     }
-    if (a.length > 0) {
-      let n = 1 / 0, e = a[0].floorIndex;
-      return a.forEach(({ floorIndex: r, box: p }) => {
+    if (n.length > 0) {
+      let a = 1 / 0, o = n[0].floorIndex;
+      return n.forEach(({ floorIndex: r, box: m }) => {
         const h = new E.Vector3();
-        p.getCenter(h);
-        const c = o.distanceTo(h);
-        c < n && (n = c, e = r);
-      }), e;
+        m.getCenter(h);
+        const c = e.distanceTo(h);
+        c < a && (a = c, o = r);
+      }), o;
     }
   }
   loadModel() {
     return C(this, null, function* () {
-      var o, i, a, n, e, r;
+      var e, i, n, a, o, r;
       if (yield x(this.five), this.computeRenderType() === "Mesh")
-        this.initialSculpt(), ((i = (o = this.data.mediaData) == null ? void 0 : o[0]) == null ? void 0 : i.type) === "Video" ? this.renderVideoPlane() : ((n = (a = this.data.mediaData) == null ? void 0 : a[0]) == null ? void 0 : n.type) === "Image" ? this.renderImagePlane() : this.renderEmptyPlane();
+        this.initialSculpt(), ((i = (e = this.data.mediaData) == null ? void 0 : e[0]) == null ? void 0 : i.type) === "Video" ? this.renderVideoPlane() : ((a = (n = this.data.mediaData) == null ? void 0 : n[0]) == null ? void 0 : a.type) === "Image" ? this.renderImagePlane() : this.renderEmptyPlane();
       else {
         H(this.five);
-        const p = this.position.map(T);
-        (r = (e = this.tag3DContentSvelte) == null ? void 0 : e.dispose) == null || r.call(e);
+        const m = this.position.map(T);
+        (r = (o = this.tag3DContentSvelte) == null ? void 0 : o.dispose) == null || r.call(o);
         const h = document.createElement("div");
         h.classList.add("tag-media-container");
-        const c = I({ mode: "front", cornerPoints: p, container: h }, this.config.tag3DConfig), P = this.computeRenderType() === "BehindDom" || c.mode === "behind" ? "behind" : "front", l = new O(S(I({}, c), { mode: P })), s = this.computeNormal();
-        l.position.add(s.clone().setLength(w.Z_FIGHTING_OFFSET)), this.plugin.group.add(l);
+        const c = b({ mode: "front", cornerPoints: m, container: h }, this.config.tag3DConfig), P = this.computeRenderType() === "BehindDom" || c.mode === "behind" ? "behind" : "front", l = new w(S(b({}, c), { mode: P })), s = this.computeNormal();
+        l.position.add(s.clone().setLength(_.Z_FIGHTING_OFFSET)), this.plugin.group.add(l);
         let v;
         l.mode === "behind" && this.config.clickable !== !1 && (v = this.addObjectClickHandler(this, l, (f) => {
           this.plugin.hooks.emit("click", { event: f, target: "TagContent", tag: this });
@@ -413,9 +423,9 @@ class Xr extends B {
       magnifier: null
     });
     t.clear(), t.group.removeFromParent();
-    const o = $(), i = new q(
+    const e = $(), i = new q(
       {
-        id: o,
+        id: e,
         type: "Rectangle",
         points: this.position.map(g),
         style: {
@@ -429,8 +439,8 @@ class Xr extends B {
       }
     );
     i.visible = !1, this.plugin.imagePlaneGroup.add(i), this.rectanglePlane = i, i.editor.hooks.on("objectUpdate", () => {
-      var a;
-      (a = this.mediaPlane) == null || a.changePointsOrParams({ cornerPoints: i.data.points.map(g) });
+      var n;
+      (n = this.mediaPlane) == null || n.changePointsOrParams({ cornerPoints: i.data.points.map(g) });
     }), i.editor.disable();
   }
   editorEnable() {
@@ -439,9 +449,9 @@ class Xr extends B {
   editorDisable(t) {
     var i;
     this.rectanglePlane.visible = !1;
-    const o = t || this.position.map(g);
-    (i = this.mediaPlane) == null || i.changePointsOrParams({ cornerPoints: o }), this.rectanglePlane.setData({
-      points: o
+    const e = t || this.position.map(g);
+    (i = this.mediaPlane) == null || i.changePointsOrParams({ cornerPoints: e }), this.rectanglePlane.setData({
+      points: e
     }), this.rectanglePlane.editor.disable();
   }
   renderVideoPlane() {
@@ -449,23 +459,24 @@ class Xr extends B {
     const t = this.data.mediaData[0];
     if (!t)
       return;
-    const { url: o } = t;
-    if (!o)
+    const { url: e } = t;
+    if (!e)
       return;
-    const i = (h = this.data.objectFit) != null ? h : "contain", a = this.currentVisible, n = (() => !!(this.mediaPlane && !a))(), e = (() => !!(!this.mediaPlane && a))(), r = (() => !!(this.mediaPlane && (this.mediaPlane.src !== o || this.mediaPlane.objectFit !== i)))();
-    (n || r) && this.mediaPlane && (this.plugin.imagePlaneGroup.remove(this.mediaPlane), this.mediaPlane.dispose(), this.mediaPlane.removeFromParent(), this.mediaPlane = void 0);
-    const p = (() => !!(this.mediaPlane && this.mediaPlane.objectFit && this.mediaPlane.objectFit !== i))();
-    if (e || r) {
+    const i = (h = this.data.objectFit) != null ? h : "contain", n = this.currentVisible, a = (() => !!(this.mediaPlane && !n))(), o = (() => !!(!this.mediaPlane && n))(), r = (() => !!(this.mediaPlane && (this.mediaPlane.src !== e || this.mediaPlane.objectFit !== i)))();
+    (a || r) && this.mediaPlane && (this.plugin.imagePlaneGroup.remove(this.mediaPlane), this.mediaPlane.dispose(), this.mediaPlane.removeFromParent(), this.mediaPlane = void 0);
+    const m = (() => !!(this.mediaPlane && this.mediaPlane.objectFit && this.mediaPlane.objectFit !== i))();
+    if (o || r) {
       let l = this.position.map(g);
       this.rectanglePlane && (l = this.rectanglePlane.data.points.map(g));
-      const s = new L(o, l, {
+      const s = new L(e, l, {
         videoCoverSrc: t.videoCoverUrl,
         playButton: this.data.playIcon,
         paused: !((c = this.data.autoplayConfig) != null && c.autoplayVideo),
         objectFit: this.data.objectFit,
         videoTextureMap: Z,
         ImageTextureMap: z,
-        domEvents: this.plugin.domEvents
+        domEvents: this.plugin.domEvents,
+        opacity: this.opacity
       });
       this.plugin.domEvents.addAutoBindEventListener(s, "click", (u) => {
         var f, D;
@@ -487,7 +498,7 @@ class Xr extends B {
       const v = (u) => (this.five.on("renderFrame", u), () => this.five.off("renderFrame", u));
       s.initialRenderHooks(v), this.mediaPlane = s, this.play = () => s.play(), this.pause = () => s.pause(), this.plugin.imagePlaneGroup.add(this.mediaPlane);
     }
-    if (p) {
+    if (m) {
       const l = this.rectanglePlane.data.points.map(g);
       (P = this.mediaPlane) == null || P.changePointsOrParams({ cornerPoints: l, params: { objectFit: i } });
     }
@@ -495,15 +506,15 @@ class Xr extends B {
   }
   renderImagePlane() {
     var c, P;
-    const t = this.data.mediaData[0], o = (c = this.data.objectFit) != null ? c : "contain";
+    const t = this.data.mediaData[0], e = (c = this.data.objectFit) != null ? c : "contain";
     if (!t)
       return;
     const { url: i } = t;
     if (!i)
       return;
-    let a = this.position.map(g);
-    const n = this.currentVisible, e = (() => !!(this.mediaPlane && !n))(), r = (() => !!(!this.mediaPlane && n))(), p = (() => !!(this.mediaPlane && this.mediaPlane.src !== i))(), h = (() => !!(this.mediaPlane && this.mediaPlane.objectFit && this.mediaPlane.objectFit !== o))();
-    if ((e || p) && this.mediaPlane && (this.plugin.imagePlaneGroup.remove(this.mediaPlane), this.mediaPlane.dispose(), this.mediaPlane.removeFromParent(), this.mediaPlane = void 0), (r || p) && (this.rectanglePlane && (a = this.rectanglePlane.data.points.map(g)), this.mediaPlane = new A(i, a, { objectFit: this.data.objectFit }), this.getConfig().clickable !== !1 && this.plugin.domEvents.addAutoBindEventListener(
+    let n = this.position.map(g);
+    const a = this.currentVisible, o = (() => !!(this.mediaPlane && !a))(), r = (() => !!(!this.mediaPlane && a))(), m = (() => !!(this.mediaPlane && this.mediaPlane.src !== i))(), h = (() => !!(this.mediaPlane && this.mediaPlane.objectFit && this.mediaPlane.objectFit !== e))();
+    if ((o || m) && this.mediaPlane && (this.plugin.imagePlaneGroup.remove(this.mediaPlane), this.mediaPlane.dispose(), this.mediaPlane.removeFromParent(), this.mediaPlane = void 0), (r || m) && (this.rectanglePlane && (n = this.rectanglePlane.data.points.map(g)), this.mediaPlane = new A(i, n, { objectFit: this.data.objectFit, opacity: this.opacity }), this.getConfig().clickable !== !1 && this.plugin.domEvents.addAutoBindEventListener(
       this.mediaPlane,
       "click",
       (l) => {
@@ -512,7 +523,7 @@ class Xr extends B {
       { noEmitWhenHide: !0 }
     ), this.plugin.imagePlaneGroup.add(this.mediaPlane)), h) {
       const l = this.rectanglePlane.data.points.map(g);
-      (P = this.mediaPlane) == null || P.changePointsOrParams({ cornerPoints: l, params: { objectFit: o } });
+      (P = this.mediaPlane) == null || P.changePointsOrParams({ cornerPoints: l, params: { objectFit: e } });
     }
     this.five.needsRender = !0;
   }
@@ -520,7 +531,7 @@ class Xr extends B {
     this.mediaPlane && (this.plugin.imagePlaneGroup.remove(this.mediaPlane), this.mediaPlane.dispose(), this.mediaPlane.removeFromParent(), this.mediaPlane = void 0);
   }
   computeNormal() {
-    return _(this.position);
+    return O(this.position);
   }
 }
 export {

package/libs/PanoTagPlugin/utils/model/mediaPlane.d.ts

@@ -28,6 +28,7 @@ declare class ImagePlane extends MediaPlane {
     constructor(imageSrc: string, cornerPoints: Vector3[], params?: {
         objectFit?: ObjectFit;
         resolveZFighting?: boolean;
+        opacity?: number;
     });
     changePointsOrParams(props: {
         cornerPoints: Vector3[];
@@ -52,6 +53,7 @@ declare class VideoPlane extends MediaPlane {
     private buttonMesh?;
     private videoTextureMap;
     private ImageTextureMap;
+    private initialOpacity;
     constructor(videoSrc: string, cornerPoints: Vector3[], params?: {
         paused?: boolean;
         playButton?: 'withText' | 'withoutText' | string;
@@ -63,6 +65,7 @@ declare class VideoPlane extends MediaPlane {
             transparent: boolean;
         }>;
         domEvents?: FiveDomEvents;
+        opacity?: number;
     });
     play(muted?: boolean): Promise<void>;
     pause(): void;