@realsee/dnalogel 2.28.4 → 2.28.6

package/libs/PanoCompassPlugin/Controller.js

@@ -1,38 +1,38 @@
-var D = Object.defineProperty;
-var M = Object.getOwnPropertySymbols;
-var w = Object.prototype.hasOwnProperty, P = Object.prototype.propertyIsEnumerable;
-var u = (h, n, e) => n in h ? D(h, n, { enumerable: !0, configurable: !0, writable: !0, value: e }) : h[n] = e, l = (h, n) => {
+var P = Object.defineProperty;
+var b = Object.getOwnPropertySymbols;
+var C = Object.prototype.hasOwnProperty, F = Object.prototype.propertyIsEnumerable;
+var u = (h, n, e) => n in h ? P(h, n, { enumerable: !0, configurable: !0, writable: !0, value: e }) : h[n] = e, f = (h, n) => {
   for (var e in n || (n = {}))
-    w.call(n, e) && u(h, e, n[e]);
-  if (M)
-    for (var e of M(n))
-      P.call(n, e) && u(h, e, n[e]);
+    C.call(n, e) && u(h, e, n[e]);
+  if (b)
+    for (var e of b(n))
+      F.call(n, e) && u(h, e, n[e]);
   return h;
 };
-var i = (h, n, e) => (u(h, typeof n != "symbol" ? n + "" : n, e), e);
+var r = (h, n, e) => (u(h, typeof n != "symbol" ? n + "" : n, e), e);
 var d = (h, n, e) => new Promise((t, o) => {
-  var s = (p) => {
+  var s = (l) => {
     try {
-      m(e.next(p));
+      p(e.next(l));
     } catch (c) {
       o(c);
     }
-  }, r = (p) => {
+  }, i = (l) => {
     try {
-      m(e.throw(p));
+      p(e.throw(l));
     } catch (c) {
       o(c);
     }
-  }, m = (p) => p.done ? t(p.value) : Promise.resolve(p.value).then(s, r);
-  m((e = e.apply(h, n)).next());
+  }, p = (l) => l.done ? t(l.value) : Promise.resolve(l.value).then(s, i);
+  p((e = e.apply(h, n)).next());
 });
 import * as a from "three";
-import { Five as C } from "@realsee/five";
+import { Five as _ } from "@realsee/five";
 import { Controller as A } from "../base/BasePluginWithData.js";
-import { getRoomInfoInstance as _ } from "./getRoomInfoInstance.js";
-import { loadTexture as g } from "../shared-utils/three/loadTexture.js";
-import { CSS3DRenderPlugin as F } from "../CSS3DRenderPlugin/index.js";
-import { tweenProgress as W } from "../shared-utils/animationFrame/BetterTween.js";
+import { getRoomInfoInstance as U } from "./getRoomInfoInstance.js";
+import { loadTexture as M } from "../shared-utils/three/loadTexture.js";
+import { CSS3DRenderPlugin as T } from "../CSS3DRenderPlugin/index.js";
+import { tweenProgress as D } from "../shared-utils/animationFrame/BetterTween.js";
 import "../base/BasePlugin.js";
 import "../shared-utils/Subscribe.js";
 import "hammerjs";
@@ -55,14 +55,14 @@ import "./Assets/roomInfoIcon.js";
 import "../CSS3DRenderPlugin/Controller.js";
 import "../CSS3DRenderPlugin/utils/waitFiveModelLoaded.js";
 import "../shared-utils/animationFrame/index.js";
-const v = { userAction: !0 };
-class re extends A {
+const g = { userAction: !0 };
+class ae extends A {
   constructor(e, t) {
     super(e, t);
     /**
      * 默认状态
      */
-    i(this, "state", {
+    r(this, "state", {
       visible: !0,
       enabled: !0,
       config: {
@@ -73,103 +73,112 @@ class re extends A {
         entryDoorImageUrl: this.absoluteUrl("/release/web/enterDoor.831b8208.png")
       }
     });
-    i(this, "data");
-    i(this, "group", new a.Group());
-    i(this, "roomInfoInstance");
-    i(this, "roomInfoWrapperInstance");
-    i(this, "compassMeshTween");
-    i(this, "compassMesh");
-    i(this, "entryDoorMesh");
+    r(this, "data");
+    r(this, "group", new a.Group());
+    r(this, "roomInfoInstance");
+    r(this, "roomInfoWrapperInstance");
+    r(this, "compassMeshTween");
+    r(this, "compassMesh");
+    r(this, "logoMesh");
+    r(this, "logoMeshTween");
+    r(this, "entryDoorMesh");
     /**
      * 销毁插件
      * @todo 销毁贴图时，最好还是直接销毁贴图吧，this.compassMesh?.material.map 这种都是很深层的引用了。THREE 的建议我看也是自己去管理和销毁公共贴图。
      */
-    i(this, "dispose", () => {
+    r(this, "dispose", () => {
       var e, t, o, s;
       this.five.scene.remove(this.group), this.group.remove(...this.group.children), (t = (e = this.compassMesh) == null ? void 0 : e.material.map) == null || t.dispose(), (s = (o = this.entryDoorMesh) == null ? void 0 : o.material.map) == null || s.dispose(), this.five.off("dispose", this.dispose), this.five.off("panoArrived", this.onFivePanoArrived), this.five.off("panoWillArrive", this.onFivePanoWillArrive), this.five.off("cameraDirectionUpdate", this.onFiveCameraDirectionUpdate);
     });
     /**
      * 添加事件监听
      */
-    i(this, "_addEventListener", () => {
+    r(this, "_addEventListener", () => {
       this.five.on("panoArrived", this.onFivePanoArrived), this.five.on("panoWillArrive", this.onFivePanoWillArrive), this.five.on("modeChange", this.onFiveModeChange), this.five.on("cameraDirectionUpdate", this.onFiveCameraDirectionUpdate);
     });
     /**
      * 移除事件监听
      */
-    i(this, "_removeEventListener", () => {
+    r(this, "_removeEventListener", () => {
       this.five.off("panoArrived", this.onFivePanoArrived), this.five.off("panoWillArrive", this.onFivePanoWillArrive), this.five.off("modeChange", this.onFiveModeChange), this.five.off("cameraDirectionUpdate", this.onFiveCameraDirectionUpdate);
     });
     /**
      * 启用，响应事件，展示UI
      */
-    i(this, "_enable", () => {
+    r(this, "_enable", () => {
       this.five.scene.add(this.group), this.init(), this.onFivePanoArrived(this.five.panoIndex || 0), this._addEventListener();
     });
     /**
      * 禁用，不响应事件，不展示UI
      */
-    i(this, "_disable", () => {
+    r(this, "_disable", () => {
       this._clearCompassIfNeed(), this._clearEntryDoorIfNeed(), this.five.scene.remove(this.group), this._removeEventListener();
     });
     /**
      * 展示UI
      */
-    i(this, "_toggleVisible", () => {
+    r(this, "_toggleVisible", () => {
       this.group.visible = this.state.visible, this.five.needsRender = !0;
     });
-    i(this, "_clearCompassIfNeed", () => {
+    r(this, "_clearCompassIfNeed", () => {
       var e;
       this.compassMesh && (this.group.remove(this.compassMesh), (e = this.compassMesh.material.map) == null || e.dispose(), this.compassMesh = null);
     });
-    i(this, "_clearEntryDoorIfNeed", () => {
+    r(this, "_clearLogoIfNeed", () => {
+      var e;
+      this.logoMesh && (this.group.remove(this.logoMesh), (e = this.logoMesh.material.map) == null || e.dispose(), this.logoMesh = null);
+    });
+    r(this, "_clearEntryDoorIfNeed", () => {
       var e;
       this.entryDoorMesh && (this.group.remove(this.entryDoorMesh), (e = this.entryDoorMesh.material.map) == null || e.dispose(), this.entryDoorMesh = null), this.roomInfoInstance && (this.roomInfoInstance.dispose(), this.roomInfoInstance = null), this.roomInfoWrapperInstance && (this.roomInfoWrapperInstance.dispose(), this.roomInfoWrapperInstance = null);
     });
-    i(this, "onFivePanoWillArrive", (e) => {
-      var t, o;
-      e !== this.five.panoIndex && ((t = this.compassMeshTween) == null || t.dispose(), (o = this.compassMesh) == null || o.material.setValues({ opacity: 0 }));
+    r(this, "onFivePanoWillArrive", (e) => {
+      var t, o, s, i;
+      e !== this.five.panoIndex && ((t = this.compassMeshTween) == null || t.dispose(), (o = this.compassMesh) == null || o.material.setValues({ opacity: 0 }), (s = this.logoMeshTween) == null || s.dispose(), (i = this.logoMesh) == null || i.material.setValues({ opacity: 0 }));
     });
-    i(this, "onFivePanoArrived", (e) => {
-      var o, s, r, m, p, c, I;
-      const t = (r = (s = (o = this.five.work) == null ? void 0 : o.observers) == null ? void 0 : s[e]) == null ? void 0 : r.standingPosition;
-      if (this.compassMesh && (this.compassMesh.position.copy(t.clone().setY(t.y + 0.01)), this.compassMesh.material.opacity === 0 && ((m = this.compassMeshTween) == null || m.dispose(), this.compassMeshTween = W(1e3).onUpdate(({ progress: y }) => {
-        var f;
-        (f = this.compassMesh) == null || f.material.setValues({ opacity: y }), this.five.needsRender = !0;
+    r(this, "onFivePanoArrived", (e) => {
+      var o, s, i, p, l, c, y, I;
+      const t = (i = (s = (o = this.five.work) == null ? void 0 : o.observers) == null ? void 0 : s[e]) == null ? void 0 : i.standingPosition;
+      if (this.compassMesh && (this.compassMesh.position.copy(t.clone().setY(t.y + 0.01)), this.compassMesh.material.opacity === 0 && ((p = this.compassMeshTween) == null || p.dispose(), this.compassMeshTween = D(1e3).onUpdate(({ progress: v }) => {
+        var m;
+        (m = this.compassMesh) == null || m.material.setValues({ opacity: v }), this.five.needsRender = !0;
+      }).play())), this.logoMesh && (this.logoMesh.position.copy(t.clone().setY(t.y + 0.011)), this.logoMesh.material.opacity === 0 && ((l = this.logoMeshTween) == null || l.dispose(), this.logoMeshTween = D(1e3).onUpdate(({ progress: v }) => {
+        var m;
+        (m = this.logoMesh) == null || m.material.setValues({ opacity: v }), this.five.needsRender = !0;
       }).play())), this.entryDoorMesh) {
-        const f = new a.Vector3(
+        const m = new a.Vector3(
           this.data.entrance.position.x,
           this.data.entrance.position.y,
           this.data.entrance.position.z
-        ).clone().setY(t.y).sub(t).normalize(), b = t.clone().add(f.clone().multiplyScalar(0.7)).setY(t.y + 0.01);
-        this.entryDoorMesh.rotation.z = new a.Vector3(0, 0, -1).angleTo(f), this.entryDoorMesh.position.copy(b), ((p = this.data) == null ? void 0 : p.room_observers[e].room.type) === 1 ? (c = this.entryDoorMesh) == null || c.material.setValues({ opacity: 1 }) : (I = this.entryDoorMesh) == null || I.material.setValues({ opacity: 0 });
+        ).clone().setY(t.y).sub(t).normalize(), w = t.clone().add(m.clone().multiplyScalar(0.7)).setY(t.y + 0.01);
+        this.entryDoorMesh.rotation.z = new a.Vector3(0, 0, -1).angleTo(m), this.entryDoorMesh.position.copy(w), ((c = this.data) == null ? void 0 : c.room_observers[e].room.type) === 1 ? (y = this.entryDoorMesh) == null || y.material.setValues({ opacity: 1 }) : (I = this.entryDoorMesh) == null || I.material.setValues({ opacity: 0 });
       }
       this.roomInfoInstance && this.roomInfoWrapperInstance && (this.roomInfoWrapperInstance.css3DObject.position.copy(t.clone().setY(t.y + 0.01)), this.roomInfoInstance.setRoom(this.data.room_observers[e].room)), this.five.needsRender = !0;
     });
-    i(this, "onFiveCameraDirectionUpdate", ({ longitude: e, latitude: t }) => {
+    r(this, "onFiveCameraDirectionUpdate", ({ longitude: e, latitude: t }) => {
       var o, s;
       this.roomInfoWrapperInstance && (this.roomInfoWrapperInstance.css3DObject.rotation.z = e, t > 0.66 && this.five.getCurrentState().mode === "Panorama" ? (o = this.roomInfoInstance) == null || o.show() : (s = this.roomInfoInstance) == null || s.hide());
     });
     // eslint-disable-next-line max-params
-    i(this, "onFiveModeChange", (e, t, o, s, r) => {
+    r(this, "onFiveModeChange", (e, t, o, s, i) => {
       e !== t && this.setState(
         {
-          visible: e === C.Mode.Panorama
+          visible: e === _.Mode.Panorama
         },
-        { userAction: r }
+        { userAction: i }
       );
     });
     this.five.scene.add(this.group), this.five.once("dispose", this.dispose), this.setState({
       visible: !0,
       enabled: !0,
-      config: l(l({}, this.state.config), t || {})
+      config: f(f({}, this.state.config), t || {})
     });
   }
   /**
    * 启用插件，响应用户操作并展示UI
    * @param options
    */
-  enable(e = v) {
+  enable(e = g) {
     this.setState(
       {
         enabled: !0
@@ -181,7 +190,7 @@ class re extends A {
    * 禁用插件，禁止响应用户操作并隐藏UI
    * @param options
    */
-  disable(e = v) {
+  disable(e = g) {
     this.setState(
       {
         enabled: !1
@@ -195,7 +204,7 @@ class re extends A {
    * @returns
    * @todo 需要考虑动画
    */
-  show(e = v) {
+  show(e = g) {
     if (this.state.enabled)
       return this.setState(
         {
@@ -210,7 +219,7 @@ class re extends A {
    * @returns
    * @todo 需要考虑动画
    */
-  hide(e = v) {
+  hide(e = g) {
     if (this.state.enabled)
       return this.setState(
         {
@@ -220,12 +229,12 @@ class re extends A {
       ), Promise.resolve();
   }
   setState(e, t = { userAction: !0 }) {
-    var s, r;
+    var s, i;
     const o = JSON.parse(JSON.stringify(this.state));
     this.state = {
       visible: (s = e.visible) != null ? s : o.visible,
-      enabled: (r = e.enabled) != null ? r : o.enabled,
-      config: l(l({}, o.config), e.config || {})
+      enabled: (i = e.enabled) != null ? i : o.enabled,
+      config: f(f({}, o.config), e.config || {})
     }, this.hooks.emit("stateChange", {
       state: this.state,
       prevState: o,
@@ -235,7 +244,7 @@ class re extends A {
   load(e, t, o = !0) {
     return d(this, null, function* () {
       const s = yield this.formatData(e);
-      JSON.stringify(this.data) !== JSON.stringify(s) && (this.hooks.emit("dataChange", s, this.data), this.data = l({}, s), this.init(), t && this.setState(t, { userAction: o }), this.hooks.emit("dataLoaded", this.data));
+      JSON.stringify(this.data) !== JSON.stringify(s) && (this.hooks.emit("dataChange", s, this.data), this.data = f({}, s), this.init(), t && this.setState(t, { userAction: o }), this.hooks.emit("dataLoaded", this.data));
     });
   }
   formatData(e) {
@@ -247,33 +256,48 @@ class re extends A {
    */
   init() {
     return d(this, null, function* () {
-      var o, s, r, m;
+      var o, s, i, p;
       const e = (s = (o = this.data) == null ? void 0 : o.north_rad) != null ? s : null;
-      this._clearCompassIfNeed(), e !== null && (this.compassMesh = yield this.loadCompassMesh(), this.compassMesh.rotateX(-Math.PI / 2), this.compassMesh.rotateZ(e - Math.PI / 2), this.group.add(this.compassMesh));
-      const t = (m = (r = this.data) == null ? void 0 : r.entrance) != null ? m : null;
-      this._clearEntryDoorIfNeed(), t !== null && (this.entryDoorMesh = yield this.loadEntryDoorMesh(), this.roomInfoWrapperInstance = this.loadRoomInfo(), this.roomInfoInstance = _(), this.entryDoorMesh.rotateX(-Math.PI / 2), this.roomInfoWrapperInstance && this.roomInfoInstance.appendTo(this.roomInfoWrapperInstance.container), this.group.add(this.entryDoorMesh)), this.onFivePanoArrived(this.five.panoIndex || 0), this.five.needsRender = !0;
+      this._clearCompassIfNeed(), e !== null && (this.compassMesh = yield this.loadCompassMesh(), this.compassMesh && (this.compassMesh.rotateX(-Math.PI / 2), this.compassMesh.rotateZ(e - Math.PI / 2), this.group.add(this.compassMesh))), this._clearLogoIfNeed(), this.logoMesh = yield this.loadLogoMesh(), this.logoMesh && (this.logoMesh.rotateX(-Math.PI / 2), this.group.add(this.logoMesh));
+      const t = (p = (i = this.data) == null ? void 0 : i.entrance) != null ? p : null;
+      this._clearEntryDoorIfNeed(), t !== null && (this.entryDoorMesh = yield this.loadEntryDoorMesh(), this.roomInfoWrapperInstance = this.loadRoomInfo(), this.roomInfoInstance = U(), this.entryDoorMesh.rotateX(-Math.PI / 2), this.roomInfoWrapperInstance && this.roomInfoInstance.appendTo(this.roomInfoWrapperInstance.container), this.group.add(this.entryDoorMesh)), this.onFivePanoArrived(this.five.panoIndex || 0), this.five.needsRender = !0;
     });
   }
   loadCompassMesh() {
     return d(this, null, function* () {
-      const e = this.state.config.compassImageUrl, t = yield g(e), o = new a.CircleGeometry(0.7, 32), s = new a.MeshBasicMaterial({
+      const e = this.state.config.compassImageUrl, t = yield M(e), o = new a.CircleGeometry(0.7, 32), s = new a.MeshBasicMaterial({
         map: t,
         transparent: !0,
         opacity: 0,
         depthTest: !1
-      }), r = new a.Mesh(o, s);
-      return r.name = "pano-compass-mesh", r;
+      }), i = new a.Mesh(o, s);
+      return i.name = "pano-compass-mesh", i;
+    });
+  }
+  loadLogoMesh() {
+    return d(this, null, function* () {
+      if (!this.state.config.logoURL)
+        return;
+      const e = this.state.config.logoURL, t = yield M(e);
+      t.minFilter = a.NearestFilter, t.magFilter = a.NearestFilter;
+      const o = new a.PlaneBufferGeometry(0.4, 0.4), s = new a.MeshBasicMaterial({
+        map: t,
+        opacity: 0,
+        transparent: !0,
+        depthTest: !1
+      }), i = new a.Mesh(o, s);
+      return i.name = "pano-compass-logo-mesh", i;
     });
   }
   loadEntryDoorMesh() {
     return d(this, null, function* () {
-      const e = this.state.config.entryDoorImageUrl, t = yield g(e), o = new a.PlaneGeometry(0.2, 0.16), s = new a.MeshBasicMaterial({
+      const e = this.state.config.entryDoorImageUrl, t = yield M(e), o = new a.PlaneGeometry(0.2, 0.16), s = new a.MeshBasicMaterial({
         map: t,
         transparent: !0,
         opacity: 0.8,
         depthTest: !1
-      }), r = new a.Mesh(o, s);
-      return r.name = "pano-compass-entry-door", r;
+      }), i = new a.Mesh(o, s);
+      return i.name = "pano-compass-entry-door", i;
     });
   }
   loadRoomInfo() {
@@ -283,9 +307,9 @@ class re extends A {
       new a.Vector3(0.7, 0, 0.7),
       new a.Vector3(-0.7, 0, 0.7)
     ];
-    return F(this.five).create3DDomContainer(e);
+    return T(this.five).create3DDomContainer(e);
   }
 }
 export {
-  re as PanoCompassController
+  ae as PanoCompassController
 };

package/libs/PanoCompassPlugin/typings.d.ts

@@ -2,6 +2,7 @@ import type { FloorplanServerRoomItem } from '../floorplan/typings/floorplanServ
 import type * as BasePlugin from '../base/BasePluginWithData';
 export interface Config extends BasePlugin.Config {
     compassImageUrl: string;
+    logoURL?: string;
     entryDoorImageUrl: string;
 }
 export interface State extends BasePlugin.State {
@@ -10,14 +11,14 @@ export interface State extends BasePlugin.State {
 }
 export interface PluginData {
     north_rad: null | number;
-    entrance: null | undefined | {
+    entrance?: null | {
         position: {
             x: number;
             y: number;
             z: number;
         };
     };
-    room_observers: undefined | {
+    room_observers?: {
         index: number;
         floor_index: number;
         room: FloorplanServerRoomItem;

package/libs/base/BasePlugin.js

@@ -14,7 +14,7 @@ let b = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "2.28.4");
+    i(this, "VERSION", "2.28.6");
     i(this, "five");
     /**
      * 插件事件钩子

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv2.28.4",
+    "%c %c@realsee/dnalogel %cv2.28.6",
     [
       "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.28.4",
+  "version": "2.28.6",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
     "clean": "rm -rf components dist docs libs types ./vite.config.js.timestamp*",