@realsee/dnalogel 2.6.4 → 2.6.7-dev.0

package/libs/PanoTagPlugin/tag.config.js

@@ -50,6 +50,15 @@ const e = {
       visibleConfig: {
         alwaysShowWhenMovePano: !0
       }
+    },
+    MediaModel: {
+      unfoldedConfig: {
+        keep: "unfolded"
+      },
+      visibleConfig: {
+        keep: "visible",
+        alwaysShowWhenMovePano: !0
+      }
     }
   }
 };

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

@@ -8,6 +8,7 @@ import type { Subscribe } from '@realsee/five';
 import type { TagId, StickType } from './tag/Utils';
 import type { TagContentType } from './tag/TagData';
 import type { Tag } from './tag/Tag';
+import { GLTFObject } from '@realsee/five/gltf-loader';
 declare type NonNullable<T> = T extends null | undefined | void ? never : T;
 export declare type TagHooks = InstanceType<typeof PanoTagPluginController>['hooks'];
 export interface State extends BasePlugin.State {
@@ -73,11 +74,17 @@ export interface TagCache {
     minimumDistanceResult?: boolean;
     distance?: number;
     angle?: number;
-    __debug_visiblereason__?: {
+    /** MedialModelTag 中，多媒体的隐藏 & 展示 */
+    modelMedialVisible?: boolean;
+    __debug_visible_reason__?: {
         value: boolean;
         reason?: string;
     };
 }
+export declare type TagGLTFObject = GLTFObject & {
+    customID: number | string;
+    isTagModel: boolean;
+};
 export declare type TagElement<C extends TagContentType = TagContentType, S extends StickType = StickType> = Tag<C, S> & Partial<{
     pointTagStyle: {
         leftPercent: number;
@@ -102,7 +109,14 @@ export declare type TagElement<C extends TagContentType = TagContentType, S exte
     };
     hooks: Subscribe<TagEvents>;
     mergedConfig: TagConfig<C, S>;
-};
+} & (S extends 'Model' ? {
+    model?: {
+        promise: Promise<TagGLTFObject>;
+        object?: TagGLTFObject;
+    };
+} : unknown) & (C extends 'MediaModel' ? {
+    mediaVisible?: boolean;
+} : unknown);
 export declare type MediaStore = Writable<{
     currentMediaElement: HTMLMediaElement | null;
 }>;
@@ -110,4 +124,5 @@ export declare type PointTagElement<C extends TagContentType = TagContentType> =
 export declare type PlaneTagElement<C extends TagContentType = TagContentType> = TagElement<C, 'Plane'>;
 export declare type Point2DElement<C extends TagContentType = TagContentType> = TagElement<C, '2DPoint'>;
 export declare type Point3DElement<C extends TagContentType = TagContentType> = TagElement<C, '3DPoint'>;
+export declare type ModelElement<C extends TagContentType = TagContentType> = TagElement<C, 'Model'>;
 export {};

package/libs/PanoTagPlugin/typings/controller.js

@@ -1 +1 @@
-
+import "@realsee/five/gltf-loader";

package/libs/PanoTagPlugin/typings/index.js

@@ -1,7 +1,8 @@
-import { ContentType as n } from "./tag/TagData.js";
-import { DimensionType as t, PointType as r } from "./tag/Utils.js";
+import "@realsee/five/gltf-loader";
+import { ContentType as t } from "./tag/TagData.js";
+import { DimensionType as r, PointType as i } from "./tag/Utils.js";
 export {
-  n as ContentType,
-  t as DimensionType,
-  r as PointType
+  t as ContentType,
+  r as DimensionType,
+  i as PointType
 };

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

@@ -30,7 +30,7 @@ export declare type Tag<C extends TagContentType = TagContentType, S extends Sti
     /** @type {TagContentType} 内容类型，根据内容类型展示对应UI */
     contentType: C;
     /** 点 */
-    position: S extends 'Plane' ? [Position, Position, Position, Position] : S extends '2DPoint' | '3DPoint' ? Position : any;
+    position: S extends 'Plane' ? [Position, Position, Position, Position] : S extends '2DPoint' | '3DPoint' | 'Model' ? Position : any;
     /** 法向量 */
     normal?: Position;
     /** 自定义标签内容 */
@@ -50,4 +50,7 @@ export declare type Tag<C extends TagContentType = TagContentType, S extends Sti
     };
 } & (S extends '3DPoint' ? {
     normal: Position;
-} : unknown); /** 三维标签需要法向量 */
+} : unknown) & // 三维标签需要法向量
+(S extends 'Model' ? {
+    matrix: number[];
+} : unknown);

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

