dxfview 0.0.4-beta.16 → 0.0.4-beta.18

package/dist/types/core/helpers/OSnapHelper.d.ts

@@ -79,6 +79,7 @@ export declare class OSnapHelper {
     protected activeOSnapType: OSnapType;
     protected snapToleranceInWorldCoord: number;
     protected intersectionLimit: number;
+    protected orthoModeEnabled: boolean;
     /**
      * OSnapType 的优先级，数值越小优先级越高。
      * 在多种捕捉结果出现时，依据优先级与距离选择最终的捕捉点。
@@ -105,6 +106,28 @@ export declare class OSnapHelper {
     getSnapTolerance(): number;
     setIntersectionLimit(val: number): void;
     getIntersectionLimit(): number;
+    /**
+     * 设置正交模式开关。
+     * 启用后，绘制的线条会被约束为水平或垂直方向。
+     * @param enabled 是否启用正交模式
+     */
+    setOrthoModeEnabled(enabled: boolean): void;
+    /**
+     * 获取正交模式是否启用。
+     */
+    isOrthoModeEnabled(): boolean;
+    /**
+     * 获取当前激活的捕捉类型。
+     * 用于判断是否应用正交约束（例如，垂足捕捉时不应用正交约束）。
+     */
+    getActiveOSnapType(): OSnapType;
+    /**
+     * 应用正交约束：根据参考点将当前位置约束为水平或垂直方向（90° 的倍数：0°、90°、180°、270°）。
+     * @param currentPosition 当前鼠标位置（世界坐标）
+     * @param referencePosition 参考点位置（通常是上一个点击的位置）
+     * @returns 应用正交约束后的位置
+     */
+    applyOrthoConstraint(currentPosition: THREE.Vector3, referencePosition: THREE.Vector3): THREE.Vector3;
     /**
      * Gets osnap marker line color.
      * @returns rgb/rgba number array, each value is between 0 and 1. e.g. [0.92, 0.95, 0.96].
@@ -140,9 +163,10 @@ export declare class OSnapHelper {
      * @param intersections The raycaster intersections, must have been sorted by distance.
      * @param is3d If it is a 3d or 2d viewer.
      * @param lastMouseDownPosition Used in order to to get foot of perpendicular.
+     * @param mousePositionOverride Optional mouse world position (useful for 2d to avoid ray hit drift).
      * @returns Target snap point if any
      */
-    handleSnap(rayCasterResult: THREE.Intersection[], is3d: boolean, lastMouseDownPosition?: THREE.Vector3): THREE.Vector3 | undefined;
+    handleSnap(rayCasterResult: THREE.Intersection[], is3d: boolean, lastMouseDownPosition?: THREE.Vector3, mousePositionOverride?: THREE.Vector3): THREE.Vector3 | undefined;
     /**
      * Tries to find a proper snap point and display corresponding marker.
      * @param mousePosition Mouse position in world coordinate.
@@ -157,6 +181,11 @@ export declare class OSnapHelper {
     private getSnapInfo;
     private getOsnapInfoListFromMesh;
     private getOsnapInfoFromSegment;
+    /**
+     * 根据 intersection.index 获取具体线段并计算捕捉信息
+     * 这是解决捕捉漏掉/偏差问题的核心方法
+     */
+    private getOsnapInfoFromIntersectionIndex;
     private getOsnapInfoListFromLine;
     private getOsnapInfoListFromPoint;
     /**

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

@@ -17,6 +17,10 @@ export declare class AnnotationPlugin extends Plugin {
     private additionMode;
     private mobileTouchHelper?;
     private selectedMaskColor?;
+    private snapObjects;
+    private snapObjectsDirty;
+    private pendingSnapDrawableIds;
+    private snapLineMaterial?;
     private readonly partitionLabels;
     constructor(viewer: BaseViewer);
     getDrawableList(): {
@@ -27,6 +31,12 @@ export declare class AnnotationPlugin extends Plugin {
     }[];
     getDrawableDatas(): AnnotationData[];
     setDrawableDatas(datas: AnnotationData[]): void;
+    getSnapObjects(excludeId?: string): THREE.Object3D[];
+    invalidateSnapObjects(): void;
+    private rebuildSnapObjects;
+    private disposeSnapObjects;
+    private getSnapLineMaterial;
+    private collectDrawableSegments;
     getAigcJson(): {
         properties: {
             uuid: number;
@@ -92,6 +102,16 @@ export declare class AnnotationPlugin extends Plugin {
      * We should call this once camera's zoom, fov or position/target changed, etc.
      */
     private updateSnapTolerance;
+    /**
+     * 设置正交模式开关。
+     * 启用后，绘制标注的线条会被约束为水平或垂直方向。
+     * @param enabled 是否启用正交模式
+     */
+    setOrthoModeEnabled(enabled: boolean): void;
+    /**
+     * 获取正交模式是否启用。
+     */
+    isOrthoModeEnabled(): boolean;
     /**
      *
      * @param {AnnotationModeType} type
@@ -158,6 +178,11 @@ export declare class AnnotationPlugin extends Plugin {
      * 用于工具栏撤回按钮调用
      */
     undo(): void;
+    /**
+     * 公开的重做方法，和 Ctrl+Y 的逻辑一致
+     * 用于工具栏重做按钮调用
+     */
+    redo(): void;
     /**
      *
      * @param {AnnotationData[]} dataArray
@@ -207,6 +232,20 @@ export declare class AnnotationPlugin extends Plugin {
      * @description Unselects an annotation.
      */
     unselect(renderEnabled?: boolean): void;
+    /**
+     * 批量吸附世界坐标点到DXF图形
+     * 使用标准的OSnapHelper进行吸附，和正常标注绘制时的吸附逻辑完全一致
+     *
+     * @param worldPoints 世界坐标点数组
+     * @param excludeId 排除的标注ID（避免吸附到自己）
+     * @returns 吸附后的世界坐标点数组
+     */
+    snapWorldPoints(worldPoints: THREE.Vector3[], excludeId?: string): THREE.Vector3[];
+    /**
+     * 停用吸附标记
+     * 在AI识别吸附完成后调用，清除视觉反馈标记
+     */
+    deactivateSnap(): void;
     /**
      * @description Destroy annotation plugin
      */

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

@@ -3,7 +3,7 @@ import type { BaseAnnotationDrawable } from "./BaseAnnotationDrawable";
 import { AnnotationModeType } from "./BaseAnnotationDrawable";
 import { Tooltip } from "../../components/tool-tip";
 import { DrawableList } from "../../core/canvas/DrawableList";
-import type { MobileTouchHelperDrawable, OSnapHelper } from "../../core/helpers";
+import { type MobileTouchHelperDrawable, type OSnapHelper } from "../../core/helpers";
 import { EventInfo, InputManager } from "../../core/input/InputManager";
 import { Event } from "../../core/utils";
 import type { BaseViewer } from "../../core/viewers";
@@ -142,5 +142,7 @@ export declare abstract class BaseAnnotation extends Event<AnnotationEvents> {
      * @param e 事件信息（包含屏幕坐标）
      */
     getIntersections: (e: EventInfo) => THREE.Intersection[];
+    private getAnnotationSnapObjects;
+    protected getMouseWorldPosition(e: EventInfo): THREE.Vector3 | undefined;
 }
 export {};

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

@@ -142,10 +142,12 @@ export declare abstract class BaseAnnotationDrawable extends Drawable {
      * 获取与场景的交点列表（用于吸附）
      */
     getIntersections(e: EventInfo): THREE.Intersection[];
+    private getAnnotationSnapObjects;
     /**
      * 处理鼠标移动时的吸附逻辑
      */
     handleSnapOnMove(e: EventInfo): THREE.Vector3 | undefined;
+    private getMouseWorldPosition;
     /**
      * 激活射线检测器（用于吸附）
      */

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

@@ -2,7 +2,7 @@ import * as THREE from "three";
 import { BaseAnnotation } from "./BaseAnnotation";
 import { BaseAnnotationDrawable } from "./BaseAnnotationDrawable";
 import { DrawableList } from "../../core/canvas/DrawableList";
-import type { OSnapHelper } from "../../core/helpers";
+import { type OSnapHelper } from "../../core/helpers";
 import { EventInfo, InputManager } from "../../core/input/InputManager";
 import type { BaseViewer } from "../../core/viewers";
 /**

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

@@ -2,7 +2,7 @@ import * as THREE from "three";
 import { BaseAnnotation } from "./BaseAnnotation";
 import { AnnotationModeType, BaseAnnotationDrawable } from "./BaseAnnotationDrawable";
 import type { DrawableList } from "../../core/canvas/DrawableList";
-import type { OSnapHelper } from "../../core/helpers";
+import { type OSnapHelper } from "../../core/helpers";
 import type { EventInfo, InputManager } from "../../core/input/InputManager";
 import type { BaseViewer } from "../../core/viewers";
 /**

package/dist/types/plugins/divide/FrameAnnotation.d.ts

@@ -138,5 +138,6 @@ export declare class FrameAnnotation extends Event<FrameAnnotationEvents> {
      * 完全按照 BaseAnnotation.ts 的实现
      */
     getIntersections: (e: EventInfo) => THREE.Intersection[];
+    private getMouseWorldPosition;
 }
 export {};

package/package.json

@@ -1,90 +1,92 @@
-{
-    "name": "dxfview",
-    "version": "0.0.4-beta.16",
-    "homepage": "",
-    "module": "dist/dxfview.esm.min.js",
-    "main": "dist/dxfview.esm.min.js",
-    "types": "dist/types/index.d.ts",
-    "type": "module",
-    "scripts": {
-        "clean": "rimraf dist build",
-        "build:release": "node --loader ts-node/esm esbuild.config.ts -mode=production",
-        "build:prebuild": "node --loader ts-node/esm esbuild.config.ts -mode=prebuild",
-        "build:datatype": "tsc && tsc-alias",
-        "build": "npm run clean && npm run lint-fix && npm run build:datatype && npm run build:release",
-        "build:dev": "npm run clean && npm run lint-fix && npm run build:prebuild",
-        "build:dev:watch": "npm run clean && npm run lint-fix && npm run build:datatype && node --loader ts-node/esm esbuild.config.ts -mode=devwatch",
-        "demo": "npm run build:dev && node demo/index.cjs",
-        "start": "node --loader ts-node/esm esbuild.config.ts -mode=development",
-        "lint": "eslint src --ext ts",
-        "lint-fix": "npm run lint -- --fix",
-        "docs": "typedoc src/export.doc.ts --excludePrivate --excludeProtected --excludeInternal --exclude src/pathes/*"
-    },
-    "files": [
-        "/dist"
-    ],
-    "repository": {
-        "type": "git"
-    },
-    "author": "dxfview",
-    "license": "UNLICENSED",
-    "dependencies": {
-        "@noble/ed25519": "^2.0.0",
-        "@noble/hashes": "^1.4.0",
-        "@types/concaveman": "^1.1.3",
-        "@types/lodash": "^4.14.165",
-        "@types/resize-observer-browser": "^0.1.7",
-        "2d-polygon-boolean": "^1.0.1",
-        "2d-polygon-self-intersections": "^1.3.1",
-        "camera-controls": "^1.37.4",
-        "clipper-lib": "^6.4.2",
-        "concaveman": "^1.2.1",
-        "core-js": "^3.27.1",
-        "disable-devtool": "^0.3.9",
-        "i18next": "^21.6.0",
-        "intl-pluralrules": "^1.3.1",
-        "javascript-obfuscator": "^4.1.1",
-        "js-base64": "^3.7.2",
-        "jsbi": "^4.3.0",
-        "lodash": "^4.17.20",
-        "loglevel": "^1.8.0",
-        "mitt": "^3.0.0",
-        "opentype.js": "^1.3.4",
-        "poly-extrude": "^0.2.0",
-        "polybooljs": "^1.2.0",
-        "polygon-clipping": "^0.15.3",
-        "regenerator-runtime": "^0.13.11",
-        "screenfull": "^6.0.0",
-        "stream": "^0.0.2",
-        "three": "^0.155.0",
-        "three-mesh-bvh": "^0.5.21"
-    },
-    "devDependencies": {
-        "@fal-works/esbuild-plugin-global-externals": "^2.1.2",
-        "@types/eslint": "^8.21.1",
-        "@types/node": "^18.11.19",
-        "@types/resize-observer-browser": "^0.1.7",
-        "@types/sha256": "^0.2.0",
-        "@types/three": "^0.155.0",
-        "@typescript-eslint/eslint-plugin": "^5.0.0",
-        "@typescript-eslint/parser": "^5.47.1",
-        "esbuild": "^0.16.17",
-        "esbuild-plugin-inline-worker": "^0.1.1",
-        "esbuild-plugin-sass": "^1.0.1",
-        "eslint": "^8.15.0",
-        "eslint-config-prettier": "^8.5.0",
-        "eslint-import-resolver-typescript": "^3.5.2",
-        "eslint-plugin-import": "2.26.0",
-        "eslint-plugin-prettier": "^4.2.1",
-        "express": "^4.17.1",
-        "live-server": "^1.2.2",
-        "prettier": "^2.5.1",
-        "rimraf": "^3.0.2",
-        "sha256": "^0.2.0",
-        "terser": "^5.16.2",
-        "ts-node": "^10.9.1",
-        "tsc-alias": "^1.8.2",
-        "typedoc": "^0.22.12",
-        "typescript": "^4.5.2"
-    }
-}
+{
+    "name": "dxfview",
+    "version": "0.0.4-beta.18",
+    "homepage": "",
+    "module": "dist/dxfview.esm.min.js",
+    "main": "dist/dxfview.esm.min.js",
+    "types": "dist/types/index.d.ts",
+    "type": "module",
+    "scripts": {
+        "clean": "rimraf dist build",
+        "build:release": "node --loader ts-node/esm esbuild.config.ts -mode=production",
+        "build:prebuild": "node --loader ts-node/esm esbuild.config.ts -mode=prebuild",
+        "build:datatype": "tsc && tsc-alias",
+        "build": "npm run clean && npm run lint-fix && npm run build:datatype && npm run build:release",
+        "build:dev": "npm run clean && npm run lint-fix && npm run build:prebuild",
+        "build:dev:watch": "npm run clean && npm run lint-fix && npm run build:datatype && node --loader ts-node/esm esbuild.config.ts -mode=devwatch",
+        "demo": "npm run build:dev && node demo/index.cjs",
+        "start": "node --loader ts-node/esm esbuild.config.ts -mode=development",
+        "lint": "eslint src --ext ts",
+        "lint-fix": "npm run lint -- --fix",
+        "docs": "typedoc src/export.doc.ts --excludePrivate --excludeProtected --excludeInternal --exclude src/pathes/*"
+    },
+    "files": [
+        "/dist"
+    ],
+    "repository": {
+        "type": "git"
+    },
+    "author": "dxfview",
+    "license": "UNLICENSED",
+    "dependencies": {
+        "@noble/ed25519": "^2.0.0",
+        "@noble/hashes": "^1.4.0",
+        "@types/concaveman": "^1.1.3",
+        "@types/lodash": "^4.14.165",
+        "@types/resize-observer-browser": "^0.1.7",
+        "2d-polygon-boolean": "^1.0.1",
+        "2d-polygon-self-intersections": "^1.3.1",
+        "camera-controls": "^1.37.4",
+        "clipper-lib": "^6.4.2",
+        "concaveman": "^1.2.1",
+        "core-js": "^3.27.1",
+        "disable-devtool": "^0.3.9",
+        "i18next": "^21.6.0",
+        "intl-pluralrules": "^1.3.1",
+        "javascript-obfuscator": "^4.1.1",
+        "js-base64": "^3.7.2",
+        "jsbi": "^4.3.0",
+        "lodash": "^4.17.20",
+        "loglevel": "^1.8.0",
+        "mitt": "^3.0.0",
+        "opentype.js": "^1.3.4",
+        "poly-extrude": "^0.2.0",
+        "polybooljs": "^1.2.0",
+        "polygon-clipping": "^0.15.3",
+        "regenerator-runtime": "^0.13.11",
+        "screenfull": "^6.0.0",
+        "stream": "^0.0.2",
+        "three-mesh-bvh": "^0.5.21"
+    },
+    "devDependencies": {
+        "@fal-works/esbuild-plugin-global-externals": "^2.1.2",
+        "@types/eslint": "^8.21.1",
+        "@types/node": "^18.11.19",
+        "@types/resize-observer-browser": "^0.1.7",
+        "@types/sha256": "^0.2.0",
+        "@types/three": "^0.155.0",
+        "@typescript-eslint/eslint-plugin": "^5.0.0",
+        "@typescript-eslint/parser": "^5.47.1",
+        "esbuild": "^0.16.17",
+        "esbuild-plugin-inline-worker": "^0.1.1",
+        "esbuild-plugin-sass": "^1.0.1",
+        "eslint": "^8.15.0",
+        "eslint-config-prettier": "^8.5.0",
+        "eslint-import-resolver-typescript": "^3.5.2",
+        "eslint-plugin-import": "2.26.0",
+        "eslint-plugin-prettier": "^4.2.1",
+        "express": "^4.17.1",
+        "live-server": "^1.2.2",
+        "prettier": "^2.5.1",
+        "rimraf": "^3.0.2",
+        "sha256": "^0.2.0",
+        "terser": "^5.16.2",
+        "ts-node": "^10.9.1",
+        "tsc-alias": "^1.8.2",
+        "typedoc": "^0.22.12",
+        "typescript": "^4.5.2"
+    },
+    "peerDependencies": {
+        "three": ">=0.155.0 <0.170.0"
+    }
+}