@realsee/dnalogel 2.12.0-alpha.2 → 2.12.0-alpha.4

package/libs/PanoTagPlugin/controller/TagRender.js

@@ -1,33 +1,33 @@
 var R = Object.defineProperty;
 var O = (p, m, e) => m in p ? R(p, m, { enumerable: !0, configurable: !0, writable: !0, value: e }) : p[m] = e;
-var c = (p, m, e) => (O(p, typeof m != "symbol" ? m + "" : m, e), e);
+var l = (p, m, e) => (O(p, typeof m != "symbol" ? m + "" : m, e), e);
 var C = (p, m, e) => new Promise((t, i) => {
-  var o = (n) => {
+  var o = (a) => {
     try {
-      r(e.next(n));
-    } catch (a) {
-      i(a);
+      r(e.next(a));
+    } catch (n) {
+      i(n);
     }
-  }, s = (n) => {
+  }, s = (a) => {
     try {
-      r(e.throw(n));
-    } catch (a) {
-      i(a);
+      r(e.throw(a));
+    } catch (n) {
+      i(n);
     }
-  }, r = (n) => n.done ? t(n.value) : Promise.resolve(n.value).then(o, s);
+  }, r = (a) => a.done ? t(a.value) : Promise.resolve(a.value).then(o, s);
   r((e = e.apply(p, m)).next());
 });
 import { TagComputer as w } from "./TagComputer.js";
-import { Group as y, Quaternion as x, Vector3 as T, Matrix4 as b } from "three";
-import A from "../Components/TagContainer.js";
-import G from "../Components/Tag/index.js";
+import { Group as S, Quaternion as G, Vector3 as T, Matrix4 as b } from "three";
+import x from "../Components/TagContainer.js";
+import A from "../Components/Tag/index.js";
 import { arrayPositionToVector3 as D } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
 import { planeNormal as j } from "../utils/planeNormal.js";
 import { isMediaModelTag as f } from "../utils/tag/tagCheck.js";
 import { normalPositionToPositions as V } from "../utils/normalPositionToPositions.js";
 import { CSS3DRenderPlugin as k } from "../../CSS3DRenderPlugin/index.js";
 import { loadGLTF as E } from "../../shared-utils/three/GLTFLoader.js";
-import F from "../utils/model/imageModel.js";
+import I from "../utils/model/imageModel.js";
 import "../utils/tagPosition.js";
 import "../../shared-utils/three/centerPoint.js";
 import "../utils/checkRange.js";
