@sequent-org/ifc-viewer 1.2.4-ci.62.0 → 1.2.4-ci.63.0

package/package.json

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

package/src/IfcViewer.js

@@ -41,6 +41,7 @@ export class IfcViewer {
    * @param {boolean} [options.showSidebar=false] - Показывать ли боковую панель с деревом
    * @param {boolean} [options.showControls=false] - Показывать ли панель управления (нижние кнопки)
    * @param {boolean} [options.showToolbar=true] - Показывать ли верхнюю панель инструментов
+   * @param {boolean} [options.labelEditingEnabled=true] - Разрешить ли редактирование меток
    * @param {boolean} [options.autoLoad=true] - Автоматически загружать модель при инициализации (modelUrl/modelFile/ifcUrl/ifcFile)
    * @param {string} [options.theme='light'] - Тема интерфейса ('light' | 'dark')
    * @param {Object} [options.viewerOptions] - Дополнительные опции для Viewer
@@ -74,6 +75,7 @@ export class IfcViewer {
       showSidebar: options.showSidebar === true, // по умолчанию false
       showControls: options.showControls === true, // по умолчанию false
       showToolbar: options.showToolbar !== false, // по умолчанию true
+      labelEditingEnabled: options.labelEditingEnabled !== false,
       autoLoad: options.autoLoad !== false,
       theme: options.theme || 'light',
       viewerOptions: options.viewerOptions || {}
@@ -389,6 +391,24 @@ export class IfcViewer {
     this.labelPlacement.selectLabel(id);
   }
 
+  /**
+   * Включает/выключает режим редактирования меток.
+   * @param {boolean} enabled
+   */
+  setLabelEditingEnabled(enabled) {
+    if (!this.labelPlacement) return;
+    this.labelPlacement.setEditingEnabled(enabled);
+  }
+
+  /**
+   * Возвращает текущий режим редактирования меток.
+   * @returns {boolean}
+   */
+  getLabelEditingEnabled() {
+    if (!this.labelPlacement) return false;
+    return this.labelPlacement.getEditingEnabled();
+  }
+
   /**
    * @deprecated используйте setLabelMarkers
    */
@@ -564,7 +584,12 @@ export class IfcViewer {
     // В пакете включаем UI "меток" по умолчанию:
     // кнопка "+ Добавить метку" + режим постановки меток + сохранение/восстановление состояния.
     try {
-      this.labelPlacement = new LabelPlacementController({ viewer: this.viewer, container: this.elements.viewerContainer, logger: console });
+      this.labelPlacement = new LabelPlacementController({
+        viewer: this.viewer,
+        container: this.elements.viewerContainer,
+        logger: console,
+        editingEnabled: this.options.labelEditingEnabled,
+      });
       this.cardPlacement = this.labelPlacement;
     } catch (e) {
       console.warn('IfcViewer: LabelPlacementController init failed', e);

package/src/main.js

@@ -54,6 +54,16 @@ if (app) {
   // Остальные контролы (тени/солнце/материалы/визуал/цветокор) будем добавлять пошагово позже.
   // (Старый код управления панелью закомментирован ниже для последующего восстановления при необходимости.)
 
+  // Анимация (damping)
+  const dampingDynamic = document.getElementById("dampingDynamic");
+  const dampingDynamicValue = document.getElementById("dampingDynamicValue");
+  const dampingBase = document.getElementById("dampingBase");
+  const dampingBaseValue = document.getElementById("dampingBaseValue");
+  const dampingSettle = document.getElementById("dampingSettle");
+  const dampingSettleValue = document.getElementById("dampingSettleValue");
+  const dampingSettleMs = document.getElementById("dampingSettleMs");
+  const dampingSettleMsValue = document.getElementById("dampingSettleMsValue");
+
   const testPresetToggle = document.getElementById("testPresetToggle");
   // Шаг 1 (Tone mapping): в текущей версии он входит в пресет "Тест", но exposure можно подстроить.
   const step1ToneToggle = document.getElementById("step1ToneToggle");
@@ -78,6 +88,59 @@ if (app) {
   const step4SaturationValue = document.getElementById("step4SaturationValue");
   const step4Dump = document.getElementById("step4Dump");
 
+  const applyDampingDynamic = (v) => {
+    const on = Number(v) >= 1;
+    if (dampingDynamicValue) dampingDynamicValue.textContent = on ? "1" : "0";
+    try { viewer.setDampingConfig?.({ dynamic: on }); } catch (_) {}
+  };
+  const applyDampingBase = (v) => {
+    const value = Number(v);
+    if (!Number.isFinite(value)) return;
+    if (dampingBaseValue) dampingBaseValue.textContent = value.toFixed(2);
+    try { viewer.setDampingConfig?.({ base: value }); } catch (_) {}
+  };
+  const applyDampingSettle = (v) => {
+    const value = Number(v);
+    if (!Number.isFinite(value)) return;
+    if (dampingSettleValue) dampingSettleValue.textContent = value.toFixed(2);
+    try { viewer.setDampingConfig?.({ settle: value }); } catch (_) {}
+  };
+  const applyDampingSettleMs = (v) => {
+    const value = Math.max(0, Math.round(Number(v)));
+    if (!Number.isFinite(value)) return;
+    if (dampingSettleMsValue) dampingSettleMsValue.textContent = String(value);
+    try { viewer.setDampingConfig?.({ settleMs: value }); } catch (_) {}
+  };
+
+  // Инициализация damping UI от текущих параметров viewer
+  const initDampingUi = () => {
+    const cfg = viewer.getDampingConfig?.() || {};
+    if (dampingDynamic) {
+      dampingDynamic.value = cfg.dynamic ? "1" : "0";
+      applyDampingDynamic(dampingDynamic.value);
+      dampingDynamic.addEventListener("input", (e) => applyDampingDynamic(e.target.value));
+    }
+    if (dampingBase) {
+      const v = Number.isFinite(cfg.base) ? cfg.base : Number(dampingBase.value);
+      dampingBase.value = Number.isFinite(v) ? String(v) : "0.50";
+      applyDampingBase(dampingBase.value);
+      dampingBase.addEventListener("input", (e) => applyDampingBase(e.target.value));
+    }
+    if (dampingSettle) {
+      const v = Number.isFinite(cfg.settle) ? cfg.settle : Number(dampingSettle.value);
+      dampingSettle.value = Number.isFinite(v) ? String(v) : "0.00";
+      applyDampingSettle(dampingSettle.value);
+      dampingSettle.addEventListener("input", (e) => applyDampingSettle(e.target.value));
+    }
+    if (dampingSettleMs) {
+      const v = Number.isFinite(cfg.settleMs) ? cfg.settleMs : Number(dampingSettleMs.value);
+      dampingSettleMs.value = Number.isFinite(v) ? String(v) : "0";
+      applyDampingSettleMs(dampingSettleMs.value);
+      dampingSettleMs.addEventListener("input", (e) => applyDampingSettleMs(e.target.value));
+    }
+  };
+  initDampingUi();
+
   const setStep1UiEnabled = (enabled) => {
     const on = !!enabled;
     if (step1ToneToggle) step1ToneToggle.checked = on;

package/src/ui/LabelPlacementController.js

@@ -37,6 +37,7 @@ export class LabelPlacementController {
     this.container = deps.container;
     this.logger = deps.logger || null;
     this._visibilityLogEnabled = !!deps.visibilityLogEnabled;
+    this._editingEnabled = deps?.editingEnabled !== false;
 
     this._placing = false;
     this._nextId = 1;
@@ -117,6 +118,7 @@ export class LabelPlacementController {
 
     this._ui = this.#createUi();
     this.#attachUi();
+    this.#syncEditingUi();
     this.#bindEvents();
     this.#startRaf();
   }
@@ -181,7 +183,7 @@ export class LabelPlacementController {
   }
 
   startPlacement() {
-    if (this._placing || this._labelsHidden) return;
+    if (!this._editingEnabled || this._placing || this._labelsHidden) return;
     this._placing = true;
 
     const controls = this.viewer?.controls;
@@ -736,6 +738,7 @@ export class LabelPlacementController {
       try { e.preventDefault(); } catch (_) {}
       try { e.stopPropagation(); } catch (_) {}
       try { e.stopImmediatePropagation?.(); } catch (_) {}
+      if (!this._editingEnabled) return;
       this.startPlacement();
     };
     this._ui.btn.addEventListener("click", this._onBtnClick, { passive: false });
@@ -781,6 +784,7 @@ export class LabelPlacementController {
       const target = e.target;
       const action = target?.getAttribute?.("data-action");
       if (action !== "add") return;
+      if (!this._editingEnabled) return;
       if (this._labelsHidden) return;
       try { e.preventDefault(); } catch (_) {}
       try { e.stopPropagation(); } catch (_) {}
@@ -796,6 +800,7 @@ export class LabelPlacementController {
         if (e.key === "Escape") this.cancelPlacement();
         return;
       }
+      if (!this._editingEnabled) return;
 
       const target = e.target;
       const tag = (target && target.tagName) ? String(target.tagName).toLowerCase() : "";
@@ -930,6 +935,7 @@ export class LabelPlacementController {
 
     this._onCanvasContextMenu = (e) => {
       // Контекстное меню добавления метки по ПКМ на модели (если нет метки под курсором).
+      if (!this._editingEnabled) return;
       try { e.preventDefault(); } catch (_) {}
       try { e.stopPropagation(); } catch (_) {}
       try { e.stopImmediatePropagation?.(); } catch (_) {}
@@ -1243,6 +1249,7 @@ export class LabelPlacementController {
   }
 
   #emitLabelAction(action, marker = null) {
+    if (!this._editingEnabled) return;
     const target = marker || this.#getSelectedMarker();
     if (!target) return;
     const detail = this.#buildActionPayload(target);
@@ -1251,6 +1258,7 @@ export class LabelPlacementController {
   }
 
   #openContextMenu(marker, clientX, clientY) {
+    if (!this._editingEnabled) return;
     const menu = this._ui?.menu;
     if (!menu || !marker) return;
 
@@ -1364,6 +1372,11 @@ export class LabelPlacementController {
       // если были в режиме постановки — выходим
       try { this.cancelPlacement(); } catch (_) {}
 
+      if (!this._editingEnabled) {
+        this.#handleMarkerClick(marker);
+        return;
+      }
+
       if (e.button === 0) {
         this.#closeContextMenu();
         this.#setSelectedMarker(marker);
@@ -1395,6 +1408,7 @@ export class LabelPlacementController {
     try { marker.el.addEventListener("dragend", onMarkerDragEnd); } catch (_) {}
 
     const onMarkerContextMenu = (e) => {
+      if (!this._editingEnabled) return;
       try { e.preventDefault(); } catch (_) {}
       try { e.stopPropagation(); } catch (_) {}
       try { e.stopImmediatePropagation?.(); } catch (_) {}
@@ -1699,7 +1713,7 @@ export class LabelPlacementController {
   }
 
   #syncAddAvailability() {
-    const disabled = !!this._labelsHidden;
+    const disabled = !!this._labelsHidden || !this._editingEnabled;
     const btn = this._ui?.btn;
     if (btn) {
       btn.disabled = disabled;
@@ -1711,5 +1725,33 @@ export class LabelPlacementController {
       try { menuAdd.classList.toggle("ifc-label-menu-item--disabled", disabled); } catch (_) {}
     }
   }
+
+  #syncEditingUi() {
+    const actions = this._ui?.actions;
+    if (actions) actions.style.display = this._editingEnabled ? "" : "none";
+    if (!this._editingEnabled) {
+      try { this.cancelPlacement(); } catch (_) {}
+      try { this.#closeContextMenu(); } catch (_) {}
+      try { this.#closeCanvasMenu(); } catch (_) {}
+      this._labelDrag.active = false;
+      this._labelDrag.moved = false;
+      this._labelDrag.pointerId = null;
+      this._labelDrag.id = null;
+      this._labelDrag.clickMarker = null;
+      this.#setDragGhostVisible(false);
+    }
+    this.#syncAddAvailability();
+  }
+
+  setEditingEnabled(enabled) {
+    const next = !!enabled;
+    if (this._editingEnabled === next) return;
+    this._editingEnabled = next;
+    this.#syncEditingUi();
+  }
+
+  getEditingEnabled() {
+    return !!this._editingEnabled;
+  }
 }
 

package/src/viewer/Viewer.js

@@ -192,9 +192,9 @@ export class Viewer {
 
     this._damping = {
       dynamic: true,
-      base: 0.06,
-      settle: 0.18,
-      settleMs: 250,
+      base: 0.5,
+      settle: 0,
+      settleMs: 0,
       isSettling: false,
       lastEndTs: 0,
     };
@@ -258,6 +258,53 @@ export class Viewer {
     return { enabled: !!this._zoomToCursor.enabled, debug: !!this._zoomToCursor.debug };
   }
 
+  /**
+   * Возвращает параметры динамического damping (для UI).
+   */
+  getDampingConfig() {
+    const d = this._damping || {};
+    return {
+      dynamic: !!d.dynamic,
+      base: Number.isFinite(d.base) ? d.base : 0,
+      settle: Number.isFinite(d.settle) ? d.settle : 0,
+      settleMs: Number.isFinite(d.settleMs) ? d.settleMs : 0,
+    };
+  }
+
+  /**
+   * Обновляет параметры динамического damping.
+   * @param {{ dynamic?: boolean, base?: number, settle?: number, settleMs?: number }} next
+   */
+  setDampingConfig(next = {}) {
+    if (!this._damping) return;
+    const clamp01 = (v) => Math.min(1, Math.max(0, v));
+    if (Object.prototype.hasOwnProperty.call(next, 'dynamic')) {
+      this._damping.dynamic = !!next.dynamic;
+    }
+    if (Object.prototype.hasOwnProperty.call(next, 'base')) {
+      const v = Number(next.base);
+      if (Number.isFinite(v)) this._damping.base = clamp01(v);
+    }
+    if (Object.prototype.hasOwnProperty.call(next, 'settle')) {
+      const v = Number(next.settle);
+      if (Number.isFinite(v)) this._damping.settle = clamp01(v);
+    }
+    if (Object.prototype.hasOwnProperty.call(next, 'settleMs')) {
+      const v = Number(next.settleMs);
+      if (Number.isFinite(v)) this._damping.settleMs = Math.max(0, v);
+    }
+    if (this.controls) {
+      if (!this._damping.dynamic) {
+        this._damping.isSettling = false;
+        this.controls.enableDamping = false;
+        this.controls.dampingFactor = this._damping.base;
+      } else {
+        this.controls.enableDamping = true;
+        if (!this._damping.isSettling) this.controls.dampingFactor = this._damping.base;
+      }
+    }
+  }
+
   /**
    * Возвращает "домашнюю" точку вращения для текущей модели:
    * центр bbox (совпадает с кадрированием при первичной загрузке).