@@ -1,4 +1,4 @@
-import type { TagIconUrl } from './Utils';
+import type { Position, TagIconUrl } from './Utils';
 export declare type MediaData = {
     type: 'Image';
     url: string;
@@ -30,10 +30,14 @@ export declare enum ContentType {
     Marketing = "Marketing",
     /** 图片视频贴片 */
     MediaPlane = "MediaPlane",
+    /** 带有多媒体的模型 */
+    MediaModel = "MediaModel",
     /** 其他/自定义标签 */
-    Custom = "Custom"
+    Custom = "Custom",
+    /** Unknown */
+    Unknown = "Unknown"
 }
-export declare type TagContentType = keyof typeof ContentType | 'Unknown';
+export declare type TagContentType = keyof typeof ContentType;
 /**
  * @description: 标签数据
  */
@@ -147,6 +151,18 @@ interface ContentTypeMapInterface {
         playIcon?: 'withText' | 'withoutText' | string;
         extraData?: Object;
     };
+    MediaModel: {
+        modelUrl: string;
+        matrix?: number[];
+        mediaPosition: [Position, Position, Position, Position];
+        /** 多媒体在容器中的适配规则 */
+        objectFit?: ObjectFit;
+        action?: {
+            url: string;
+            type: 'iframe' | 'window';
+        };
+        mediaData: MediaData[];
+    };
     Custom: Object;
     Unknown: Object;
 }

package/libs/PanoTagPlugin/typings/tag/TagData.js

@@ -1,4 +1,4 @@
-var a = /* @__PURE__ */ ((i) => (i.Audio = "Audio", i.Text = "Text", i.ImageText = "ImageText", i.Image = "Image", i.Video = "Video", i.Link = "Link", i.VRLink = "VRLink", i.PanoLink = "PanoLink", i.Marketing = "Marketing", i.MediaPlane = "MediaPlane", i.Custom = "Custom", i))(a || {});
+var a = /* @__PURE__ */ ((i) => (i.Audio = "Audio", i.Text = "Text", i.ImageText = "ImageText", i.Image = "Image", i.Video = "Video", i.Link = "Link", i.VRLink = "VRLink", i.PanoLink = "PanoLink", i.Marketing = "Marketing", i.MediaPlane = "MediaPlane", i.MediaModel = "MediaModel", i.Custom = "Custom", i.Unknown = "Unknown", i))(a || {});
 export {
   a as ContentType
 };

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

@@ -22,7 +22,7 @@ export declare enum PointType {
 }
 /**  @deprecated 改用 stickType */
 export declare type TagPointType = keyof typeof PointType;
