@realsee/dnalogel 3.81.4-alpha.1 → 3.81.4

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

@@ -41,9 +41,9 @@ export declare abstract class TagUtil extends BasePlugin.Controller<State, Plugi
     private _cache_pointTag?;
     private _cache_2DPointTag?;
     private _cache_css3DTag?;
-    get filterPointTag(): PointTag<"Panorama" | "Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown">[];
-    get filter2DPointTag(): PointTag<"Panorama" | "Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown">[];
-    get filterCSS3DTag(): (BaseTag<"Panorama" | "Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", "Model"> | BaseTag<"Panorama" | "Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", "Plane"> | BaseTag<"Panorama" | "Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", "3DPoint">)[];
+    get filterPointTag(): PointTag<"Panorama" | "Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "VirtualObject" | "Unknown">[];
+    get filter2DPointTag(): PointTag<"Panorama" | "Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "VirtualObject" | "Unknown">[];
+    get filterCSS3DTag(): (BaseTag<"Panorama" | "Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "VirtualObject" | "Unknown", "Model"> | BaseTag<"Panorama" | "Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "VirtualObject" | "Unknown", "Plane"> | BaseTag<"Panorama" | "Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "VirtualObject" | "Unknown", "3DPoint">)[];
     private _container;
     private timeoutIds;
     protected constructor(five: Five);
@@ -60,7 +60,7 @@ export declare abstract class TagUtil extends BasePlugin.Controller<State, Plugi
     } | {
         reason: any;
         info: {
-            tagInstance: BaseTag<"Panorama" | "Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", StickType>;
+            tagInstance: BaseTag<"Panorama" | "Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "VirtualObject" | "Unknown", StickType>;
             value: boolean;
             reason?: any;
         };
@@ -73,7 +73,7 @@ export declare abstract class TagUtil extends BasePlugin.Controller<State, Plugi
     getTagConfig(tag: Tag, params?: {
         useCache?: boolean;
         fiveMode?: Mode;
-    }): TagConfig<"Panorama" | "Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown">;
+    }): TagConfig<"Panorama" | "Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "VirtualObject" | "Unknown">;
     protected loadVideoFirstFrame: () => void;
     protected getPositions(tag: BaseTag): [THREE.Vector3, THREE.Vector3, THREE.Vector3, THREE.Vector3] | [import("../typings").ArrayPosition, import("../typings").ArrayPosition, import("../typings").ArrayPosition, import("../typings").ArrayPosition];
     protected addObjectClickHandler(tag: BaseTag, object: THREE.Object3D | undefined, handler: (event: Event) => any): () => void;

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

@@ -192,7 +192,7 @@ declare class PanoTagPluginController extends TagRender {
     /**
      * 获取所有 Mask 类型的标签
      */
-    get filterMaskTag(): (import("./Tag/BaseTag").BaseTag<"Panorama" | "Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", import("..").StickType> & {
+    get filterMaskTag(): (import("./Tag/BaseTag").BaseTag<"Panorama" | "Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "VirtualObject" | "Unknown", import("..").StickType> & {
         [key: string]: any;
     })[];
     /**

package/libs/PanoTagPlugin/controller/index.js

@@ -30,7 +30,7 @@ var d = (l, p, e) => new Promise((t, i) => {
 import * as P from "three";
 import { objectAssignDeepExports as v } from "../../vendor/object-assign-deep/objectAssignDeep.js";
 import { arrayPositionToVector3 as k } from "../../shared-utils/positionToVector3.js";
-import { isModelTag as R, isMediaModelTag as G } from "../utils/tag/tagCheck.js";
+import { isAutoLookAtModelTag as R, isMediaModelTag as G } from "../utils/tag/tagCheck.js";
 import { debounce as D } from "../utils/debounce.js";
 import { throttle as O } from "../utils/throttle.js";
 import x, { getTagStickType as N } from "../utils/tag/format.js";

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

@@ -128,6 +128,12 @@ export interface TagConfig<C extends TagContentType = TagContentType> {
              * @default 1
              */
             needPassed?: number;
+            /**
+             * @description 模型加载（loaded）完成前，射线打空时是否判为不可见。
+             * 开启后可避免「模型未加载好时射线打空被误判为未遮挡 → 标签先全部显示，加载后再逐渐消失」的闪烁。
+             * @default false
+             */
+            hideWhenModelNotLoaded?: boolean;
         };
         /**
          * @description 3D标签中 「标签所在平面或垂直于标签法线的平面」 与 「摄像机到标签点或中心点的向量」 的夹角，范围内自动展开，范围外自动收起

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

@@ -150,6 +150,10 @@ export interface ContentTypeMapInterface {
     Model: {
         modelUrl: string;
     };
+    /** 虚拟模型：空间三维对象，渲染同 Model（裸模型），支持自动转向用户 */
+    VirtualObject: {
+        modelUrl: string;
+    };
     Custom: Object;
     Unknown: Object;
 }

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

@@ -1,2 +1,2 @@
 import type { TagConfig } from '../..';
-export default function adaptConfig(config: TagConfig): TagConfig<"Panorama" | "Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown">;
+export default function adaptConfig(config: TagConfig): TagConfig<"Panorama" | "Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "VirtualObject" | "Unknown">;

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

