@sequent-org/ifc-viewer 1.2.4-ci.34.0 → 1.2.4-ci.35.0

package/package.json

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

package/src/viewer/RightMouseModelMoveController.js

@@ -19,6 +19,7 @@ export class RightMouseModelMoveController {
    * @param {(e: PointerEvent) => boolean} [deps.shouldIgnoreEvent]
    * @param {() => boolean} [deps.isDebug]
    * @param {(pivotWorld: THREE.Vector3) => void} [deps.onRmbStart]
+   * @param {(deltaWorld: THREE.Vector3) => void} [deps.onRmbMove]
    */
   constructor(deps) {
     this.domElement = deps.domElement;
@@ -29,6 +30,7 @@ export class RightMouseModelMoveController {
     this.shouldIgnoreEvent = deps.shouldIgnoreEvent || (() => false);
     this.isDebug = deps.isDebug || (() => false);
     this.onRmbStart = typeof deps.onRmbStart === "function" ? deps.onRmbStart : null;
+    this.onRmbMove = typeof deps.onRmbMove === "function" ? deps.onRmbMove : null;
 
     this._activePointerId = null;
     this._last = { x: 0, y: 0 };
@@ -171,6 +173,7 @@ export class RightMouseModelMoveController {
 
     model.position.add(this._vDelta);
     model.updateMatrixWorld?.(true);
+    try { this.onRmbMove && this.onRmbMove(this._vDelta); } catch (_) {}
 
     if (this.isDebug()) {
       try {

package/src/viewer/Viewer.js

@@ -154,6 +154,10 @@ export class Viewer {
       clipEnabled: [Infinity, Infinity, Infinity],
       // Трансформ модели (для сброса ПКМ-сдвигов)
       modelTransform: null, // { position: Vector3, quaternion: Quaternion, scale: Vector3 }
+      // Положение "земли/тени" (чтобы Home возвращал тень вместе с моделью)
+      shadowReceiverPos: null, // THREE.Vector3|null
+      sunTargetPos: null,      // THREE.Vector3|null
+      shadowGradCenterXZ: null // THREE.Vector2|null
     };
 
     // Визуализация оси вращения
@@ -541,6 +545,31 @@ export class Viewer {
         onRmbStart: (pivot) => {
           try { this._rmbModelMove.pivotAnchor = pivot?.clone?.() || null; } catch (_) { this._rmbModelMove.pivotAnchor = null; }
         },
+        onRmbMove: (delta) => {
+          // Двигаем "тень/землю/солнце" вместе с моделью, чтобы тень не отрывалась и не клипалась.
+          try {
+            if (!delta) return;
+            if (this.shadowReceiver?.position?.add) {
+              this.shadowReceiver.position.add(delta);
+              this.shadowReceiver.updateMatrixWorld?.(true);
+            }
+            if (this.shadowGradient?.buildingCenterXZ?.add) {
+              this.shadowGradient.buildingCenterXZ.add(new THREE.Vector2(delta.x || 0, delta.z || 0));
+              this.#applyShadowGradientUniforms();
+            }
+            if (this.sunLight) {
+              try { this.sunLight.position.add(delta); } catch (_) {}
+              try {
+                if (this.sunLight.target) {
+                  this.sunLight.target.position.add(delta);
+                  this.sunLight.target.updateMatrixWorld?.(true);
+                }
+              } catch (_) {}
+              try { this.sunLight.updateMatrixWorld?.(true); } catch (_) {}
+              try { this.sunLight.shadow && (this.sunLight.shadow.needsUpdate = true); } catch (_) {}
+            }
+          } catch (_) {}
+        },
       });
     } catch (e) {
       // eslint-disable-next-line no-console
@@ -1230,6 +1259,17 @@ export class Viewer {
           }
         } catch (_) {}
 
+        // Снимем исходное положение тени/земли, чтобы Home возвращал их вместе с моделью
+        try {
+          this._home.shadowReceiverPos = this.shadowReceiver?.position?.clone?.() || null;
+        } catch (_) { this._home.shadowReceiverPos = null; }
+        try {
+          this._home.sunTargetPos = this.sunLight?.target?.position?.clone?.() || null;
+        } catch (_) { this._home.sunTargetPos = null; }
+        try {
+          this._home.shadowGradCenterXZ = this.shadowGradient?.buildingCenterXZ?.clone?.() || null;
+        } catch (_) { this._home.shadowGradCenterXZ = null; }
+
         // После загрузки модели сбрасываем "фиксированную ось" от ПКМ
         try { if (this._rmbModelMove) this._rmbModelMove.pivotAnchor = null; } catch (_) {}
       });
@@ -3082,6 +3122,30 @@ export class Viewer {
       }
     } catch (_) {}
 
+    // Home: вернуть тень/землю/солнце в исходное положение (единое целое с моделью)
+    try {
+      const p = this._home?.shadowReceiverPos;
+      if (this.shadowReceiver && p) {
+        this.shadowReceiver.position.copy(p);
+        this.shadowReceiver.updateMatrixWorld?.(true);
+      }
+    } catch (_) {}
+    try {
+      const p = this._home?.sunTargetPos;
+      if (this.sunLight?.target && p) {
+        this.sunLight.target.position.copy(p);
+        this.sunLight.target.updateMatrixWorld?.(true);
+      }
+    } catch (_) {}
+    try {
+      const c = this._home?.shadowGradCenterXZ;
+      if (this.shadowGradient?.buildingCenterXZ && c) {
+        this.shadowGradient.buildingCenterXZ.copy(c);
+        this.#applyShadowGradientUniforms();
+      }
+    } catch (_) {}
+    try { if (this.sunLight) this.sunLight.shadow && (this.sunLight.shadow.needsUpdate = true); } catch (_) {}
+
     // Home: сбрасываем "фиксированную ось" от ПКМ
     try { if (this._rmbModelMove) this._rmbModelMove.pivotAnchor = null; } catch (_) {}