@@ -131,26 +131,27 @@ import "../../shared-utils/three/loadTexture.js";
 class We extends w {
   constructor(e) {
     super(e);
-    c(this, "group", new y());
-    c(this, "gltfObjectGroup", new y());
-    c(this, "enabledModelTagSet", /* @__PURE__ */ new Set());
-    c(this, "temporaryState", { visible: !0 });
-    c(this, "TagContainerSvelte");
-    c(this, "loadModel", (e) => C(this, null, function* () {
-      var n;
+    l(this, "group", new S());
+    l(this, "imagePlaneGroup", new S());
+    l(this, "gltfObjectGroup", new S());
+    l(this, "enabledModelTagSet", /* @__PURE__ */ new Set());
+    l(this, "temporaryState", { visible: !0 });
+    l(this, "TagContainerSvelte");
+    l(this, "loadModel", (e) => C(this, null, function* () {
+      var a;
       const t = e.data.modelUrl;
       if (!t)
         return;
-      const i = E(t).then((a) => Object.assign(a.scene, { customID: e.id, isTagModel: !0 }));
+      const i = E(t).then((n) => Object.assign(n.scene, { customID: e.id, isTagModel: !0 }));
       e.model = { promise: i };
       const o = yield i;
-      if (((n = e.model) == null ? void 0 : n.promise) !== i || (e.model.object = o, !this.tags.includes(e)))
+      if (((a = e.model) == null ? void 0 : a.promise) !== i || (e.model.object = o, !this.tags.includes(e)))
         return;
       o.visible = e.state.visible, new b().fromArray(e.matrix).decompose(o.position, o.quaternion, o.scale), o.updateWorldMatrix(!0, !0), this.getVisibleByFloorIndex(e) || (o.visible = !1);
-      const r = this.gltfObjectGroup.children.find((a) => a.customID === e.id);
+      const r = this.gltfObjectGroup.children.find((n) => n.customID === e.id);
       return r && this.gltfObjectGroup.remove(r), this.gltfObjectGroup.add(o), this.updateTagCss3DObjectMatrix(e, o), o;
     }));
-    this.group.name = "PanoTagPluginModelGroup", this.gltfObjectGroup.name = "PanoTagPluginGLTFObjectGroup", this.group.add(this.gltfObjectGroup);
+    this.group.name = "PanoTagPluginModelGroup", this.gltfObjectGroup.name = "PanoTagPluginGLTFObjectGroup", this.imagePlaneGroup.name = "ImagePlaneGroup", this.group.add(this.gltfObjectGroup), this.group.add(this.imagePlaneGroup);
   }
   clearTags() {
     this.tags = [], this.enabledModelTagSet.clear(), this.clearCache(), this.disposeAllCSS3DContainer(), this.updateRenderAllTags();
@@ -160,23 +161,23 @@ class We extends w {
   }
   updateRenderImageModel() {
     this.sort([...this.filterImageModel]).forEach((t) => {
-      var o, s, r, n;
+      var o, s, r, a;
       const i = (o = t.data.mediaData[0]) == null ? void 0 : o.url;
-      !i || (t.imageModel && (t.imageModel.visible = (r = (s = t.state) == null ? void 0 : s.visible) != null ? r : !0), ((n = t.imageModel) == null ? void 0 : n.imageSrc) !== i && (t.imageModel = new F(i, t.position.map(D)), t.imageModel.name = "PanoTagPluginImageModel", this.five.scene.add(t.imageModel)));
+      !i || (t.imageModel && (t.imageModel.visible = (r = (s = t.state) == null ? void 0 : s.visible) != null ? r : !0), ((a = t.imageModel) == null ? void 0 : a.imageSrc) !== i && (t.imageModel = new I(i, t.position.map(D)), t.imageModel.name = "PanoTagPluginImageModel", this.imagePlaneGroup.add(t.imageModel)));
     });
   }
   updateRenderPlaneTag() {
     this.sort([...this.filter3DTag]).forEach((t) => {
-      var n, a, h;
-      if (f(t) && ((n = t.model) == null ? void 0 : n.object) && this.updateTagCss3DObjectMatrix(t, (a = t.model) == null ? void 0 : a.object), t.tag3DContentSvelte) {
-        const { svelteApp: l, domContainer: M, initialNormal: u, currentNormal: d } = t.tag3DContentSvelte;
-        if (this.updateTagCss3DObjectVisible(t), l.$set({ tag: t, hooks: this.hooks, state: this.state, temporaryState: this.temporaryState }), !u.equals(d)) {
-          const g = new x().setFromUnitVectors(u, d);
+      var a, n, u;
+      if (f(t) && ((a = t.model) == null ? void 0 : a.object) && this.updateTagCss3DObjectMatrix(t, (n = t.model) == null ? void 0 : n.object), t.tag3DContentSvelte) {
+        const { svelteApp: d, domContainer: M, initialNormal: h, currentNormal: c } = t.tag3DContentSvelte;
+        if (this.updateTagCss3DObjectVisible(t), d.$set({ tag: t, hooks: this.hooks, state: this.state, temporaryState: this.temporaryState }), !h.equals(c)) {
+          const g = new G().setFromUnitVectors(h, c);
           M.css3DObject.setRotationFromQuaternion(g);
         }
         return;
       }
-      if (((h = t.state) == null ? void 0 : h.visible) === !1)
+      if (((u = t.state) == null ? void 0 : u.visible) === !1)
         return;
       if (this.css3DRenderPlugin || (this.css3DRenderPlugin = k(this.five)), t.stickType === "3DPoint" && !t.normal)
         return console.error("updateRenderPlaneTag: \u4E09\u7EF4\u70B9\u6807\u7B7E\u7F3A\u5C11\u6CD5\u5411\u91CF\uFF01");
@@ -185,11 +186,11 @@ class We extends w {
           return t.position;
         if (f(t))
           return t.data.mediaPosition;
-        const l = t;
+        const d = t;
         return V(
           this.five.camera.position,
-          D(l.position),
-          D(l.normal)
+          D(d.position),
+          D(d.normal)
         );
       })();
       if (!i)
@@ -206,7 +207,7 @@ class We extends w {
         return;
       const s = this.getTagConfig(t).tag3DConfig, r = this.css3DRenderPlugin.create3DDomContainer(i, s);
       !r || (this.updateTagCss3DObjectVisible(t), this.store.css3DRenderDisposer.set(t.id, r.dispose), t.tag3DContentSvelte = {
-        svelteApp: new G({
+        svelteApp: new A({
           target: r.container,
           props: {
             tag: t,
@@ -238,16 +239,16 @@ class We extends w {
     });
   }
   updateTagCss3DObjectMatrix(e, t) {
-    var g, S, v, P;
-    const i = (v = (S = (g = e.mergedConfig) == null ? void 0 : g.tag3DConfig) == null ? void 0 : S.ratio) != null ? v : 216e-5, o = (P = e.tag3DContentSvelte) == null ? void 0 : P.domContainer.css3DObject;
+    var g, v, P, y;
+    const i = (P = (v = (g = e.mergedConfig) == null ? void 0 : g.tag3DConfig) == null ? void 0 : v.ratio) != null ? P : 216e-5, o = (y = e.tag3DContentSvelte) == null ? void 0 : y.domContainer.css3DObject;
     if (!o)
       return;
     const s = f(e) ? e.data.mediaPosition : e.position;
     t.updateWorldMatrix(!1, !1);
-    const r = t.matrixWorld, n = new T().fromArray(s[0]), a = new T().fromArray(s[2]), h = new T().lerpVectors(n, a, 0.5).add(new T(0, 0, 5e-4)), l = new b().setPosition(h), M = new b().makeScale(i, i, i), u = new b().multiply(r).multiply(l).multiply(M);
-    u.decompose(o.position, o.quaternion, o.scale);
-    const d = o.opacityMesh;
-    !d || u.decompose(d.position, d.quaternion, d.scale);
+    const r = t.matrixWorld, a = new T().fromArray(s[0]), n = new T().fromArray(s[2]), u = new T().lerpVectors(a, n, 0.5).add(new T(0, 0, 5e-4)), d = new b().setPosition(u), M = new b().makeScale(i, i, i), h = new b().multiply(r).multiply(d).multiply(M);
+    h.decompose(o.position, o.quaternion, o.scale);
+    const c = o.opacityMesh;
+    !c || h.decompose(c.position, c.quaternion, c.scale);
   }
   addMediaModelTag(e) {
     return C(this, null, function* () {
@@ -264,7 +265,7 @@ class We extends w {
       const i = (t = this.five.getElement()) == null ? void 0 : t.parentElement;
       if (!i)
         return console.error("updateRenderPlaneTag: tag2DContainer not found");
-      this.TagContainerSvelte = new A({
+      this.TagContainerSvelte = new x({
         target: i,
         props: { hooks: this.hooks, tags: e, state: this.state, temporaryState: this.temporaryState, mediaStore: this.mediaStore }
       });

package/libs/PanoTagPlugin/controller/index.js

@@ -39,7 +39,7 @@ import { throttle as R } from "../utils/throttle.js";
 import { resizeObserver as y } from "../utils/resizeObserver.js";
 import B from "../utils/tag/format.js";
 import { generateBlankAudio as O, AudioNamespace as _ } from "../../shared-utils/audio.js";
-import { TagRender as L } from "./TagRender.js";
+import { TagRender as k } from "./TagRender.js";
 import "./TagComputer.js";
 import "../utils/tagPosition.js";
 import "../../shared-utils/three/centerPoint.js";
@@ -146,7 +146,7 @@ import "@realsee/five/gltf-loader";
 import "../utils/model/imageModel.js";
 import "../../shared-utils/three/loadTexture.js";
 const D = "Dnalogel-PanoTagPlugin", qt = (d) => `${D}--${d}`;
-class Kt extends L {
+class Kt extends k {
   constructor(e, t) {
     super(e);
     p(this, "state", { enabled: !0, visible: !0 });
@@ -206,7 +206,7 @@ class Kt extends L {
       }).filter((o) => o.position);
       return s.forEach(B), this.tags.push(...s), I(this.five).then(() => f(this, null, function* () {
         var o, r, n;
-        this.store.eventListenerDisposer && ((r = (o = this.store).eventListenerDisposer) == null || r.call(o)), this.state.enabled && (this.store.eventListenerDisposer = this.addEventListener()), this.addResizeListener(), this.clearUnusedPanelTag(), this.setVisibleAndUnfolded({ withAnimation: (n = t == null ? void 0 : t.withAnimation) != null ? n : !0 }).then(() => this.updateRenderAllTags()), this.updateRenderAllTags(), yield this.addMediaModelTag(s);
+        this.store.eventListenerDisposer && ((r = (o = this.store).eventListenerDisposer) == null || r.call(o)), this.state.enabled && this.handleEnable(), this.addResizeListener(), this.clearUnusedPanelTag(), this.setVisibleAndUnfolded({ withAnimation: (n = t == null ? void 0 : t.withAnimation) != null ? n : !0 }).then(() => this.updateRenderAllTags()), this.updateRenderAllTags(), yield this.addMediaModelTag(s);
       }));
     });
   }

package/libs/PanoTagPlugin/typings/tag/Utils.d.ts

@@ -2,6 +2,7 @@ import { GLTFObject } from '@realsee/five/gltf-loader';
 import { Group } from 'three';
 import type { Tag } from './Tag';
 import type { TagContentType } from './TagData';
+import ImageModel from '../../utils/model/imageModel';
 export declare type TagId = string | number;
 export declare type ArrayPosition = number[];
 export declare type Position = ArrayPosition;
@@ -55,6 +56,9 @@ export interface TagObjectGroup extends Group {
 export interface TagGLTFObjectGroup extends Group {
     children: TagGLTFObject[];
 }
+export interface ImagePlaneGroup extends Group {
+    children: ImageModel[];
+}
 /**
  * @description S: 18; M: 20; L: 24; XL: 28
  */

package/libs/base/BasePlugin.js

@@ -4,7 +4,7 @@ var s = (e, r, t) => (a(e, typeof r != "symbol" ? r + "" : r, t), t);
 import { Subscribe as c } from "../shared-utils/Subscribe.js";
 class o {
   constructor(r, t) {
-    s(this, "VERSION", "2.12.0-alpha.2");
+    s(this, "VERSION", "2.12.0-alpha.4");
     s(this, "five");
     s(this, "hooks", new c());
     s(this, "staticPrefix", "//vrlab-static.ljcdn.com");

package/libs/shared-utils/three/loadTexture.js

@@ -1,28 +1,28 @@
-var i = (r, n, o) => new Promise((s, a) => {
-  var u = (e) => {
+var c = (o, e, r) => new Promise((s, d) => {
+  var l = (n) => {
     try {
-      t(o.next(e));
-    } catch (d) {
-      a(d);
+      i(r.next(n));
+    } catch (t) {
+      d(t);
     }
-  }, m = (e) => {
+  }, m = (n) => {
     try {
-      t(o.throw(e));
-    } catch (d) {
-      a(d);
+      i(r.throw(n));
+    } catch (t) {
+      d(t);
     }
-  }, t = (e) => e.done ? s(e.value) : Promise.resolve(e.value).then(u, m);
-  t((o = o.apply(r, n)).next());
+  }, i = (n) => n.done ? s(n.value) : Promise.resolve(n.value).then(l, m);
+  i((r = r.apply(o, e)).next());
 });
-import * as c from "three";
-const x = new c.TextureLoader();
-function T(r) {
-  return i(this, null, function* () {
-    return new Promise((n, o) => {
-      x.load(r, n, void 0, o);
-    }).then((n) => (n.encoding = c.sRGBEncoding, n));
+import * as a from "three";
+const u = new a.TextureLoader();
+function L(o) {
+  return c(this, null, function* () {
+    return new Promise((e, r) => {
+      u.load(o, e, void 0, r);
+    }).then((e) => (e.encoding = a.sRGBEncoding, e.minFilter = a.LinearFilter, e));
   });
 }
 export {
-  T as loadTexture
+  L as loadTexture
 };

package/package.json

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