dxfview 0.0.4-beta.21 → 0.0.4-beta.23

package/dist/types/core/viewers/DxfViewer.d.ts

@@ -26,6 +26,8 @@ import { FontManager } from "../../core/font";
 import { EventInfo } from "../../core/input/InputManager";
 import { MarkupManager, MarkupType } from "../../core/markup";
 import { Model2d, ModelData2d } from "../../core/model";
+import { // 几何体合并工具
+Batch } from "../../core/utils";
 import { BaseViewer, ViewerName } from "../../core/viewers/BaseViewer";
 import { MeasurementData, MeasurementType } from "../../plugins/measure";
 import type { MeasurementPlugin } from "../../plugins/measure";
@@ -50,10 +52,18 @@ export declare type MarkupData = DrawableData;
  *
  * @property {string} modelId - 模型唯一标识符，用于区分不同的DXF 文件
  * @property {string} layerName - 图层名称，表示实体所在的图层
+ * @property {Batch} batch - 可选，合并前的原始实体批次信息（包含顶点范围、索引范围、用户数据等）
+ * @property {THREE.Object3D} mergedObject - 可选，合并后的 THREE.Object3D 对象（Mesh/Line/Points）
+ * @property {number} faceIndex - 可选，点击的面索引（仅 Mesh 类型）
+ * @property {number} lineIndex - 可选，点击的线索引（仅 Line/LineSegments 类型）
  */
 export interface EntityData {
     modelId: string;
     layerName: string;
+    batch?: Batch;
+    mergedObject?: THREE.Object3D;
+    faceIndex?: number;
+    lineIndex?: number;
 }
 /**
  * @interface DxfLayers
@@ -1255,6 +1265,98 @@ export declare class DxfViewer extends BaseViewer {
      * @internal
      */
     clearSelection(): void;
+    /**
+     * 通过屏幕坐标拾取合并前的单个实体信息
+     *
+     * 使用射线投射检测指定屏幕坐标处的实体，并通过 Batch 反查获取合并前的原始实体信息。
+     *
+     * @param screenX - 页面坐标 X（即 MouseEvent.clientX）
+     * @param screenY - 页面坐标 Y（即 MouseEvent.clientY）
+     * @returns 实体数据（包含 batch 信息），如果未命中则返回 undefined
+     */
+    getEntityAtPoint(screenX: number, screenY: number): EntityData | undefined;
+    /**
+     * 通过世界坐标拾取合并前的单个实体信息
+     *
+     * @param worldPoint - 世界坐标点
+     * @param radius - 搜索半径（世界坐标单位），默认使用当前 raycaster 阈值
+     * @returns 实体数据（包含 batch 信息），如果未命中则返回 undefined
+     */
+    getEntityAtWorldPoint(worldPoint: THREE.Vector3, radius?: number): EntityData | undefined;
+    /**
+     * 获取框选范围内的所有合并前实体信息
+     *
+     * 通过屏幕空间的矩形区域，提取该区域内所有合并前的原始实体（batch）信息。
+     *
+     * @param screenBox - 页面坐标的矩形区域 (Box2, 使用 MouseEvent.clientX/clientY 坐标系: min=左上, max=右下)
+     * @returns 框选范围内所有实体的数据数组
+     */
+    getEntitiesInScreenBox(screenBox: THREE.Box2): EntityData[];
+    /**
+     * 获取世界坐标 Box3 范围内的所有合并前实体信息
+     *
+     * @param worldBox - 世界坐标的包围盒
+     * @returns 范围内所有实体的数据数组
+     */
+    getEntitiesInWorldBox(worldBox: THREE.Box3): EntityData[];
+    /**
+     * 获取所有合并前的实体 batch 列表
+     *
+     * 遍历当前场景中所有可选择对象，收集所有 batch 信息。
+     *
+     * @returns 所有实体的数据数组
+     */
+    getAllEntities(): EntityData[];
+    /**
+     * 根据 batch 信息提取该实体的顶点数据（世界坐标）
+     *
+     * @param mergedObject - 合并后的 THREE.Object3D
+     * @param batch - 批次信息
+     * @returns 顶点坐标数组
+     */
+    getEntityVertices(mergedObject: THREE.Object3D, batch: Batch): THREE.Vector3[];
+    /**
+     * 根据 batch 信息计算该实体的包围盒
+     *
+     * @param mergedObject - 合并后的 THREE.Object3D
+     * @param batch - 批次信息
+     * @returns 包围盒
+     */
+    getEntityBoundingBox(mergedObject: THREE.Object3D, batch: Batch): THREE.Box3;
+    /**
+     * 获取场景中可选择的对象列表
+     * 从已加载模型的当前布局中获取有几何体的叶子对象
+     */
+    private getSelectableSceneObjects;
+    /**
+     * 从 intersection 构建 EntityData
+     */
+    private buildEntityDataFromIntersection;
+    /**
+     * 从非合并对象构建 EntityData
+     */
+    private buildEntityDataFromObject;
+    /**
+     * 从 batch 信息构建 EntityData
+     */
+    private buildEntityDataFromBatch;
+    /**
+     * 递归查找对象所属的模型 ID（向上遍历到场景根节点的直接子对象）
+     */
+    private findModelIdByObject;
+    /**
+     * 计算 batch 的包围盒
+     */
+    private computeBatchBoundingBox;
+    /**
+     * 从 NDC 坐标的矩形构建视锥体
+     * 平面法线指向视锥体内部（THREE.Frustum 要求物体在所有平面的正半空间才算在视锥体内）
+     */
+    private buildFrustumFromNDCBox;
+    /**
+     * 收集视锥体内的所有实体
+     */
+    private collectEntitiesInFrustum;
     /**
      * 使相机飞向对象
      */
