copper3d 3.6.0 → 3.6.2

package/dist/bundle.esm.js

@@ -59581,11 +59581,18 @@ function makePointMarker(v, mesh, color, radius) {
  * 顶点以 local 存(由 mesh 把世界命中点转 local)。
  */
 class StrokeContour {
-    constructor(minGap, mesh) {
+    /**
+     * @param minGap  采样最小间距(世界系),去抖
+     * @param maxJump 跳变阈值(世界系):距离 > maxJump 且法线大幅翻转时丢弃该样本,
+     *                避免笔触掠过沟缝/轮廓边时相邻点落在不同深度、直线段横穿模型。
+     */
+    constructor(minGap, maxJump, mesh) {
         this.minGap = minGap;
+        this.maxJump = maxJump;
         this.mesh = mesh;
         this.verts = [];
         this.last = new Vector3();
+        this.lastNormal = new Vector3();
         this.has = false;
     }
     begin() {
@@ -59593,11 +59600,19 @@ class StrokeContour {
         this.has = false;
     }
     addSample(hit) {
-        // gap 判定用世界距离(屏幕笔触在世界系采样)
-        if (this.has && hit.point.distanceTo(this.last) < this.minGap)
-            return;
+        if (this.has) {
+            const d = hit.point.distanceTo(this.last);
+            if (d < this.minGap)
+                return; // 太近,去抖
+            // 跳变剔除:距离突然很大「且」法线大幅翻转(>~75°)→ 多半跳到了背面/远面,丢弃,
+            // 否则相邻两点之间的直线段会横穿模型内部。两个条件同时满足才剔除:
+            // 快速画(距离大、法线相近)不误删;画过尖锐棱边(法线变、距离近)也不误删。
+            if (d > this.maxJump && hit.normal.dot(this.lastNormal) < 0.25)
+                return;
+        }
         this.verts.push(worldHitToLocalVertex(hit, this.mesh));
         this.last.copy(hit.point);
+        this.lastNormal.copy(hit.normal);
         this.has = true;
     }
     get vertices() {
@@ -61147,16 +61162,54 @@ class GeodesicContour {
         this.mesh = mesh;
         this.anchors = []; // 顶点索引
         this.segments = []; // 相邻锚点间路径(含端点)
+        this.history = []; // 每次增删前的锚点快照,用于撤销
+    }
+    /** 任何改动锚点前先存一份快照(顶点索引数组很小,快照成本可忽略)。 */
+    snapshot() {
+        this.history.push(this.anchors.slice());
     }
     /** 传入 local 命中点,snap 到最近顶点并对上一锚点求路径。 */
     addAnchor(localHitPoint) {
         const v = this.graph.nearestVertex(localHitPoint);
+        this.snapshot();
         if (this.anchors.length > 0) {
             const prev = this.anchors[this.anchors.length - 1];
             this.segments.push(this.graph.shortestPath(prev, v));
         }
         this.anchors.push(v);
     }
+    /** 删除指定下标的锚点,重算相邻段(支持取消中间任意一点)。 */
+    removeAnchorAt(index) {
+        if (index < 0 || index >= this.anchors.length)
+            return;
+        this.snapshot();
+        this.anchors.splice(index, 1);
+        this.rebuildSegments();
+    }
+    /** 是否还有可撤销的编辑(加点/删点)。 */
+    canUndo() {
+        return this.history.length > 0;
+    }
+    /** 撤销上一次锚点编辑(加点 → 删回去;删点 → 恢复)。无历史返回 false。 */
+    undoEdit() {
+        const prev = this.history.pop();
+        if (!prev)
+            return false;
+        this.anchors = prev;
+        this.rebuildSegments();
+        return true;
+    }
+    /** 据当前锚点序列整体重算所有相邻段路径。 */
+    rebuildSegments() {
+        this.segments = [];
+        for (let i = 1; i < this.anchors.length; i++) {
+            this.segments.push(this.graph.shortestPath(this.anchors[i - 1], this.anchors[i]));
+        }
+    }
+    /** 各锚点的 local 顶点(用于绘制可见的锚点标记)。 */
+    getAnchorLocals() {
+        return this.anchors.map((i) => this.graph.vertexLocal(i));
+    }
     get anchorCount() {
         return this.anchors.length;
     }
@@ -61301,6 +61354,11 @@ class SurfaceAnnotator {
         this.managed = new Set();
         this.seq = 0;
         this.selectedId = null;
+        this.activeGeoMarkers = []; // 进行中测地线的可见锚点
+        this.geoRay = new Raycaster();
+        this.geoNdc = new Vector2();
+        this.hoveredGeoMarker = -1;
+        this._projV = new Vector3();
         /** 窗口尺寸变化时更新所有 fat line 的像素分辨率,否则线宽会失真。 */
         this.onResize = () => {
             const w = this.o.container.clientWidth;
@@ -61345,7 +61403,7 @@ class SurfaceAnnotator {
                 return;
             }
             if (this.mode === "freehand") {
-                this.activeStroke = new StrokeContour(this.minGap, this.o.mesh);
+                this.activeStroke = new StrokeContour(this.minGap, this.maxJump, this.o.mesh);
                 this.activeStroke.begin();
                 const h = this.hit(e);
                 if (h)
@@ -61355,6 +61413,19 @@ class SurfaceAnnotator {
                 return;
             }
             if (this.mode === "geodesic") {
+                // 先判断是否点中了一个已有锚点 → 取消该点(支持取消其中任意一点)。
+                const pick = this.pickGeoMarker(e);
+                if (pick >= 0 && this.activeGeo) {
+                    this.activeGeo.removeAnchorAt(pick);
+                    if (this.activeGeo.anchorCount === 0)
+                        this.clearActiveGeo();
+                    else {
+                        this.rebuildGeoMarkers();
+                        this.redrawGeoLine();
+                    }
+                    return;
+                }
+                // 否则在表面落一个新锚点。
                 const h = this.hit(e);
                 if (!h)
                     return;
@@ -61363,19 +61434,19 @@ class SurfaceAnnotator {
                 }
                 const local = this.o.mesh.worldToLocal(h.point.clone());
                 this.activeGeo.addAnchor(local);
-                const verts = this.activeGeo.buildVertices(false);
-                if (!this.activeGeoLine) {
-                    this.activeGeoLine = makeContourLine(verts, this.geodesicColor, false, this.o.container, this.epsilon, this.o.mesh);
-                    this.o.scene.add(this.activeGeoLine);
-                }
-                else {
-                    updateContourLine(this.activeGeoLine, verts, false, this.epsilon, this.o.mesh);
-                }
+                this.rebuildGeoMarkers();
+                this.redrawGeoLine();
             }
         };
         this.onPointerMove = (e) => {
-            if (this.spaceHeld)
+            if (this.spaceHeld) {
+                this.setGeoHover(-1);
                 return;
+            }
+            // 测地线模式下,悬停到锚点小球时显示"✕"提示(该点可被点击取消)。
+            if (this.mode === "geodesic" && !this.pointerDown) {
+                this.setGeoHover(this.insideContainer(e) ? this.pickGeoMarker(e) : -1);
+            }
             if (this.mode === "freehand" &&
                 this.pointerDown &&
                 this.activeStroke &&
@@ -61465,9 +61536,10 @@ class SurfaceAnnotator {
             meshGeo.computeVertexNormals(); // 渲染需要法线
         meshGeo.computeBoundingBox();
         const diag = (_a = opts.bboxDiagonal) !== null && _a !== void 0 ? _a : meshGeo.boundingBox.getSize(new Vector3()).length();
-        this.markerRadius = (_b = opts.markerRadius) !== null && _b !== void 0 ? _b : diag * 0.006;
+        this.markerRadius = (_b = opts.markerRadius) !== null && _b !== void 0 ? _b : diag * 0.0032;
         this.epsilon = diag * 0.002;
         this.minGap = diag * 0.004;
+        this.maxJump = diag * 0.05;
         // 测地线连通性:单独焊接一份"仅位置"的几何给 MeshGraph 用——
         // 不动被渲染的 mesh(保留其法线/UV/纹理)。仅位置可保证同表面位置的顶点
         // 被 mergeVertices 合并(否则逐面法线/UV 会阻止合并,图断裂 → 闭合穿模)。
@@ -61505,6 +61577,9 @@ class SurfaceAnnotator {
     }
     setMode(m) {
         var _a, _b;
+        // 离开测地线模式时丢弃尚未 Enter 落定的进行中测地线(清掉残留的锚点与线)。
+        if (m !== "geodesic" && this.activeGeo)
+            this.clearActiveGeo();
         this.mode = m;
         this.applyCameraGating();
         (_b = (_a = this.o).onModeChange) === null || _b === void 0 ? void 0 : _b.call(_a, m);
@@ -61517,6 +61592,18 @@ class SurfaceAnnotator {
         return this.store.list();
     }
     undo() {
+        // 测地线进行中 → 撤销最近一次锚点编辑(加点 / 取消点都能回退);
+        // 否则撤销最近一条已落定的标注。
+        if (this.activeGeo && this.activeGeo.canUndo()) {
+            this.activeGeo.undoEdit();
+            if (this.activeGeo.anchorCount === 0)
+                this.clearActiveGeo();
+            else {
+                this.rebuildGeoMarkers();
+                this.redrawGeoLine();
+            }
+            return;
+        }
         this.store.undo();
     }
     clearAll() {
@@ -61529,6 +61616,7 @@ class SurfaceAnnotator {
         });
         this.managed.clear();
         this.selectedId = null;
+        this.clearActiveGeo();
     }
     deleteAnnotation(id) {
         if (this.selectedId === id)
@@ -61609,10 +61697,153 @@ class SurfaceAnnotator {
     hit(e) {
         return raycastSurface(this.o.camera, this.o.container, this.o.mesh, e.clientX, e.clientY);
     }
-    /** 事件目标是否落在标注容器内(排除面板/页面其它区域的点击)。 */
+    /**
+     * 事件目标是否是容器内的 WebGL canvas。
+     * 仅认 canvas:面板(GUIDE / 控制面板 / 标注列表的 ✕ 按钮)都是 container 的子元素,
+     * 若只判断 contains 会把面板上的点击也当成在模型上作画 —— 这会"穿透"删除按钮、
+     * 让 ✕ 难以点中。只响应 canvas 上的指针事件即可彻底隔离 UI 与画布。
+     */
     insideContainer(e) {
         const t = e.target;
-        return !!t && this.o.container.contains(t);
+        return !!t && t.tagName === "CANVAS" && this.o.container.contains(t);
+    }
+    /** 射线拾取进行中的锚点小球,返回锚点下标;未命中返回 -1。 */
+    pickGeoMarker(e) {
+        if (!this.activeGeoMarkers.length)
+            return -1;
+        const rect = this.o.container.getBoundingClientRect();
+        this.geoNdc.x = ((e.clientX - rect.left) / rect.width) * 2 - 1;
+        this.geoNdc.y = -((e.clientY - rect.top) / rect.height) * 2 + 1;
+        this.geoRay.setFromCamera(this.geoNdc, this.o.camera);
+        const hits = this.geoRay.intersectObjects(this.activeGeoMarkers, false);
+        if (!hits.length)
+            return -1;
+        return this.activeGeoMarkers.indexOf(hits[0].object);
+    }
+    /** 设置当前悬停的锚点(-1 = 无):更新高亮缩放、光标与"✕(可取消)"悬浮标。 */
+    setGeoHover(idx) {
+        if (idx === this.hoveredGeoMarker) {
+            if (idx >= 0)
+                this.positionGeoBadge(this.activeGeoMarkers[idx]);
+            return;
+        }
+        const prev = this.activeGeoMarkers[this.hoveredGeoMarker];
+        if (prev)
+            prev.scale.setScalar(1);
+        this.hoveredGeoMarker = idx;
+        const cur = this.activeGeoMarkers[idx];
+        if (cur) {
+            cur.scale.setScalar(1.3);
+            this.ensureGeoBadge().style.display = "flex";
+            this.positionGeoBadge(cur);
+            this.o.container.style.cursor = "pointer";
+        }
+        else {
+            if (this.geoHoverBadge)
+                this.geoHoverBadge.style.display = "none";
+            this.o.container.style.cursor = "";
+        }
+    }
+    /** 懒创建悬浮 ✕ 标(挂在 container 内,pointer-events:none 不挡点击)。 */
+    ensureGeoBadge() {
+        if (this.geoHoverBadge)
+            return this.geoHoverBadge;
+        const b = document.createElement("div");
+        b.textContent = "✕";
+        Object.assign(b.style, {
+            position: "absolute",
+            width: "16px",
+            height: "16px",
+            borderRadius: "50%",
+            background: "#ff5d6c",
+            color: "#fff",
+            font: "700 10px/1 system-ui, sans-serif",
+            display: "none",
+            alignItems: "center",
+            justifyContent: "center",
+            pointerEvents: "none",
+            zIndex: "15",
+            boxShadow: "0 2px 6px rgba(0,0,0,.45)",
+            transform: "translate(-50%, -50%)",
+            left: "0px",
+            top: "0px",
+        });
+        this.o.container.appendChild(b);
+        this.geoHoverBadge = b;
+        return b;
+    }
+    /** 把 ✕ 标定位到锚点投影到屏幕的位置(正中心,即光标悬停处,避免歧义)。 */
+    positionGeoBadge(marker) {
+        if (!marker)
+            return;
+        const b = this.ensureGeoBadge();
+        this._projV.copy(marker.position).project(this.o.camera);
+        const rect = this.o.container.getBoundingClientRect();
+        const x = (this._projV.x * 0.5 + 0.5) * rect.width;
+        const y = (-this._projV.y * 0.5 + 0.5) * rect.height;
+        b.style.left = `${x}px`;
+        b.style.top = `${y}px`;
+    }
+    /** 据当前锚点重建可见的锚点小球(锚点比放点稍大,便于看见与点中取消)。 */
+    rebuildGeoMarkers() {
+        this.setGeoHover(-1);
+        for (const m of this.activeGeoMarkers) {
+            this.o.scene.remove(m);
+            this.disposeObject(m);
+        }
+        this.activeGeoMarkers = [];
+        if (!this.activeGeo)
+            return;
+        for (const v of this.activeGeo.getAnchorLocals()) {
+            const marker = makePointMarker(v, this.o.mesh, this.geodesicColor, this.markerRadius * 1.15);
+            this.o.scene.add(marker);
+            this.activeGeoMarkers.push(marker);
+        }
+    }
+    /** 据当前锚点重画进行中的测地线(不闭合);不足两点时移除线。 */
+    redrawGeoLine() {
+        if (!this.activeGeo)
+            return;
+        const verts = this.activeGeo.buildVertices(false);
+        if (verts.length < 2) {
+            if (this.activeGeoLine) {
+                this.o.scene.remove(this.activeGeoLine);
+                this.disposeObject(this.activeGeoLine);
+                this.activeGeoLine = undefined;
+            }
+            return;
+        }
+        if (!this.activeGeoLine) {
+            this.activeGeoLine = makeContourLine(verts, this.geodesicColor, false, this.o.container, this.epsilon, this.o.mesh);
+            this.o.scene.add(this.activeGeoLine);
+        }
+        else {
+            updateContourLine(this.activeGeoLine, verts, false, this.epsilon, this.o.mesh);
+        }
+    }
+    /** 丢弃进行中的测地线:移除并 dispose 线与全部锚点。 */
+    clearActiveGeo() {
+        this.setGeoHover(-1);
+        if (this.activeGeoLine) {
+            this.o.scene.remove(this.activeGeoLine);
+            this.disposeObject(this.activeGeoLine);
+            this.activeGeoLine = undefined;
+        }
+        for (const m of this.activeGeoMarkers) {
+            this.o.scene.remove(m);
+            this.disposeObject(m);
+        }
+        this.activeGeoMarkers = [];
+        this.activeGeo = undefined;
+    }
+    /** 移除进行中测地线的全部锚点小球(落定后调用:只留下线)。 */
+    removeGeoMarkers() {
+        this.setGeoHover(-1);
+        for (const m of this.activeGeoMarkers) {
+            this.o.scene.remove(m);
+            this.disposeObject(m);
+        }
+        this.activeGeoMarkers = [];
     }
     closeLastContour() {
         const last = this.lastFreehand;
@@ -61655,7 +61886,10 @@ class SurfaceAnnotator {
         }
         else {
             this.o.scene.remove(this.activeGeoLine);
+            this.disposeObject(this.activeGeoLine);
         }
+        // 落定后清掉可见锚点,只留下贴合表面的线。
+        this.removeGeoMarkers();
         this.activeGeo = undefined;
         this.activeGeoLine = undefined;
     }
@@ -61667,6 +61901,10 @@ class SurfaceAnnotator {
         return tag === "INPUT" || tag === "TEXTAREA" || t.isContentEditable;
     }
     dispose() {
+        var _a;
+        this.clearActiveGeo();
+        (_a = this.geoHoverBadge) === null || _a === void 0 ? void 0 : _a.remove();
+        this.geoHoverBadge = undefined;
         window.removeEventListener("pointerdown", this.onPointerDown, true);
         window.removeEventListener("pointermove", this.onPointerMove, true);
         window.removeEventListener("pointerup", this.onPointerUp, true);
@@ -82654,7 +82892,7 @@ function evaluateElement(element, weights) {
 }
 
 // import * as kiwrious from "copper3d_plugin_heart_k";
-const REVISION = "v3.6.0-beta";
+const REVISION = "v3.6.2-beta";
 console.log(`%cCopper3D Visualisation %cBeta:${REVISION}`, "padding: 3px;color:white; background:#023047", "padding: 3px;color:white; background:#f50a25");
 
 export { AI_CHANNEL_HEX_COLORS, AI_MASK_CHANNEL_COLORS, CHANNEL_COLORS, CHANNEL_HEX_COLORS, CameraViewPoint, Copper3dTrackballControls, GaussianSmoother, MeshNodeTool, NrrdTools, REVISION, SurfaceAnnotator, addBoxHelper, addLabelToScene, configKiwriousHeart, convert3DPostoScreenPos, convertScreenPosto3DPos, copperMScene, copperMSceneRenderer, copperRenderer, copperRendererOnDemond, copperScene, copperSceneOnDemond, createTexture2D_NRRD, fullScreenListenner, kiwrious, loading, removeGuiFolderChilden, rgbaToCss, rgbaToHex, setHDRFilePath, throttle };