@@ -9,6 +9,10 @@ export declare function isPoint3DTag<T extends TagContentType>(tag: TagInstance<
 export declare function is3DTag<T extends TagContentType>(tag: TagInstance): tag is TagInstance<T, '3DPoint'> | TagInstance<T, 'Plane'>;
 export declare function isMediaModelTag(tag: TagInstance): tag is ModelTagInterface<'MediaModel'>;
 export declare function isModelTag(tag: TagInstance): tag is ModelTagInterface<'Model'>;
+/** 虚拟模型标签（空间三维对象，渲染同纯模型） */
+export declare function isVirtualObjectTag(tag: TagInstance): tag is ModelTagInterface<'VirtualObject'>;
+/** 可自动转向用户的模型标签：纯模型(Model) 或 虚拟模型(VirtualObject) */
+export declare function isAutoLookAtModelTag(tag: TagInstance): tag is ModelTagInterface<'Model'> | ModelTagInterface<'VirtualObject'>;
 export declare function isMediaPlaneTag(tag: TagInstance): tag is PlaneTagInterface<'MediaModel'>;
 export declare function isPolygonTag(tag: TagInstance): tag is PolygonTagInterface;
 export declare function is3DBoxTag(tag: TagInstance): tag is BoxTagInterface;

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

@@ -1,38 +1,46 @@
-function e(n) {
+function i(n) {
   return n.stickType === "Plane";
 }
-function i(n) {
+function o(n) {
   return n.stickType === "3DPoint";
 }
-function t(n) {
+function c(n) {
   return n.stickType === "3DPoint" || n.stickType === "Plane";
 }
-function o(n) {
+function T(n) {
   return n.stickType === "Model" && n.contentType === "MediaModel";
 }
-function c(n) {
+function e(n) {
   return n.stickType === "Model" && n.contentType === "Model";
 }
-function T(n) {
+function t(n) {
+  return n.stickType === "Model" && n.contentType === "VirtualObject";
+}
+function r(n) {
+  return e(n) || t(n);
+}
+function u(n) {
   return n.stickType === "Plane" && n.contentType === "MediaPlane";
 }
 function s(n) {
   return n.stickType === "Polygon";
 }
-function r(n) {
+function a(n) {
   return n.stickType === "3DBox";
 }
-function u(n) {
+function l(n) {
   return n.stickType === "Mask";
 }
 export {
-  r as is3DBoxTag,
-  t as is3DTag,
-  u as isMaskTag,
-  o as isMediaModelTag,
-  T as isMediaPlaneTag,
-  c as isModelTag,
-  e as isPlaneTag,
-  i as isPoint3DTag,
-  s as isPolygonTag
+  a as is3DBoxTag,
+  c as is3DTag,
+  r as isAutoLookAtModelTag,
+  l as isMaskTag,
+  T as isMediaModelTag,
+  u as isMediaPlaneTag,
+  e as isModelTag,
+  i as isPlaneTag,
+  o as isPoint3DTag,
+  s as isPolygonTag,
+  t as isVirtualObjectTag
 };

package/libs/base/BasePlugin.js

@@ -1,7 +1,7 @@
 var e = Object.defineProperty;
 var s = (o, t, i) => t in o ? e(o, t, { enumerable: !0, configurable: !0, writable: !0, value: i }) : o[t] = i;
 var r = (o, t, i) => (s(o, typeof t != "symbol" ? t + "" : t, i), i);
-import { Subscribe as l } from "../shared-utils/Subscribe.js";
+import { Subscribe as m } from "../shared-utils/Subscribe.js";
 import "../shared-utils/tag.js";
 import "three";
 import "../vendor/hammerjs/hammer.js";
@@ -15,7 +15,7 @@ import "../shared-utils/three/blink.js";
 import "../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "../vendor/earcut/src/earcut.js";
-import { FiveUtil as m } from "../shared-utils/Utils/FiveUtil.js";
+import { FiveUtil as l } from "../shared-utils/Utils/FiveUtil.js";
 import { DEFAULT_STATIC_PREFIX as p } from "../shared-utils/url/defaultUrls.js";
 import "../shared-utils/five/FivePuppet.js";
 let I = class {
@@ -23,7 +23,7 @@ let I = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    r(this, "VERSION", "3.81.4-alpha.1");
+    r(this, "VERSION", "3.81.4");
     r(this, "NAME");
     r(this, "five");
     r(this, "workUtil");
@@ -31,9 +31,9 @@ let I = class {
     /**
      * @description: 插件事件钩子
      */
-    r(this, "hooks", new l());
+    r(this, "hooks", new m());
     r(this, "staticPrefix", p);
-    this.five = t, this.fiveUtil = new m(t), this.workUtil = this.fiveUtil.workUtil, i != null && i.staticPrefix && (this.staticPrefix = i.staticPrefix);
+    this.five = t, this.fiveUtil = new l(t), this.workUtil = this.fiveUtil.workUtil, i != null && i.staticPrefix && (this.staticPrefix = i.staticPrefix);
   }
   set workCode(t) {
     this.workUtil.workCode = t, this.onWorkCodeChange();

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.81.4-alpha.1",
+    "%c %c@realsee/dnalogel %cv3.81.4",
     [
       "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

@@ -1,6 +1,6 @@
 {
   "name": "@realsee/dnalogel",
-  "version": "3.81.4-alpha.1",
+  "version": "3.81.4",
   "main": "./dist/index.js",
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",