-export declare type StickType = '2DPoint' | '3DPoint' | 'Plane';
+export declare type StickType = '2DPoint' | '3DPoint' | 'Plane' | 'Model';
 export interface TagIconUrl {
     url: string;
     /** 指切图是几倍图，如 2倍图, 3倍图，默认值为 3 */

package/libs/PanoTagPlugin/utils/addDebugPoints.js

@@ -1,7 +1,8 @@
 import * as o from "three";
 import { arrayPositionToVector3 as c } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
-function M(h, p) {
-  p.forEach((t) => {
+import "@realsee/five/gltf-loader";
+function f(p, h) {
+  h.forEach((t) => {
     const r = new o.SphereGeometry(0.02, 16, 16), i = [], a = [
       new o.MeshBasicMaterial({ color: 16776960 }),
       new o.MeshBasicMaterial({ color: 16711935 }),
@@ -18,10 +19,10 @@ function M(h, p) {
       s.position.copy(c(t.position)), i.push(s);
     }
     i.forEach((e) => {
-      e.material.depthTest = !1, h.scene.add(e);
+      e.material.depthTest = !1, p.scene.add(e);
     });
   });
 }
 export {
-  M as addDebugPoints
+  f as addDebugPoints
 };

package/libs/PanoTagPlugin/utils/color.js

@@ -1,11 +1,11 @@
-function n(a) {
+function n(o) {
   const e = document.createElement("div");
-  e.style.color = a, document.body.appendChild(e);
+  e.style.color = o, document.body.appendChild(e);
   const t = window.getComputedStyle(e).color;
-  document.body.removeChild(e);
-  const o = (() => t.search("rgba") === -1 ? t.replace("rgb", "rgba").replace(")", ", 1)") : t)(), r = o.replace("rgba", "").replace("(", "").replace(")", "").split(",").map((c) => Number(c.trim()));
+  e.remove();
+  const a = (() => t.search("rgba") === -1 ? t.replace("rgb", "rgba").replace(")", ", 1)") : t)(), r = a.replace("rgba", "").replace("(", "").replace(")", "").split(",").map((c) => Number(c.trim()));
   return {
-    rgba: o,
+    rgba: a,
     r: r[0],
     g: r[1],
     b: r[2],

package/libs/PanoTagPlugin/utils/index.js

@@ -1,37 +1,40 @@
-import { centerPoint as t } from "../../CSS3DRenderPlugin/utils/centerPoint.js";
-import { even as a } from "../../CSS3DRenderPlugin/utils/even.js";
-import { random as n } from "../../CSS3DRenderPlugin/utils/random.js";
-import { anyPositionToVector3 as f, arrayPositionToVector3 as x, positionToVector3 as s } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
-import { addDebugPoints as l } from "./addDebugPoints.js";
-import { noTypecheck as P } from "./noTypecheck.js";
-import { planeNormal as T } from "./planeNormal.js";
-import { tagPosition as b } from "./tagPosition.js";
-import { checkRange as u } from "./checkRange.js";
-import { actionAfterFiveModelLoad as y, waitFiveModelLoaded as F } from "./actionAfterFiveModelLoad.js";
-import { normalPositionToPositions as k } from "./normalPositionToPositions.js";
-import { debounce as S } from "./debounce.js";
-import { throttle as z } from "./throttle.js";
-import { binarySearchFirstBig as B, searchFirstValueSmallThanLastValue as D } from "./search.js";
-import { resizeObserver as O } from "./resizeObserver.js";
+import { centerPoint as a } from "../../CSS3DRenderPlugin/utils/centerPoint.js";
+import { even as n } from "../../CSS3DRenderPlugin/utils/even.js";
+import { random as f } from "../../CSS3DRenderPlugin/utils/random.js";
+import { anyPositionToVector3 as x, arrayPositionToVector3 as c, positionToVector3 as l } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
+import { addDebugPoints as P } from "./addDebugPoints.js";
+import { noTypecheck as g } from "./noTypecheck.js";
+import { planeNormal as V } from "./planeNormal.js";
+import { getTagPosition as u, tagPosition as v } from "./tagPosition.js";
+import { checkRange as F } from "./checkRange.js";
+import { actionAfterFiveModelLoad as k, waitFiveModelLoaded as M } from "./actionAfterFiveModelLoad.js";
+import { normalPositionToPositions as w } from "./normalPositionToPositions.js";
+import { debounce as A } from "./debounce.js";
+import { throttle as D } from "./throttle.js";
+import { binarySearchFirstBig as O, searchFirstValueSmallThanLastValue as R } from "./search.js";
+import { resizeObserver as q } from "./resizeObserver.js";
 import "three";
+import "@realsee/five/gltf-loader";
+import "./tag/tagCheck.js";
 export {
-  y as actionAfterFiveModelLoad,
-  l as addDebugPoints,
-  f as anyPositionToVector3,
-  x as arrayPositionToVector3,
-  B as binarySearchFirstBig,
-  t as centerPoint,
-  u as checkRange,
-  S as debounce,
-  a as even,
-  P as noTypecheck,
-  k as normalPositionToPositions,
-  T as planeNormal,
-  s as positionToVector3,
-  n as random,
-  O as resizeObserver,
-  D as searchFirstValueSmallThanLastValue,
-  b as tagPosition,
-  z as throttle,
-  F as waitFiveModelLoaded
+  k as actionAfterFiveModelLoad,
+  P as addDebugPoints,
+  x as anyPositionToVector3,
+  c as arrayPositionToVector3,
+  O as binarySearchFirstBig,
+  a as centerPoint,
+  F as checkRange,
+  A as debounce,
+  n as even,
+  u as getTagPosition,
+  g as noTypecheck,
+  w as normalPositionToPositions,
+  V as planeNormal,
+  l as positionToVector3,
+  f as random,
+  q as resizeObserver,
+  R as searchFirstValueSmallThanLastValue,
+  v as tagPosition,
+  D as throttle,
+  M as waitFiveModelLoaded
 };

package/libs/PanoTagPlugin/utils/planeNormal.js

@@ -1,11 +1,12 @@
 import "three";
 import { anyPositionToVector3 as c } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
-function i(t) {
+import "@realsee/five/gltf-loader";
+function m(t) {
   if (t.length < 3)
     return;
   const o = t.map(c), r = o[1].clone().sub(o[0]), n = o[2].clone().sub(o[1]);
   return r.cross(n);
 }
 export {
-  i as planeNormal
+  m as planeNormal
 };

package/libs/PanoTagPlugin/utils/tag/index.d.ts

@@ -0,0 +1,2 @@
+import { Tag } from '../../typings';
+export declare function getMediaModelPlanPositions(tag: Tag<'MediaModel', 'Model'>): number[][];

package/libs/PanoTagPlugin/utils/tag/index.js

@@ -0,0 +1,11 @@
+import { Matrix4 as e, Vector3 as o } from "three";
+import "@realsee/five/gltf-loader";
+function p(r) {
+  if (!r.matrix)
+    return;
+  const t = new e().fromArray(r.matrix), { mediaPosition: i } = r.data;
+  return i.map((n) => new o().fromArray(n).add(new o(0, 0, 5e-4)).applyMatrix4(t).toArray());
+}
+export {
+  p as getMediaModelPlanPositions
+};

package/libs/PanoTagPlugin/utils/tag/tagCheck.d.ts

@@ -1,7 +1,8 @@
-import type { Tag } from '../../typings';
+import type { Tag, TagElement } from '../../typings';
 export declare function isPointTag(tag: Tag): boolean;
 export declare function isPlaneTag(tag: Tag): boolean;
 export declare function isPoint2DTag(tag: Tag): boolean;
 export declare function isPoint3DTag(tag: Tag): boolean;
 export declare function is2DTag(tag: Tag): boolean;
 export declare function is3DTag(tag: Tag): boolean;
+export declare function isMediaModelTag(tag: Tag): tag is TagElement<'MediaModel', 'Model'>;

package/libs/PanoTagPlugin/utils/tag/tagCheck.js

@@ -13,12 +13,16 @@ function o(n) {
 function c(n) {
   return n.stickType === "2DPoint";
 }
-function s(n) {
+function T(n) {
   return n.stickType === "3DPoint" || n.stickType === "Plane";
 }
+function s(n) {
+  return n.stickType === "Model" && n.contentType === "MediaModel";
+}
 export {
   c as is2DTag,
-  s as is3DTag,
+  T as is3DTag,
+  s as isMediaModelTag,
   t as isPlaneTag,
   e as isPoint2DTag,
   o as isPoint3DTag,

package/libs/PanoTagPlugin/utils/tagPosition.d.ts

@@ -1,3 +1,5 @@
-import type { Vector3 } from 'three';
+import { Vector3 } from 'three';
 import { AnyPosition } from '.';
+import { Tag } from '../typings';
 export declare function tagPosition(position: AnyPosition | [AnyPosition, AnyPosition, AnyPosition, AnyPosition]): Vector3;
+export declare function getTagPosition(tag: Tag): Vector3;

package/libs/PanoTagPlugin/utils/tagPosition.js

@@ -1,13 +1,25 @@
-import { centerPoint as e } from "../../CSS3DRenderPlugin/utils/centerPoint.js";
-import { anyPositionToVector3 as o } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
-import "three";
-function p(r) {
+import { Matrix4 as s, Vector3 as m } from "three";
+import { centerPoint as n } from "../../CSS3DRenderPlugin/utils/centerPoint.js";
+import { anyPositionToVector3 as t, arrayPositionToVector3 as p } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
+import "@realsee/five/gltf-loader";
+import { isPointTag as a, isMediaModelTag as c } from "./tag/tagCheck.js";
+function f(r) {
   if (Array.isArray(r) && r.length === 4) {
-    const t = r.map(o);
-    return e(t[0], t[2]);
+    const o = r.map(t);
+    return n(o[0], o[2]);
   } else
-    return o(r);
+    return t(r);
+}
+function T(r) {
+  if (a(r))
+    return p(r == null ? void 0 : r.position);
+  if (c(r) && r.matrix) {
+    const i = new s().fromArray(r.matrix), o = r.data.mediaPosition.map((e) => new m().fromArray(e).applyMatrix4(i));
+    return n(o[0], o[2]);
+  } else
+    return f(r.position);
 }
 export {
-  p as tagPosition
+  T as getTagPosition,
+  f as tagPosition
 };