@@ -1308,7 +1410,7 @@ export declare class DxfViewer extends BaseViewer {
      * viewer.zoomToBBox(box);
      * ```
      */
-    zoomToBBox(bbox: Box2): void;
+    zoomToBBox(bbox: Box2, animate?: boolean): void;
     /**
      * @description {en} Zooms to view extent.
      * @description {zh} 缩放到视图范图

package/dist/types/plugins/annotation/AnnotationPlugin.d.ts

@@ -2,6 +2,9 @@ import * as THREE from "three";
 import { BaseAnnotationDrawable, AnnotationModeType, AnnotationData } from "./BaseAnnotationDrawable";
 import type { BaseViewer } from "../../core/viewers";
 import { Plugin } from "../../core/viewers/Plugin";
+export interface AnnotationPluginOptions {
+    segmentLabelScaleWithZoom?: boolean;
+}
 export declare class AnnotationPlugin extends Plugin {
     static DEFAULT_ID: string;
     selectedDrawable: BaseAnnotationDrawable | undefined;
@@ -21,8 +24,9 @@ export declare class AnnotationPlugin extends Plugin {
     private snapObjectsDirty;
     private pendingSnapDrawableIds;
     private snapLineMaterial?;
+    private segmentLabelScaleWithZoom;
     private readonly partitionLabels;
-    constructor(viewer: BaseViewer);
+    constructor(viewer: BaseViewer, options?: AnnotationPluginOptions);
     getDrawableList(): {
         id: string;
         position: THREE.Vector3;
@@ -90,6 +94,9 @@ export declare class AnnotationPlugin extends Plugin {
     private initEvents;
     protected get canvas(): HTMLCanvasElement;
     protected get raycaster(): any;
+    setSegmentLabelScaleWithZoom(enabled: boolean): void;
+    getSegmentLabelScaleWithZoom(): boolean;
+    private applyDrawableRuntimeContext;
     add(drawable: BaseAnnotationDrawable, needFireEvent?: boolean): void;
     create(data: AnnotationData): BaseAnnotationDrawable;
     remove(drawable: BaseAnnotationDrawable, needFireEvent?: boolean): void;
@@ -255,6 +262,7 @@ export declare class AnnotationPlugin extends Plugin {
      * 在当前选中图形基础上启动复制预览
      */
     startCopyForSelected(): void;
+    private shouldIgnoreSelectionWhileAnnotating;
     /**
      * 处理 DxfViewer 的统一点击事件，同步插件内部的选择状态
      * 当用户在非激活状态下点击标注时，DxfViewer 会选择对应的 drawable 并触发此事件

package/dist/types/plugins/annotation/BaseAnnotationDrawable.d.ts

@@ -65,6 +65,10 @@ export declare abstract class BaseAnnotationDrawable extends Drawable {
     protected segmentLabelFontSize: number;
     protected segmentLabelPaddingX: number;
     protected segmentLabelPaddingY: number;
+    protected segmentLabelScaleWithZoom: boolean;
+    protected segmentLabelReferencePixelSizeInWorldCoord?: number;
+    protected segmentLabelAdaptiveBaseScale?: number;
+    protected segmentLabelAdaptiveBaseScaleSignature?: string;
     protected annotationType?: AnnotationType;
     protected titleText?: string;
     protected annotationProperty?: AnnotationProperty;
@@ -74,6 +78,20 @@ export declare abstract class BaseAnnotationDrawable extends Drawable {
      * 设置选中态填充颜色
      */
     setSelectedFillColor(color: number[]): this;
+    setViewer(viewer?: BaseViewer): this;
+    setSegmentLabelScaleWithZoom(enabled: boolean): this;
+    captureSegmentLabelScaleReference(force?: boolean): this;
+    protected getSegmentLabelScaleFactor(): number;
+    private getSegmentLabelReferencePixelSize;
+    private isSegmentLabelRectOverlap;
+    private getSortedSegmentLabelEntries;
+    private measureSegmentLabelRect;
+    private layoutSegmentLabelEntries;
+    private estimateSegmentLabelAdaptiveBaseScale;
+    private buildSegmentLabelAdaptiveBaseScaleSignature;
+    private resolveSegmentLabelAdaptiveBaseScale;
+    private collectSegmentLabelEntries;
+    private prepareSegmentLabelEntries;
     /**
      * 开始拖拽顶点（仅外环 points）
      */
@@ -156,6 +174,10 @@ export declare abstract class BaseAnnotationDrawable extends Drawable {
      * 停用射线检测器
      */
     deactivateRaycaster(): void;
+    private static readonly AREA_SCALE_RATIO;
+    private static readonly MIN_LABEL_SCALE;
+    private static readonly SCREEN_HIDE_THRESHOLD;
+    private static readonly MIN_SCREEN_SEGMENT;
     protected drawSegmentLengths(ctx: CanvasRenderingContext2D, camera: THREE.Camera): void;
     private drawSegmentLengthLabel;
     private drawRoundedRect;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "dxfview",
-    "version": "0.0.4-beta.21",
+    "version": "0.0.4-beta.23",
     "homepage": "",
     "module": "dist/dxfview.esm.min.js",
     "main": "dist/dxfview.esm.min.js",