@realsee/dnalogel 3.81.9-alpha.0 → 3.81.10-alpha.0

package/CHANGELOG.md

@@ -1,9 +1,8 @@
 # CHANGELOG
+## 3.81.9
 
-## 3.81.9-alpha.0
-
-- fix(PanoTagPlugin): 平面视频标签不可见时暂停并在再次可见时保持暂停，dispose 时停止复用纹理上的视频，mesh 挂载后立即刷新避免画面空白
-
+- perf(PanoTagPlugin): 优化mask锯齿
+- 
 ## 3.81.8
 
 - feat(ModelMakerPlugin): 新增 `tagOcclusionScope`，支持按 `group`、`self`、`none` 控制区域标签参与射线检测的 ModelMaker 对象范围

package/dist/CruisePlugin/Work.d.ts

@@ -2,6 +2,8 @@ import type { Five, State } from '@realsee/five';
 import type { PluginState, PluginServerData, PluginData, CruiseKeyframe, MoveEffect, Config } from './typing';
 import CruiseController from './BaseController';
 export default class WalkController extends CruiseController<PluginData, Config> {
+    private audioTask;
+    private audioCurrent?;
     state: PluginState;
     protected privateState: {
         /**
@@ -24,6 +26,7 @@ export default class WalkController extends CruiseController<PluginData, Config>
         audioCache?: Map<string, HTMLAudioElement>;
     };
     constructor(five: Five, config?: Config);
+    protected handleDispose(): void;
     /**
      * @description Load Data and State
      */

package/dist/CurrentPanoImagePlugin/Controller.d.ts

@@ -10,8 +10,9 @@ export declare class CurrentPanoImagePluginController extends BasePlugin.Control
         yOffset: number;
         yRotate: number;
         imageURL: string;
+        audioFocus?: import("..").AudioFocusHost;
         staticPrefix?: string;
-        i18n?: (key: string) => string; /** 插件当前状态 */
+        i18n?: (key: string) => string;
     };
     /** 是否已经被销毁 */
     get disposed(): boolean;

package/dist/ModelTVVideoPlugin/typings.d.ts

@@ -1,4 +1,6 @@
+import type { AudioFocusHost } from '../shared-utils/audioFocus';
 export interface ModelTVVideoPluginParameterType {
+    audioFocus?: AudioFocusHost;
     videoElement?: HTMLVideoElement;
 }
 export declare enum DIRECTION {

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

@@ -1,3 +1,4 @@
+import type { AudioIntent, AudioFocusHost } from '../../../shared-utils/audioFocus';
 import type { Mode, State as FiveState } from '@realsee/five';
 import type PanoTagPluginController from '..';
 import type { StickType, Tag, TagClickParams, TagConfig, TagContentType, Tag as TagData, TagEvents, TagGLTFObject, TagId } from '../..';
@@ -70,7 +71,13 @@ export declare abstract class BaseTag<C extends TagContentType = TagContentType,
     zIndex?: number;
     manuallyOperated: boolean;
     normalLineLength?: number;
-    play?: () => void;
+    private audioFocusOverride?;
+    private audioFocusBindings;
+    get audioFocus(): AudioFocusHost | undefined;
+    /** Bind this tag to a parent media task; undefined restores the plugin host. */
+    setAudioFocus(host?: AudioFocusHost): void;
+    bindAudioFocus(bind: (host?: AudioFocusHost) => void): () => void;
+    play?: (intent?: AudioIntent) => void;
     pause?: () => void;
     get five(): import("@realsee/five").Five;
     get fiveUtil(): import("../../../shared-utils/Utils/FiveUtil").FiveUtil;

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

@@ -69,6 +69,7 @@ export declare class MaskTag<C extends TagContentType = TagContentType> extends
     private initializeMaskMesh;
     /** 构建用于 mergedTexture 的 style 对象（color 作 id），tolerance 0–255 */
     private buildStyleForMaterial;
+    private static getMaskTexelSize;
     private static createSharedMesh;
     /** 仅更新材质中某一 slot 的 style（用于 enable/disable/updateMaskStyle） */
     private updateStyleSlotInMaterial;

package/dist/PanoTagPlugin/controller/Tag/MaskTag.shaders.d.ts

@@ -7,4 +7,4 @@
  */
 export declare const maskVertexShader = "\nvarying vec2 vUv;\nvoid main() {\n  vUv = uv;\n  gl_Position = projectionMatrix * modelViewMatrix * vec4(position, 1.0);\n}\n";
 /** 多 style：mergedTexture 中每组 3 像素为 color(id)/tolerance+highlight/opacity，用 color 作 id 匹配 */
-export declare const maskFragmentShaderMulti = "\n#define RESOLUTION 2048.0\n#define MAX_GROUPS 64\n#define STRICT_MATCH 0.5/255.0\n\nvarying vec2 vUv;\nuniform sampler2D map;\nuniform sampler2D mergedTexture;\nuniform float groupCount;\nuniform float textureWidth;\nuniform float pixelsPerGroup;\n\nfloat colorGap(vec3 a, vec3 b) {\n  return abs(a.r - b.r) + abs(a.g - b.g) + abs(a.b - b.b);\n}\n\nvec4 readStyleColor(float groupIndex) {\n  float px = groupIndex * pixelsPerGroup;\n  float texX = (px + 0.5) / textureWidth;\n  return texture2D(mergedTexture, vec2(texX, 0.5));\n}\n\nvec4 readStyleToleranceHighlight(float groupIndex) {\n  float px = groupIndex * pixelsPerGroup + 1.0;\n  float texX = (px + 0.5) / textureWidth;\n  return texture2D(mergedTexture, vec2(texX, 0.5));\n}\n\nfloat readStyleOpacity(float groupIndex) {\n  float px = groupIndex * pixelsPerGroup + 2.0;\n  float texX = (px + 0.5) / textureWidth;\n  return texture2D(mergedTexture, vec2(texX, 0.5)).r;\n}\n\nfloat detectEdge(sampler2D map, vec2 uv, vec3 matchColor, float tolerance) {\n  vec4 centerColor = texture2D(map, uv);\n  if (colorGap(centerColor.rgb, matchColor) >= tolerance) return 0.0;\n  float step = 1.0 / RESOLUTION;\n  vec4 u = texture2D(map, uv + vec2(0.0, -step));\n  vec4 l = texture2D(map, uv + vec2(-step, 0.0));\n  vec4 r = texture2D(map, uv + vec2(step, 0.0));\n  vec4 d = texture2D(map, uv + vec2(0.0, step));\n  bool edge = colorGap(u.rgb, matchColor) >= tolerance || colorGap(l.rgb, matchColor) >= tolerance\n    || colorGap(r.rgb, matchColor) >= tolerance || colorGap(d.rgb, matchColor) >= tolerance;\n  return edge ? 1.0 : 0.0;\n}\n\nvoid main() {\n  vec4 image = texture2D(map, vUv);\n  if (image.r == 0.0 && image.g == 0.0 && image.b == 0.0) discard;\n\n  // WebGL 1.0 \u8981\u6C42\u5FAA\u73AF\u7EC8\u6B62\u6761\u4EF6\u5FC5\u987B\u662F\u7F16\u8BD1\u65F6\u5E38\u91CF\uFF0C\u6240\u4EE5\u7528 MAX_GROUPS\uFF0C\u5FAA\u73AF\u5185\u68C0\u67E5 groupCount\n  for (float i = 0.0; i < float(MAX_GROUPS); i += 1.0) {\n    if (i < groupCount) {\n      vec4 styleColor = readStyleColor(i);\n      vec3 colorRgb = styleColor.rgb;\n      float tol = readStyleToleranceHighlight(i).r * 3.0;\n      vec3 highlight = readStyleToleranceHighlight(i).gba;\n      float opacity = readStyleOpacity(i);\n      \n      if (opacity > 0.0) {\n        float gap = colorGap(image.rgb, colorRgb);\n        if (gap > STRICT_MATCH) continue;\n        float smoothRange = 0.01;\n        float matchFactor = 1.0 - smoothstep(tol - smoothRange, tol + smoothRange, gap);\n        if (matchFactor > 0.0) {\n          float isEdge = detectEdge(map, vUv, colorRgb, tol);\n          float alpha = mix(opacity, 1.0, isEdge);\n          alpha *= max(matchFactor, 0.9);\n          gl_FragColor = vec4(highlight, alpha);\n          return;\n        }\n      }\n    }\n  }\n  discard;\n}\n";
+export declare const maskFragmentShaderMulti = "\n#define MAX_GROUPS 64\n#define STRICT_MATCH 0.5/255.0\n\nvarying vec2 vUv;\nuniform sampler2D map;\nuniform sampler2D mergedTexture;\nuniform float groupCount;\nuniform float textureWidth;\nuniform float pixelsPerGroup;\nuniform vec2 maskTexelSize;\n\nfloat colorGap(vec3 a, vec3 b) {\n  return abs(a.r - b.r) + abs(a.g - b.g) + abs(a.b - b.b);\n}\n\nfloat exactMatch(vec3 sampleColor, vec3 targetColor) {\n  return colorGap(sampleColor, targetColor) <= STRICT_MATCH ? 1.0 : 0.0;\n}\n\nvec4 readStyleColor(float groupIndex) {\n  float px = groupIndex * pixelsPerGroup;\n  float texX = (px + 0.5) / textureWidth;\n  return texture2D(mergedTexture, vec2(texX, 0.5));\n}\n\nvec4 readStyleToleranceHighlight(float groupIndex) {\n  float px = groupIndex * pixelsPerGroup + 1.0;\n  float texX = (px + 0.5) / textureWidth;\n  return texture2D(mergedTexture, vec2(texX, 0.5));\n}\n\nfloat readStyleOpacity(float groupIndex) {\n  float px = groupIndex * pixelsPerGroup + 2.0;\n  float texX = (px + 0.5) / textureWidth;\n  return texture2D(mergedTexture, vec2(texX, 0.5)).r;\n}\n\nvoid main() {\n  vec4 center = texture2D(map, vUv);\n  vec2 quarterTexel = maskTexelSize * 0.25;\n  vec3 sample0 = texture2D(map, vUv + quarterTexel * vec2(-1.0, -1.0)).rgb;\n  vec3 sample1 = texture2D(map, vUv + quarterTexel * vec2(1.0, -1.0)).rgb;\n  vec3 sample2 = texture2D(map, vUv + quarterTexel * vec2(-1.0, 1.0)).rgb;\n  vec3 sample3 = texture2D(map, vUv + quarterTexel * vec2(1.0, 1.0)).rgb;\n\n  float bestCoverage = 0.0;\n  float bestScore = -1.0;\n  float bestOpacity = 0.0;\n  vec3 bestHighlight = vec3(0.0);\n\n  // WebGL 1.0 \u8981\u6C42\u5FAA\u73AF\u7EC8\u6B62\u6761\u4EF6\u5FC5\u987B\u662F\u7F16\u8BD1\u65F6\u5E38\u91CF\uFF0C\u6240\u4EE5\u7528 MAX_GROUPS\uFF0C\u5FAA\u73AF\u5185\u68C0\u67E5 groupCount\n  for (float i = 0.0; i < float(MAX_GROUPS); i += 1.0) {\n    if (i < groupCount) {\n      vec3 colorRgb = readStyleColor(i).rgb;\n      vec3 highlight = readStyleToleranceHighlight(i).gba;\n      float opacity = readStyleOpacity(i);\n\n      if (opacity > 0.0) {\n        float coverage = 0.25 * (\n          exactMatch(sample0, colorRgb) +\n          exactMatch(sample1, colorRgb) +\n          exactMatch(sample2, colorRgb) +\n          exactMatch(sample3, colorRgb)\n        );\n        // coverage \u76F8\u540C\u65F6\u4F18\u5148\u9009\u62E9\u4E2D\u5FC3\u50CF\u7D20\u6240\u5C5E\u6807\u7B7E\uFF0C\u907F\u514D\u76F8\u90BB\u6807\u7B7E\u8FB9\u754C\u968F\u6CE8\u518C\u987A\u5E8F\u95EA\u70C1\u3002\n        float score = coverage + exactMatch(center.rgb, colorRgb) * 0.001;\n        if (coverage > 0.0 && score > bestScore) {\n          bestCoverage = coverage;\n          bestScore = score;\n          bestOpacity = opacity;\n          bestHighlight = highlight;\n        }\n      }\n    }\n  }\n\n  if (bestCoverage > 0.0) {\n    gl_FragColor = vec4(bestHighlight, bestOpacity * bestCoverage);\n    return;\n  }\n  discard;\n}\n";

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

@@ -9,8 +9,6 @@ export declare class PlaneTag<C extends TagContentType = TagContentType> extends
     private _floorIndex?;
     private _floorIndexDirty;
     private _opacity?;
-    /** 曾因标签不可见被自动暂停：再次可见时保持暂停并展示播放按钮，等用户主动播放 */
-    private pausedByInvisible;
     constructor(plugin: PanoTagPluginController, tagData: TagData);
     /** 获取透明度 */
     get opacity(): number;
@@ -21,8 +19,6 @@ export declare class PlaneTag<C extends TagContentType = TagContentType> extends
     /** 标记 floorIndex 需要重新计算（在位置等相关数据变化时调用） */
     invalidateFloorIndex(): void;
     applyVisible(): void;
-    /** 销毁 mediaPlane 及其独占的媒体资源 */
-    private disposeMediaPlane;
     set(tag: PartialObjectDeep<Tag<C, 'Plane'>>, deepMerge?: boolean): void;
     setData(...data: Parameters<InstanceType<typeof BaseTag<C, 'Plane'>>['setData']>): void;
     /** 计算楼层索引 */

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

@@ -1,3 +1,4 @@
+import type { AudioFocusHost } from '../../shared-utils/audioFocus';
 import type { Tag, TagId, Tags, State, ContentTypeConfigKey } from '../typings';
 import type { TagClickParams, TagConfigByKey, TagContentType } from '..';
 import type { ArrayPosition } from '../typings';
@@ -6,6 +7,7 @@ import { TagRender } from './TagRender';
 import type { PartialObjectDeep } from '../../typings/typings';
 export declare const pluginFlag: (name: string) => string;
 declare class PanoTagPluginController extends TagRender {
+    audioFocus?: AudioFocusHost;
     /** state */
     state: {
         enabled: boolean;
@@ -17,6 +19,7 @@ declare class PanoTagPluginController extends TagRender {
     /** 全局 hover 启用状态，默认 true */
     globalHoverEnabled: boolean;
     constructor(five: Five, params?: {
+        audioFocus?: AudioFocusHost;
         config?: Pick<Tags, 'contentTypeConfig' | 'globalConfig'>;
         debug?: boolean;
         containerZIndex?: number;

package/dist/PanoTagPlugin/utils/audio/SharedAudio.d.ts

@@ -1,3 +1,4 @@
+import { type AudioFocusHost, type AudioIntent } from '../../../shared-utils/audioFocus';
 import { AudioDiagnostics } from './AudioDiagnostics';
 export { AudioDiagnostics };
 export declare class SharedAudio extends Audio {
@@ -10,9 +11,13 @@ export declare class SharedAudio extends Audio {
     private tryplaying;
     private audioInstance?;
     private eventListenerDisposer?;
-    constructor(src?: string);
-    play(): Promise<void>;
+    private task;
+    private poolGeneration;
+    constructor(src?: string, audioFocus?: AudioFocusHost);
+    play(intent?: AudioIntent): Promise<void>;
+    setAudioFocus(host?: AudioFocusHost): void;
     pause(e?: Event): void;
+    private stopOutput;
     dispose(): void;
     private clear;
     private handlePlayError;

package/dist/PanoTagPlugin/utils/model/mediaPlane.d.ts

@@ -1,3 +1,4 @@
+import { type AudioFocusHost, type AudioIntent } from '../../../shared-utils/audioFocus';
 import * as THREE from 'three';
 import { Vector3 } from 'three';
 import type { FiveDomEvents } from '../../../shared-utils/five/FiveDomEvents';
@@ -54,9 +55,9 @@ declare class VideoPlane extends MediaPlane {
     private videoTextureMap;
     private ImageTextureMap;
     private initialOpacity;
-    private requestFiveRender?;
-    private disposed;
+    private audioTask;
     constructor(videoSrc: string, cornerPoints: Vector3[], params?: {
+        audioFocus?: AudioFocusHost;
         paused?: boolean;
         playButton?: 'withText' | 'withoutText' | string;
         videoCoverSrc?: string;
@@ -68,15 +69,13 @@ declare class VideoPlane extends MediaPlane {
         }>;
         domEvents?: FiveDomEvents;
         opacity?: number;
-        requestFiveRender?: () => void;
     });
-    play(muted?: boolean): Promise<void>;
-    pause(): void;
-    /**
-     * videoInstance 由按 src 复用的纹理缓存持有，不随 mesh 一起释放；
-     * 这里不显式暂停的话，贴片移出场景后视频仍会继续走进度并出声。
-     */
     dispose(): void;
+    setAudioFocus(host?: AudioFocusHost): void;
+    play(muted?: boolean, intent?: AudioIntent): Promise<void>;
+    pause(): void;
+    private stopOutput;
+    onDispose(dispose: () => void): void;
     initialRenderHooks(func: (render: () => void) => () => void): void;
     private showPlayUI;
     private showPauseUI;

package/dist/PanoVideoPlugin/Controller.d.ts

@@ -1,8 +1,10 @@
+import type { AudioFocusHost, AudioIntent } from '../shared-utils/audioFocus';
 import type { Five } from '@realsee/five';
 import type { LoadParams, PluginEventMap, PluginState, PluginData, VideoItem } from './typings';
 import { VideoMeshController } from './VideoMeshController';
 import * as BasePlugin from '../base/BasePlugin';
 export declare class PanoVideoPluginController extends BasePlugin.Controller<PluginState, PluginEventMap> {
+    private options?;
     /** 插件 State */
     get state(): {
         enabled: boolean;
@@ -13,7 +15,9 @@ export declare class PanoVideoPluginController extends BasePlugin.Controller<Plu
     data?: PluginData;
     private enabled;
     private _disposed;
-    constructor(five: Five);
+    constructor(five: Five, options?: {
+        audioFocus?: AudioFocusHost;
+    });
     /** 加载点位视频数据，加载数据并不代表会加载点位视频。 */
     load(data: PluginData, params?: LoadParams): void;
     /** 开启插件功能。 */
@@ -41,7 +45,7 @@ export declare class PanoVideoPluginController extends BasePlugin.Controller<Plu
      * }}
      * ```
      */
-    unmuteByRenderID(id: string): void;
+    unmuteByRenderID(id: string, intent?: AudioIntent): void;
     /** 为一个点位添加视频（可以是多条）。 */
     add(panoIndex: number, videoItems: VideoItem[]): void;
     /** 根据 VideoItem render_id 删除某个视频。 */

package/dist/PanoVideoPlugin/VideoMeshController.d.ts

@@ -1,3 +1,4 @@
+import { type AudioFocusHost, type AudioIntent } from '../shared-utils/audioFocus';
 import type { Five } from '@realsee/five';
 import type { VideoMeshParams } from './typings';
 import type { Subscribe } from '../shared-utils/Subscribe';
@@ -49,9 +50,11 @@ export declare class VideoMeshController {
      * @remark 由于 render video 依赖 Five render，因此需要自动 render five。
      */
     private renderFiveDisposer?;
+    private audioTask;
     private hooks;
     /** 初始化视频、模型以及相关事件监听。 */
     constructor(five: Five, params: VideoMeshParams & {
+        audioFocus?: AudioFocusHost;
         fiveUtil?: FiveUtil;
     } & {
         hooks: Subscribe<Simplify<PluginEventMap>>;
@@ -61,7 +64,10 @@ export declare class VideoMeshController {
      *
      * @warning 需要注意：由于大部分浏览器的限制，视频的声音必须在用户有交互事件后才能开启，否则会被浏览器禁用视频播放。
      */
-    unmute: () => void;
+    unmute: (intent?: AudioIntent) => void;
+    play(intent?: AudioIntent, muted?: boolean): Promise<void>;
+    pause(): void;
+    mute(): void;
     /** 彻底销毁，不响应之后的任何事件 */
     dispose(): void;
     enable(): void;

package/dist/PanoVideoPlugin/index.d.ts

@@ -1,3 +1,4 @@
+import type { AudioFocusHost } from '../shared-utils/audioFocus';
 import type { FivePlugin } from '@realsee/five';
 import { PanoVideoPluginController } from './Controller';
 import * as _PanoVideoPluginType from './typings';
@@ -9,8 +10,12 @@ import * as _PanoVideoPluginType from './typings';
  * - 视频只能在全景模式且点位一致时才会播放。不满足条件会自动销毁。
  * - 不做多媒体缓存，缓解内存占用。
  */
-export declare const PanoVideoPlugin: FivePlugin<undefined, PanoVideoPluginController>;
+export declare const PanoVideoPlugin: FivePlugin<{
+    audioFocus?: AudioFocusHost;
+} | undefined, PanoVideoPluginController>;
 export { _PanoVideoPluginType as PanoVideoPluginType };
-export type PanoVideoPluginParameterType = undefined;
+export type PanoVideoPluginParameterType = {
+    audioFocus?: AudioFocusHost;
+} | undefined;
 export type PanoVideoPluginReturnType = InstanceType<typeof PanoVideoPluginController>;
 export default PanoVideoPlugin;

package/dist/base/BasePlugin.d.ts

@@ -1,3 +1,4 @@
+import type { AudioFocusHost } from '../shared-utils/audioFocus';
 import type { Five } from '@realsee/five';
 import { Subscribe } from '../shared-utils/Subscribe';
 import { WorkUtil } from '../shared-utils/Utils/WorkUtil';
@@ -25,6 +26,7 @@ interface BaseOptions {
     [key: string]: unknown;
 }
 interface Config {
+    audioFocus?: AudioFocusHost;
     /** 静态资源前缀 */
     staticPrefix?: string;
     /** 国际化转换函数 */