@realsee/dnalogel 3.81.8-alpha.2 → 3.81.8

package/CHANGELOG.md

@@ -1,8 +1,10 @@
 # CHANGELOG
+
 ## 3.81.8
 
-- perf(PanoTagPlugin): 优化mask锯齿
-- 
+- feat(ModelMakerPlugin): 新增 `tagOcclusionScope`，支持按 `group`、`self`、`none` 控制区域标签参与射线检测的 ModelMaker 对象范围
+- fix(ModelMakerPlugin): 射线遮挡检测忽略自身或祖先不可见的对象，避免切换楼层后隐藏区域模型误遮挡标签
+
 ## 3.81.7
 
 - fix(floorplan): 最终插件数据不再读取发布前的 render_options

package/dist/ModelMakerPlugin/Controller.d.ts

@@ -1,7 +1,8 @@
-import { type Five, type Mode as FiveMode } from '@realsee/five';
+import { type Five } from '@realsee/five';
 import * as THREE from 'three';
 import * as BasePlugin from '../base/BasePluginWithData';
 import type { MarkerItem, State, ServerData, ItemType, ElementRenderer, EventMap } from './typings';
+import type { ModelMakerPluginConfig } from './typings/config';
 /**
  * 盒子动画配置选项
  */
@@ -22,27 +23,14 @@ export declare class Controller extends BasePlugin.Controller<State, EventMap, S
     private tagWrapper;
     private occlusionVisibility;
     private occlusionMode;
+    private tagOcclusionScope;
     private fiveEveryReadyListenerDisposer?;
     private originalOpacities;
     private originalTagOpacities;
     private highlightedItem;
     private originalTagStyles;
     private originalModelColors;
-    constructor(five: Five, config?: {
-        tagContainerZIndex?: number;
-        /**
-         * @description 是否显示遮挡的部分
-         * @params 所有模式下都显示被遮挡的部分, false: 所有模式下不显示被遮挡的部分, ['Mapview', ...]: 指定模式下显示被遮挡的部分
-         * @default false
-         */
-        occlusionVisibility?: boolean | FiveMode[];
-        /**
-         * @description 当 occlusionVisibility 为true时，以哪种方式显示被遮挡的部分
-         * @params 'depthTest': 关闭深度测试, 'translucence': 半透明
-         * @default 'translucence'
-         */
-        occlusionMode?: 'translucence' | 'depthTest';
-    });
+    constructor(five: Five, config?: ModelMakerPluginConfig);
     load(serverData: ServerData): Promise<void>;
     setState(targetState: Partial<State>): void;
     getItemById(id: string | number): MarkerItem;

package/dist/ModelMakerPlugin/index.d.ts

@@ -1,11 +1,9 @@
 import type * as ModelMakerPluginType from './typings';
 import { Controller } from './Controller';
 import type { BoxAnimationConfig } from './Controller';
-export declare const ModelMakerPlugin: (five: import("@realsee/five").Five, config?: {
-    tagContainerZIndex?: number;
-    occlusionVisibility?: boolean | import("@realsee/five").Mode[];
-    occlusionMode?: "depthTest" | "translucence";
-}) => ModelMakerPluginType.ModelMakerController;
+import type { ModelMakerPluginConfig, TagOcclusionScope, TagOcclusionScopeConfig } from './typings/config';
+export declare const ModelMakerPlugin: (five: import("@realsee/five").Five, config?: ModelMakerPluginType.ModelMakerPluginConfig) => ModelMakerPluginType.ModelMakerController;
 export type { Controller as ModelMakerPluginInstance };
 export type { ModelMakerPluginType };
 export type { BoxAnimationConfig };
+export type { ModelMakerPluginConfig, TagOcclusionScope, TagOcclusionScopeConfig };

package/dist/ModelMakerPlugin/item/baseItem.d.ts

@@ -5,6 +5,7 @@ import { Subscribe } from '../../shared-utils/Subscribe';
 import type { LightTag } from '../../shared-utils/tag';
 import type { FiveDomEvents } from '../../shared-utils/five/FiveDomEvents';
 import type { ServerItem, ItemType, ElementRenderer } from '../typings';
+import type { TagOcclusionScope } from '../typings/config';
 interface ModelWithCenter extends Object3D {
     /** 模型中心点 */
     center?: Vector3;
@@ -55,6 +56,7 @@ export declare class ModelMakerBaseItem<ServerData extends ServerItem> extends S
         visibleMode?: Mode[];
         position?: Vector3;
         tagContainerZIndex?: number;
+        tagOcclusionScope?: TagOcclusionScope;
     });
     show(): void;
     hide(): void;

package/dist/ModelMakerPlugin/typings/config.d.ts

@@ -0,0 +1,26 @@
+import type { Mode as FiveMode } from '@realsee/five';
+import type { ItemType } from './data';
+/** ModelMaker 标签额外射线检测的对象范围。Five 自身模型始终单独参与检测。 */
+export type TagOcclusionScope = 'group' | 'self' | 'none';
+/** 按标注类型配置标签额外射线检测范围。 */
+export type TagOcclusionScopeConfig = Partial<Record<ItemType, TagOcclusionScope>>;
+export interface ModelMakerPluginConfig {
+    tagContainerZIndex?: number;
+    /**
+     * @description 是否显示遮挡的部分
+     * @params 所有模式下都显示被遮挡的部分, false: 所有模式下不显示被遮挡的部分, ['Mapview', ...]: 指定模式下显示被遮挡的部分
+     * @default false
+     */
+    occlusionVisibility?: boolean | FiveMode[];
+    /**
+     * @description 当 occlusionVisibility 为 true 时，以哪种方式显示被遮挡的部分
+     * @params 'depthTest': 关闭深度测试, 'translucence': 半透明
+     * @default 'translucence'
+     */
+    occlusionMode?: 'translucence' | 'depthTest';
+    /**
+     * @description ModelMaker 标签额外射线检测的对象范围，可按 item 类型配置
+     * @default group
+     */
+    tagOcclusionScope?: TagOcclusionScopeConfig;
+}

package/dist/ModelMakerPlugin/typings/index.d.ts

@@ -11,6 +11,7 @@ export type { ServerBoxItem } from './data';
 export type { ServerTrianglesItem } from './data';
 export type { ServerPrismItem } from './data';
 export type { ItemType } from './data';
+export type { ModelMakerPluginConfig, TagOcclusionScope, TagOcclusionScopeConfig } from './config';
 export type { Controller as ModelMakerController } from '../Controller';
 export type * from './data';
 /** 插件状态 */

package/dist/ModelMakerPlugin/utils/getTagOcclusionObjects.d.ts

@@ -0,0 +1,4 @@
+import type { Object3D } from 'three';
+import type { TagOcclusionScope } from '../typings/config';
+/** 根据标签遮挡范围返回需要参与额外射线检测的 ModelMaker 对象。 */
+export declare function getTagOcclusionObjects(scope: TagOcclusionScope, group: Object3D, model: Object3D): Object3D[];

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

@@ -69,7 +69,6 @@ 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 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";
+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";