@sequent-org/ifc-viewer 1.2.4-ci.56.0 → 1.2.4-ci.58.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sequent-org/ifc-viewer",
   "private": false,
-  "version": "1.2.4-ci.56.0",
+  "version": "1.2.4-ci.58.0",
   "type": "module",
   "description": "IFC 3D model viewer component for web applications - fully self-contained with local IFCLoader",
   "main": "src/index.js",

package/src/ui/LabelPlacementController.js

@@ -182,9 +182,7 @@ export class LabelPlacementController {
   }
 
   #log(event, payload) {
-    try {
-      this.logger?.log?.("[LabelPlacement]", event, payload);
-    } catch (_) {}
+    // no-op: debug logging disabled
   }
 
   #dispatchLabelEvent(name, detail, legacyName = null) {
@@ -282,11 +280,16 @@ export class LabelPlacementController {
       planes?.[1]?.constant,
       planes?.[2]?.constant,
     ];
+    const clipPlanes = {
+      x: this.#getAxisPlaneState('x', planes?.[0]),
+      y: this.#getAxisPlaneState('y', planes?.[1]),
+      z: this.#getAxisPlaneState('z', planes?.[2]),
+    };
 
     return {
       camera: cam,
       modelTransform,
-      clipping: { constants: clipConstants },
+      clipping: { constants: clipConstants, planes: clipPlanes },
     };
   }
 
@@ -361,17 +364,7 @@ export class LabelPlacementController {
     } catch (_) {}
 
     // 5) Клиппинг (как Home: сначала восстановили камеру+модель, затем planes)
-    try {
-      const constants = sceneState?.clipping?.constants || [];
-      if (typeof viewer.setSection === "function") {
-        ["x", "y", "z"].forEach((axis, i) => {
-          const c = constants[i];
-          const enabled = Number.isFinite(c);
-          const dist = -Number(c);
-          viewer.setSection(axis, enabled, enabled ? dist : 0);
-        });
-      }
-    } catch (_) {}
+    this.#applyClippingFromState(sceneState);
 
     try { camera?.updateProjectionMatrix?.(); } catch (_) {}
     try { controls?.update?.(); } catch (_) {}
@@ -401,18 +394,65 @@ export class LabelPlacementController {
     const viewer = this.viewer;
     if (!viewer || !sceneState) return;
     try {
+      const byAxis = sceneState?.clipping?.planes || null;
+      if (byAxis && typeof viewer.setSection === "function") {
+        ["x", "y", "z"].forEach((axis) => {
+          const s = byAxis?.[axis] || null;
+          const enabled = !!s?.enabled;
+          const dist = Number(s?.distance);
+          viewer.setSection(axis, enabled, (enabled && Number.isFinite(dist)) ? dist : 0);
+        });
+        return;
+      }
       const constants = sceneState?.clipping?.constants || [];
       if (typeof viewer.setSection === "function") {
         ["x", "y", "z"].forEach((axis, i) => {
           const c = constants[i];
           const enabled = Number.isFinite(c);
-          const dist = -Number(c);
-          viewer.setSection(axis, enabled, enabled ? dist : 0);
+          const dist = this.#getAxisDistanceFromConstant(axis, c);
+          viewer.setSection(axis, enabled, (enabled && Number.isFinite(dist)) ? dist : 0);
         });
       }
     } catch (_) {}
   }
 
