@realsee/dnalogel 3.81.4-alpha.1 → 3.81.4

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
+## 3.81.4
 
+- feat(PanoTagPlugin): 增加融合标签数据类型，stickType="Fusion" 
+- feat(PanoTagPlugin): 添加虚拟模型标签contentType="VirtualObject"，stickType="Model"
+  
+## 3.81.3
+
+- feat(PanoTagPlugin): 增加碰撞检测时机开关，开关开启后：模型loaded 完成前标签直接判为不可见，等模型加载完成重算时再得出真实遮挡结果。。
+  
 ## 3.81.2
 
 - fix(Sculpt): 英制英寸分数展示保留所选精度分母，不再约分（如 1/16″ 精度下 `8/16` 保持为 `8/16`，不再简化为 `1/2`），避免精度档位显示不一致。

package/dist/PanoTagPlugin/Archive/deprecated.d.ts

@@ -32,6 +32,8 @@ export declare enum ContentType {
     MediaModel = "MediaModel",
     /** 模型 */
     Model = "Model",
+    /** 虚拟模型（空间三维对象，独立于虚拟广告牌，支持自动转向用户） */
+    VirtualObject = "VirtualObject",
     /** 全景 */
     Panorama = "Panorama",
     /** 其他/自定义标签 */

package/dist/PanoTagPlugin/controller/Tag/BaseTag.d.ts

@@ -76,7 +76,7 @@ export declare abstract class BaseTag<C extends TagContentType = TagContentType,
     get fiveUtil(): import("../../../shared-utils/Utils/FiveUtil").FiveUtil;
     get workUtil(): import("../../../shared-utils/Utils/WorkUtil").WorkUtil;
     get centerPosition(): THREE.Vector3;
-    get currentConfig(): TagConfig<"Panorama" | "Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown">;
+    get currentConfig(): TagConfig<"Panorama" | "Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "VirtualObject" | "Unknown">;
     get currentVisible(): boolean;
     tag3DContentSvelte?: {
         svelteApp: TagContentSvelte;
@@ -249,7 +249,7 @@ export declare abstract class BaseTag<C extends TagContentType = TagContentType,
     } | {
         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;
         };

package/dist/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/dist/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/dist/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/dist/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/dist/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/dist/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;