+  #getAxisPlaneState(axis, plane) {
+    if (!plane) return { enabled: false, distance: null };
+    const constant = plane.constant;
+    const enabled = Number.isFinite(constant);
+    if (!enabled) return { enabled: false, distance: null };
+    const distance = this.#getAxisDistanceFromPlane(axis, plane);
+    return { enabled: true, distance };
+  }
+
+  #getAxisDistanceFromPlane(axis, plane) {
+    if (!plane || !Number.isFinite(plane.constant)) return null;
+    const n = plane.normal || null;
+    const nx = Number(n?.x ?? 1);
+    const ny = Number(n?.y ?? 1);
+    const nz = Number(n?.z ?? 1);
+    const sign = (axis === 'x') ? (nx >= 0 ? 1 : -1)
+      : (axis === 'y') ? (ny >= 0 ? 1 : -1)
+        : (nz >= 0 ? 1 : -1);
+    return (sign > 0) ? -Number(plane.constant) : Number(plane.constant);
+  }
+
+  #getAxisDistanceFromConstant(axis, constant) {
+    if (!Number.isFinite(constant)) return null;
+    const viewer = this.viewer;
+    const planes = viewer?.clipping?.planes || [];
+    const idx = axis === 'x' ? 0 : axis === 'y' ? 1 : 2;
+    const plane = planes[idx] || null;
+    const n = plane?.normal || null;
+    const nx = Number(n?.x ?? 1);
+    const ny = Number(n?.y ?? 1);
+    const nz = Number(n?.z ?? 1);
+    const sign = (axis === 'x') ? (nx >= 0 ? 1 : -1)
+      : (axis === 'y') ? (ny >= 0 ? 1 : -1)
+        : (nz >= 0 ? 1 : -1);
+    return (sign > 0) ? -Number(constant) : Number(constant);
+  }
+
   #applyViewOffset(camera, viewOffset) {
     if (!camera || !viewOffset) return;
     try {
@@ -755,21 +795,7 @@ export class LabelPlacementController {
         ? target.closest(".ifc-label-marker")
         : null;
       if (!closestMarker) return;
-      const payload = {
-        type: e?.type,
-        target,
-        closestMarker,
-        button: e?.button,
-        buttons: e?.buttons,
-        clientX: e?.clientX,
-        clientY: e?.clientY,
-        defaultPrevented: !!e?.defaultPrevented,
-      };
-      try {
-        this.logger?.log?.("[LabelDnD]", scope, payload);
-      } catch (_) {
-        try { console.log("[LabelDnD]", scope, payload); } catch (_) {}
-      }
+      // debug logging disabled
     };
 
     this._onDbgDocPointerDown = (e) => logDnDEvent("document", e);
@@ -1241,18 +1267,6 @@ export class LabelPlacementController {
       try { e.preventDefault(); } catch (_) {}
       try { e.stopPropagation(); } catch (_) {}
       try { e.stopImmediatePropagation?.(); } catch (_) {}
-      try {
-        this.logger?.log?.("[LabelDnD]", "marker", {
-          type: e?.type,
-          target: e?.target || null,
-          closestMarker: e?.target?.closest?.(".ifc-label-marker") || null,
-          button: e?.button,
-          buttons: e?.buttons,
-          clientX: e?.clientX,
-          clientY: e?.clientY,
-          defaultPrevented: !!e?.defaultPrevented,
-        });
-      } catch (_) {}
       // если были в режиме постановки — выходим
       try { this.cancelPlacement(); } catch (_) {}
 
@@ -1267,49 +1281,13 @@ export class LabelPlacementController {
       try { marker.el.addEventListener("pointerdown", onMarkerPointerDown); } catch (_) {}
     }
     const onMarkerPointerUp = (e) => {
-      try {
-        this.logger?.log?.("[LabelDnD]", "marker", {
-          type: e?.type,
-          target: e?.target || null,
-          closestMarker: e?.target?.closest?.(".ifc-label-marker") || null,
-          button: e?.button,
-          buttons: e?.buttons,
-          clientX: e?.clientX,
-          clientY: e?.clientY,
-          defaultPrevented: !!e?.defaultPrevented,
-        });
-      } catch (_) {}
     };
     try { marker.el.addEventListener("pointerup", onMarkerPointerUp, { capture: true, passive: true }); } catch (_) {
       try { marker.el.addEventListener("pointerup", onMarkerPointerUp); } catch (_) {}
     }
     const onMarkerDragStart = (e) => {
-      try {
-        this.logger?.log?.("[LabelDnD]", "marker", {
-          type: e?.type,
-          target: e?.target || null,
-          closestMarker: e?.target?.closest?.(".ifc-label-marker") || null,
-          button: e?.button,
-          buttons: e?.buttons,
-          clientX: e?.clientX,
-          clientY: e?.clientY,
-          defaultPrevented: !!e?.defaultPrevented,
-        });
-      } catch (_) {}
     };
     const onMarkerDragEnd = (e) => {
-      try {
-        this.logger?.log?.("[LabelDnD]", "marker", {
-          type: e?.type,
-          target: e?.target || null,
-          closestMarker: e?.target?.closest?.(".ifc-label-marker") || null,
-          button: e?.button,
-          buttons: e?.buttons,
-          clientX: e?.clientX,
-          clientY: e?.clientY,
-          defaultPrevented: !!e?.defaultPrevented,
-        });
-      } catch (_) {}
     };
     try { marker.el.addEventListener("dragstart", onMarkerDragStart); } catch (_) {}
     try { marker.el.addEventListener("dragend", onMarkerDragEnd); } catch (_) {}
@@ -1372,7 +1350,6 @@ export class LabelPlacementController {
    * @deprecated используйте setLabelMarkers
    */
   setCardMarkers(items) {
-    try { this.logger?.warn?.("[LabelPlacement] setCardMarkers is deprecated, use setLabelMarkers"); } catch (_) {}
     this.setLabelMarkers(items);
   }
 
@@ -1380,7 +1357,6 @@ export class LabelPlacementController {
    * @deprecated используйте getLabelMarkers
    */
   getCardMarkers() {
-    try { this.logger?.warn?.("[LabelPlacement] getCardMarkers is deprecated, use getLabelMarkers"); } catch (_) {}
     return this.getLabelMarkers();
   }
 

package/src/viewer/Viewer.js

@@ -3464,7 +3464,7 @@ export class Viewer {
           const s = plane.normal.dot(c) + plane.constant;
           if (s < minSigned) minSigned = s;
         }
-        if (minSigned < 0) {
+        if (minSigned < 0 && minSigned >= -1e-3) {
           plane.constant -= (minSigned - (-1e-4)); // сдвинем чуть так, чтобы все вершины имели s >= -1e-4
         }
       }