@2112-lab/central-plant 0.3.29 → 0.3.31

package/dist/bundle/index.js

@@ -4171,6 +4171,7 @@ var TransformControlsManager = /*#__PURE__*/function () {
         raycaster.setFromCamera(mouse, _this4.camera);
         var allIntersects = raycaster.intersectObjects(_this4.scene.children, true);
         var ioDeviceObject = null;
+        var hitMesh = null;
         var _iterator = _createForOfIteratorHelper(allIntersects),
           _step;
         try {
@@ -4185,7 +4186,10 @@ var TransformControlsManager = /*#__PURE__*/function () {
               }
               obj = obj.parent;
             }
-            if (ioDeviceObject) break;
+            if (ioDeviceObject) {
+              hitMesh = hit.object;
+              break;
+            }
           }
         } catch (err) {
           _iterator.e(err);
@@ -4200,7 +4204,7 @@ var TransformControlsManager = /*#__PURE__*/function () {
         _this4._ioDragStartY = event.clientY;
         _this4._ioDragMoved = false;
         if (_this4.orbitControls) _this4.orbitControls.enabled = false;
-        _this4.callbacks.onIODeviceDrag(ioDeviceObject, 0, true);
+        _this4.callbacks.onIODeviceDrag(ioDeviceObject, 0, true, hitMesh);
         var onMove = function onMove(e) {
           var dx = e.clientX - _this4._ioDragStartX;
           var dy = e.clientY - _this4._ioDragStartY;
@@ -36669,7 +36673,7 @@ var ComponentTooltipManager = /*#__PURE__*/function (_BaseDisposable) {
      */
   }, {
     key: "startIODeviceDrag",
-    value: function startIODeviceDrag(ioDeviceObject) {
+    value: function startIODeviceDrag(ioDeviceObject, hitMesh) {
       var _this$sceneViewer2,
         _this2 = this;
       if (!ioDeviceObject || !this._stateAdapter) return;
@@ -36688,7 +36692,7 @@ var ComponentTooltipManager = /*#__PURE__*/function (_BaseDisposable) {
       }
       var scopedAttachmentId = this._getScopedAttachmentKey(attachmentId, parentUuid);
       var ioBehavMgr = (_this$sceneViewer2 = this.sceneViewer) === null || _this$sceneViewer2 === void 0 || (_this$sceneViewer2 = _this$sceneViewer2.managers) === null || _this$sceneViewer2 === void 0 ? void 0 : _this$sceneViewer2.ioBehaviorManager;
-      var dataPoints = ((ioBehavMgr === null || ioBehavMgr === void 0 ? void 0 : ioBehavMgr.getAnimationDataPoints(parentUuid, attachmentId)) || []).concat((ud === null || ud === void 0 ? void 0 : ud.dataPoints) || [])
+      var dataPoints = ((ioBehavMgr === null || ioBehavMgr === void 0 ? void 0 : ioBehavMgr.getAnimationDataPoints(parentUuid, attachmentId, hitMesh)) || []).concat((ud === null || ud === void 0 ? void 0 : ud.dataPoints) || [])
       // deduplicate by id
       .filter(function (dp, i, arr) {
         return arr.findIndex(function (d) {
@@ -37401,6 +37405,19 @@ var IoBehaviorManager = /*#__PURE__*/function (_BaseDisposable) {
       if (!anims.length) return;
       var key = this._key(parentUuid, attachmentId);
       var entries = [];
+
+      // Capture the device root's world orientation once so each entry can
+      // convert the configured axis from device-local space to world space.
+      var deviceWorldQuat = new THREE__namespace.Quaternion();
+      deviceModelRoot.getWorldQuaternion(deviceWorldQuat);
+
+      // Compute the model's native max dimension so rotAxisOffset values (stored
+      // in dialog-viewer-world units, where the model is normalised to 1 unit)
+      // can be scaled to runtime-world units.  viewerMaxDim = 1 / ns_viewer.
+      var _deviceBox = new THREE__namespace.Box3().setFromObject(deviceModelRoot);
+      var _deviceSize = new THREE__namespace.Vector3();
+      _deviceBox.getSize(_deviceSize);
+      var viewerMaxDim = Math.max(_deviceSize.x, _deviceSize.y, _deviceSize.z) || 1;
       var _iterator = _createForOfIteratorHelper(anims),
         _step;
       try {
@@ -37411,11 +37428,23 @@ var IoBehaviorManager = /*#__PURE__*/function (_BaseDisposable) {
             console.warn("[IoBehaviorManager] Could not find mesh for animation \"".concat(anim.name || anim.stateVariable, "\" (uuid: ").concat(anim.meshUuid, ", name: \"").concat(anim.meshName, "\")"));
             continue;
           }
+          var worldPos = new THREE__namespace.Vector3();
+          mesh.getWorldPosition(worldPos);
+          var worldQuat = new THREE__namespace.Quaternion();
+          mesh.getWorldQuaternion(worldQuat);
+          var box = new THREE__namespace.Box3().setFromObject(mesh);
+          var worldCenter = new THREE__namespace.Vector3();
+          if (!box.isEmpty()) box.getCenter(worldCenter);else worldCenter.copy(worldPos);
           entries.push({
             anim: anim,
             mesh: mesh,
             origPos: mesh.position.clone(),
-            origRot: mesh.rotation.clone()
+            origRot: mesh.rotation.clone(),
+            origWorldPos: worldPos,
+            origWorldQuat: worldQuat,
+            origWorldCenter: worldCenter,
+            deviceWorldQuat: deviceWorldQuat.clone(),
+            viewerMaxDim: viewerMaxDim
           });
         }
       } catch (err) {
@@ -37445,16 +37474,24 @@ var IoBehaviorManager = /*#__PURE__*/function (_BaseDisposable) {
   }, {
     key: "triggerState",
     value: function triggerState(attachmentId, dataPointId, value, parentUuid) {
-      var key = this._key(parentUuid, attachmentId);
-      var entries = this._entries.get(key);
-      if (!(entries !== null && entries !== void 0 && entries.length)) return;
-      var _iterator2 = _createForOfIteratorHelper(entries),
+      var _iterator2 = _createForOfIteratorHelper(this._entries.values()),
         _step2;
       try {
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var entry = _step2.value;
-          if (entry.anim.stateVariable !== dataPointId) continue;
-          this._applyAnimation(entry, value);
+          var entries = _step2.value;
+          var _iterator3 = _createForOfIteratorHelper(entries),
+            _step3;
+          try {
+            for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+              var entry = _step3.value;
+              if (entry.anim.stateVariable !== dataPointId) continue;
+              this._applyAnimation(entry, value);
+            }
+          } catch (err) {
+            _iterator3.e(err);
+          } finally {
+            _iterator3.f();
+          }
         }
       } catch (err) {
         _iterator2.e(err);
@@ -37489,34 +37526,47 @@ var IoBehaviorManager = /*#__PURE__*/function (_BaseDisposable) {
   }, {
     key: "getAnimationDataPoints",
     value: function getAnimationDataPoints(parentUuid, attachmentId) {
+      var _this2 = this;
+      var hitMesh = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
       var key = this._key(parentUuid, attachmentId);
       var entries = this._entries.get(key);
       if (!(entries !== null && entries !== void 0 && entries.length)) return [];
 
+      // When a specific mesh was clicked, filter to only animations whose target
+      // mesh is the clicked mesh or an ancestor of it (e.g. the clicked primitive
+      // is inside a group that is the animation target).
+      var filtered = entries;
+      if (hitMesh) {
+        var matching = entries.filter(function (e) {
+          return _this2._isMeshOrDescendant(hitMesh, e.mesh);
+        });
+        if (matching.length > 0) filtered = matching;
+      }
+
       // Collapse multiple mesh entries that share the same stateVariable
       var seen = new Map(); // stateVariable → anim
-      var _iterator3 = _createForOfIteratorHelper(entries),
-        _step3;
+      var _iterator4 = _createForOfIteratorHelper(filtered),
+        _step4;
       try {
-        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-          var anim = _step3.value.anim;
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+          var anim = _step4.value.anim;
           if (!seen.has(anim.stateVariable)) {
             seen.set(anim.stateVariable, anim);
           }
         }
       } catch (err) {
-        _iterator3.e(err);
+        _iterator4.e(err);
       } finally {
-        _iterator3.f();
+        _iterator4.f();
       }
       var dps = [];
-      var _iterator4 = _createForOfIteratorHelper(seen),
-        _step4;
+      var _iterator5 = _createForOfIteratorHelper(seen),
+        _step5;
       try {
-        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-          var _step4$value = _slicedToArray(_step4.value, 2),
-            stateVar = _step4$value[0],
-            _anim = _step4$value[1];
+        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+          var _step5$value = _slicedToArray(_step5.value, 2),
+            stateVar = _step5$value[0],
+            _anim = _step5$value[1];
           // Normalise stateType from AnimateDevicesDialog variants
           var stateType = void 0;
           var raw = (_anim.stateType || '').toLowerCase();
@@ -37567,9 +37617,9 @@ var IoBehaviorManager = /*#__PURE__*/function (_BaseDisposable) {
           });
         }
       } catch (err) {
-        _iterator4.e(err);
+        _iterator5.e(err);
       } finally {
-        _iterator4.f();
+        _iterator5.f();
       }
       return dps;
     }
@@ -37604,19 +37654,19 @@ var IoBehaviorManager = /*#__PURE__*/function (_BaseDisposable) {
     key: "unloadForComponent",
     value: function unloadForComponent(parentUuid) {
       var prefix = "".concat(parentUuid, "::");
-      var _iterator5 = _createForOfIteratorHelper(this._entries.keys()),
-        _step5;
+      var _iterator6 = _createForOfIteratorHelper(this._entries.keys()),
+        _step6;
       try {
-        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-          var key = _step5.value;
+        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+          var key = _step6.value;
           if (key.startsWith(prefix)) {
             this._entries.delete(key);
           }
         }
       } catch (err) {
-        _iterator5.e(err);
+        _iterator6.e(err);
       } finally {
-        _iterator5.f();
+        _iterator6.f();
       }
     }
   }, {
@@ -37635,6 +37685,22 @@ var IoBehaviorManager = /*#__PURE__*/function (_BaseDisposable) {
       return "".concat(parentUuid, "::").concat(attachmentId);
     }
 
+    /**
+     * Returns true if `candidate` is `ancestor` or any descendant of `ancestor`.
+     * @param {THREE.Object3D} candidate
+     * @param {THREE.Object3D} ancestor
+     */
+  }, {
+    key: "_isMeshOrDescendant",
+    value: function _isMeshOrDescendant(candidate, ancestor) {
+      var obj = candidate;
+      while (obj) {
+        if (obj === ancestor) return true;
+        obj = obj.parent;
+      }
+      return false;
+    }
+
     /**
      * Find the mesh inside `root` using UUID first, then name as fallback.
      * GLTFLoader assigns fresh UUIDs on every load, so name is the reliable key.
@@ -37675,27 +37741,32 @@ var IoBehaviorManager = /*#__PURE__*/function (_BaseDisposable) {
       var anim = entry.anim,
         mesh = entry.mesh,
         origPos = entry.origPos,
-        origRot = entry.origRot;
+        origRot = entry.origRot,
+        origWorldPos = entry.origWorldPos,
+        origWorldQuat = entry.origWorldQuat,
+        origWorldCenter = entry.origWorldCenter,
+        deviceWorldQuat = entry.deviceWorldQuat,
+        viewerMaxDim = entry.viewerMaxDim;
       var mapping = this._resolveMapping(anim, value);
       if (!mapping) return;
       var types = anim.transformTypes || [];
-      var _iterator6 = _createForOfIteratorHelper(types),
-        _step6;
+      var _iterator7 = _createForOfIteratorHelper(types),
+        _step7;
       try {
-        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-          var type = _step6.value;
+        for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+          var type = _step7.value;
           if (type === 'translation') {
             this._applyTranslation(mesh, origPos, mapping.transform);
           } else if (type === 'rotation') {
-            this._applyRotation(mesh, origPos, origRot, anim, mapping.rotationTransform);
+            this._applyRotation(mesh, origPos, origRot, anim, mapping.rotationTransform, origWorldPos, origWorldQuat, origWorldCenter, deviceWorldQuat, viewerMaxDim);
           } else if (type === 'color') {
             this._applyColor(mesh, mapping.colorTransform);
           }
         }
       } catch (err) {
-        _iterator6.e(err);
+        _iterator7.e(err);
       } finally {
-        _iterator6.f();
+        _iterator7.f();
       }
     }
 
@@ -37832,26 +37903,24 @@ var IoBehaviorManager = /*#__PURE__*/function (_BaseDisposable) {
     }
 
     /**
-     * Apply a rotation around an arbitrary pivot point in device-local space,
-     * optionally also displacing the mesh position to simulate orbital motion.
-     *
-     * Math (all in device-local space):
-     *   pivot   = rotAxisOffset
-     *   delta   = origPos - pivot
-     *   newDelta = rotate(delta, angle, axis)
-     *   newPos  = pivot + newDelta
-     *   newRot[axis] = origRot[axis] + angle
+     * Apply a rotation around an arbitrary pivot point using world-space quaternion
+     * math matching the ReconstructionViewer's setMeshPreviewRotationAxis approach.
+     * This ensures the runtime axis/pivot matches what the user configured in the
+     * animation dialog, regardless of the device's parent transform in the scene.
      *
      * @param {THREE.Object3D} mesh
-     * @param {THREE.Vector3}  origPos
-     * @param {THREE.Euler}    origRot
+     * @param {THREE.Vector3}  origPos        - local position at load time (unused, kept for signature compat)
+     * @param {THREE.Euler}    origRot        - local rotation at load time (unused)
      * @param {Object}         anim
-     * @param {number}         angleDeg - Degrees
+     * @param {number}         angleDeg       - Degrees
+     * @param {THREE.Vector3}  origWorldPos   - world position at load time
+     * @param {THREE.Quaternion} origWorldQuat - world quaternion at load time
+     * @param {THREE.Vector3}  origWorldCenter - world bounding-box center at load time
      */
   }, {
     key: "_applyRotation",
-    value: function _applyRotation(mesh, origPos, origRot, anim, angleDeg) {
-      var _anim$rotAxis, _anim$rotAxisOffset, _off$x, _off$y, _off$z;
+    value: function _applyRotation(mesh, origPos, origRot, anim, angleDeg, origWorldPos, origWorldQuat, origWorldCenter, deviceWorldQuat, viewerMaxDim) {
+      var _anim$rotAxis, _anim$rotAxisOffset;
       var angle = THREE__namespace.MathUtils.degToRad(typeof angleDeg === 'number' ? angleDeg : 0);
       var axis = ((_anim$rotAxis = anim.rotAxis) !== null && _anim$rotAxis !== void 0 ? _anim$rotAxis : 'x').toLowerCase();
       var off = (_anim$rotAxisOffset = anim.rotAxisOffset) !== null && _anim$rotAxisOffset !== void 0 ? _anim$rotAxisOffset : {
@@ -37860,13 +37929,57 @@ var IoBehaviorManager = /*#__PURE__*/function (_BaseDisposable) {
         z: 0
       };
 
-      // Unit vector for the chosen axis
-      var axisVec = new THREE__namespace.Vector3(axis === 'x' ? 1 : 0, axis === 'y' ? 1 : 0, axis === 'z' ? 1 : 0);
-      var pivot = new THREE__namespace.Vector3((_off$x = off.x) !== null && _off$x !== void 0 ? _off$x : 0, (_off$y = off.y) !== null && _off$y !== void 0 ? _off$y : 0, (_off$z = off.z) !== null && _off$z !== void 0 ? _off$z : 0);
-      var delta = origPos.clone().sub(pivot);
-      delta.applyAxisAngle(axisVec, angle);
-      mesh.position.copy(pivot).add(delta);
-      mesh.rotation[axis] = origRot[axis] + angle;
+      // Local axis in the device's coordinate system
+      var localAxisVec = new THREE__namespace.Vector3(axis === 'x' ? 1 : 0, axis === 'y' ? 1 : 0, axis === 'z' ? 1 : 0);
+      if (origWorldPos && origWorldQuat && origWorldCenter) {
+        // Transform the configured axis from device-local space into world space
+        // so that 'X' means the device's local X, not the world X.
+        var worldAxisVec = localAxisVec.clone().applyQuaternion(deviceWorldQuat || new THREE__namespace.Quaternion());
+
+        // rotAxisOffset is stored in dialog-viewer-world space where the model root
+        // has been rotated Rot_Z(π) by default (ReconstructionViewer's else branch).
+        // Translation uses the same convention and negates X/Y to compensate.
+        // For rotation offset we apply the same compensation mathematically:
+        //   offset_runtime = deviceWorldQuat × Rot_Z(π) × offset_dialog × scale
+        // This maps from dialog world space (post Z+180° flip) → model local → world.
+        var scale = viewerMaxDim || 1;
+        var rotZ180 = new THREE__namespace.Quaternion().setFromAxisAngle(new THREE__namespace.Vector3(0, 0, 1), Math.PI);
+        var qCombined = (deviceWorldQuat || new THREE__namespace.Quaternion()).clone().multiply(rotZ180);
+        var offWorld = new THREE__namespace.Vector3((off.x || 0) * scale, (off.y || 0) * scale, (off.z || 0) * scale).applyQuaternion(qCombined);
+        var pivot = origWorldCenter.clone().add(offWorld);
+        var deltaQuat = new THREE__namespace.Quaternion().setFromAxisAngle(worldAxisVec, angle);
+
+        // Rotate world position around pivot
+        var offsetVec = origWorldPos.clone().sub(pivot);
+        offsetVec.applyQuaternion(deltaQuat);
+        var newWorldPos = pivot.clone().add(offsetVec);
+
+        // Compose world quaternion
+        var newWorldQuat = deltaQuat.clone().multiply(origWorldQuat);
+
+        // Convert world position → parent local space
+        if (mesh.parent) {
+          mesh.parent.worldToLocal(newWorldPos);
+        }
+        mesh.position.copy(newWorldPos);
+
+        // Convert quaternion → parent local space
+        if (mesh.parent) {
+          var parentWorldQuat = new THREE__namespace.Quaternion();
+          mesh.parent.getWorldQuaternion(parentWorldQuat);
+          parentWorldQuat.invert();
+          newWorldQuat.premultiply(parentWorldQuat);
+        }
+        mesh.quaternion.copy(newWorldQuat);
+      } else {
+        var _off$x, _off$y, _off$z;
+        // Fallback for entries loaded without world data
+        var _pivot = new THREE__namespace.Vector3((_off$x = off.x) !== null && _off$x !== void 0 ? _off$x : 0, (_off$y = off.y) !== null && _off$y !== void 0 ? _off$y : 0, (_off$z = off.z) !== null && _off$z !== void 0 ? _off$z : 0);
+        var delta = origPos.clone().sub(_pivot);
+        delta.applyAxisAngle(localAxisVec, angle);
+        mesh.position.copy(_pivot).add(delta);
+        mesh.rotation[axis] = origRot[axis] + angle;
+      }
     }
 
     /**
@@ -39550,7 +39663,7 @@ var CentralPlant = /*#__PURE__*/function (_BaseDisposable) {
    * Initialize the CentralPlant manager
    * 
    * @constructor
-   * @version 0.3.29
+   * @version 0.3.31
    * @updated 2025-10-22
    * 
    * @description Creates a new CentralPlant instance and initializes internal managers and utilities.
@@ -42790,7 +42903,7 @@ var sceneViewer = /*#__PURE__*/function (_BaseDisposable) {
             _this4.componentTooltipManager.toggleIODeviceBinaryState(ioDeviceObject);
           }
         },
-        onIODeviceDrag: function onIODeviceDrag(ioDeviceObject, signedDelta, isStart) {
+        onIODeviceDrag: function onIODeviceDrag(ioDeviceObject, signedDelta, isStart, hitMesh) {
           if (isStart) {
             var _ioDeviceObject$userD, _this4$managers$ioBeh, _this4$managers, _this4$managers2;
             // Resolve parentUuid by walking up to the host component.
@@ -42817,7 +42930,7 @@ var sceneViewer = /*#__PURE__*/function (_BaseDisposable) {
           }
           if (!_this4.componentTooltipManager) return;
           if (isStart) {
-            _this4.componentTooltipManager.startIODeviceDrag(ioDeviceObject);
+            _this4.componentTooltipManager.startIODeviceDrag(ioDeviceObject, hitMesh);
           } else {
             _this4.componentTooltipManager.updateIODeviceDrag(signedDelta);
           }

package/dist/cjs/src/core/centralPlant.js

@@ -35,7 +35,7 @@ var CentralPlant = /*#__PURE__*/function (_BaseDisposable) {
    * Initialize the CentralPlant manager
    * 
    * @constructor
-   * @version 0.3.29
+   * @version 0.3.31
    * @updated 2025-10-22
    * 
    * @description Creates a new CentralPlant instance and initializes internal managers and utilities.

package/dist/cjs/src/core/sceneViewer.js

@@ -432,7 +432,7 @@ var sceneViewer = /*#__PURE__*/function (_BaseDisposable) {
             _this4.componentTooltipManager.toggleIODeviceBinaryState(ioDeviceObject);
           }
         },
-        onIODeviceDrag: function onIODeviceDrag(ioDeviceObject, signedDelta, isStart) {
+        onIODeviceDrag: function onIODeviceDrag(ioDeviceObject, signedDelta, isStart, hitMesh) {
           if (isStart) {
             var _ioDeviceObject$userD, _this4$managers$ioBeh, _this4$managers, _this4$managers2;
             // Resolve parentUuid by walking up to the host component.
@@ -459,7 +459,7 @@ var sceneViewer = /*#__PURE__*/function (_BaseDisposable) {
           }
           if (!_this4.componentTooltipManager) return;
           if (isStart) {
-            _this4.componentTooltipManager.startIODeviceDrag(ioDeviceObject);
+            _this4.componentTooltipManager.startIODeviceDrag(ioDeviceObject, hitMesh);
           } else {
             _this4.componentTooltipManager.updateIODeviceDrag(signedDelta);
           }

package/dist/cjs/src/managers/behaviors/IoBehaviorManager.js

@@ -70,6 +70,19 @@ var IoBehaviorManager = /*#__PURE__*/function (_BaseDisposable) {
       if (!anims.length) return;
       var key = this._key(parentUuid, attachmentId);
       var entries = [];
+
+      // Capture the device root's world orientation once so each entry can
+      // convert the configured axis from device-local space to world space.
+      var deviceWorldQuat = new THREE__namespace.Quaternion();
+      deviceModelRoot.getWorldQuaternion(deviceWorldQuat);
+
+      // Compute the model's native max dimension so rotAxisOffset values (stored
+      // in dialog-viewer-world units, where the model is normalised to 1 unit)
+      // can be scaled to runtime-world units.  viewerMaxDim = 1 / ns_viewer.
+      var _deviceBox = new THREE__namespace.Box3().setFromObject(deviceModelRoot);
+      var _deviceSize = new THREE__namespace.Vector3();
+      _deviceBox.getSize(_deviceSize);
+      var viewerMaxDim = Math.max(_deviceSize.x, _deviceSize.y, _deviceSize.z) || 1;
       var _iterator = _rollupPluginBabelHelpers.createForOfIteratorHelper(anims),
         _step;
       try {
@@ -80,11 +93,23 @@ var IoBehaviorManager = /*#__PURE__*/function (_BaseDisposable) {
             console.warn("[IoBehaviorManager] Could not find mesh for animation \"".concat(anim.name || anim.stateVariable, "\" (uuid: ").concat(anim.meshUuid, ", name: \"").concat(anim.meshName, "\")"));
             continue;
           }
+          var worldPos = new THREE__namespace.Vector3();
+          mesh.getWorldPosition(worldPos);
+          var worldQuat = new THREE__namespace.Quaternion();
+          mesh.getWorldQuaternion(worldQuat);
+          var box = new THREE__namespace.Box3().setFromObject(mesh);
+          var worldCenter = new THREE__namespace.Vector3();
+          if (!box.isEmpty()) box.getCenter(worldCenter);else worldCenter.copy(worldPos);
           entries.push({
             anim: anim,
             mesh: mesh,
             origPos: mesh.position.clone(),
-            origRot: mesh.rotation.clone()
+            origRot: mesh.rotation.clone(),
+            origWorldPos: worldPos,
+            origWorldQuat: worldQuat,
+            origWorldCenter: worldCenter,
+            deviceWorldQuat: deviceWorldQuat.clone(),
+            viewerMaxDim: viewerMaxDim
           });
         }
       } catch (err) {
@@ -114,16 +139,24 @@ var IoBehaviorManager = /*#__PURE__*/function (_BaseDisposable) {
   }, {
     key: "triggerState",
     value: function triggerState(attachmentId, dataPointId, value, parentUuid) {
-      var key = this._key(parentUuid, attachmentId);
-      var entries = this._entries.get(key);
-      if (!(entries !== null && entries !== void 0 && entries.length)) return;
-      var _iterator2 = _rollupPluginBabelHelpers.createForOfIteratorHelper(entries),
+      var _iterator2 = _rollupPluginBabelHelpers.createForOfIteratorHelper(this._entries.values()),
         _step2;
       try {
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var entry = _step2.value;
-          if (entry.anim.stateVariable !== dataPointId) continue;
-          this._applyAnimation(entry, value);
+          var entries = _step2.value;
+          var _iterator3 = _rollupPluginBabelHelpers.createForOfIteratorHelper(entries),
+            _step3;
+          try {
+            for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+              var entry = _step3.value;
+              if (entry.anim.stateVariable !== dataPointId) continue;
+              this._applyAnimation(entry, value);
+            }
+          } catch (err) {
+            _iterator3.e(err);
+          } finally {
+            _iterator3.f();
+          }
         }
       } catch (err) {
         _iterator2.e(err);
@@ -158,34 +191,47 @@ var IoBehaviorManager = /*#__PURE__*/function (_BaseDisposable) {
   }, {
     key: "getAnimationDataPoints",
     value: function getAnimationDataPoints(parentUuid, attachmentId) {
+      var _this2 = this;
+      var hitMesh = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
       var key = this._key(parentUuid, attachmentId);
       var entries = this._entries.get(key);
       if (!(entries !== null && entries !== void 0 && entries.length)) return [];
 
+      // When a specific mesh was clicked, filter to only animations whose target
+      // mesh is the clicked mesh or an ancestor of it (e.g. the clicked primitive
+      // is inside a group that is the animation target).
+      var filtered = entries;
+      if (hitMesh) {
+        var matching = entries.filter(function (e) {
+          return _this2._isMeshOrDescendant(hitMesh, e.mesh);
+        });
+        if (matching.length > 0) filtered = matching;
+      }
+
       // Collapse multiple mesh entries that share the same stateVariable
       var seen = new Map(); // stateVariable → anim
-      var _iterator3 = _rollupPluginBabelHelpers.createForOfIteratorHelper(entries),
-        _step3;
+      var _iterator4 = _rollupPluginBabelHelpers.createForOfIteratorHelper(filtered),
+        _step4;
       try {
-        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-          var anim = _step3.value.anim;
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+          var anim = _step4.value.anim;
           if (!seen.has(anim.stateVariable)) {
             seen.set(anim.stateVariable, anim);
           }
         }
       } catch (err) {
-        _iterator3.e(err);
+        _iterator4.e(err);
       } finally {
-        _iterator3.f();
+        _iterator4.f();
       }
       var dps = [];
-      var _iterator4 = _rollupPluginBabelHelpers.createForOfIteratorHelper(seen),
-        _step4;
+      var _iterator5 = _rollupPluginBabelHelpers.createForOfIteratorHelper(seen),
+        _step5;
       try {
-        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-          var _step4$value = _rollupPluginBabelHelpers.slicedToArray(_step4.value, 2),
-            stateVar = _step4$value[0],
-            _anim = _step4$value[1];
+        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+          var _step5$value = _rollupPluginBabelHelpers.slicedToArray(_step5.value, 2),
+            stateVar = _step5$value[0],
+            _anim = _step5$value[1];
           // Normalise stateType from AnimateDevicesDialog variants
           var stateType = void 0;
           var raw = (_anim.stateType || '').toLowerCase();
@@ -236,9 +282,9 @@ var IoBehaviorManager = /*#__PURE__*/function (_BaseDisposable) {
           });
         }
       } catch (err) {
-        _iterator4.e(err);
+        _iterator5.e(err);
       } finally {
-        _iterator4.f();
+        _iterator5.f();
       }
       return dps;
     }
@@ -273,19 +319,19 @@ var IoBehaviorManager = /*#__PURE__*/function (_BaseDisposable) {
     key: "unloadForComponent",
     value: function unloadForComponent(parentUuid) {
       var prefix = "".concat(parentUuid, "::");
-      var _iterator5 = _rollupPluginBabelHelpers.createForOfIteratorHelper(this._entries.keys()),
-        _step5;
+      var _iterator6 = _rollupPluginBabelHelpers.createForOfIteratorHelper(this._entries.keys()),
+        _step6;
       try {
-        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-          var key = _step5.value;
+        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+          var key = _step6.value;
           if (key.startsWith(prefix)) {
             this._entries.delete(key);
           }
         }
       } catch (err) {
-        _iterator5.e(err);
+        _iterator6.e(err);
       } finally {
-        _iterator5.f();
+        _iterator6.f();
       }
     }
   }, {
@@ -304,6 +350,22 @@ var IoBehaviorManager = /*#__PURE__*/function (_BaseDisposable) {
       return "".concat(parentUuid, "::").concat(attachmentId);
     }
 
+    /**
+     * Returns true if `candidate` is `ancestor` or any descendant of `ancestor`.
+     * @param {THREE.Object3D} candidate
+     * @param {THREE.Object3D} ancestor
+     */
+  }, {
+    key: "_isMeshOrDescendant",
+    value: function _isMeshOrDescendant(candidate, ancestor) {
+      var obj = candidate;
+      while (obj) {
+        if (obj === ancestor) return true;
+        obj = obj.parent;
+      }
+      return false;
+    }
+
     /**
      * Find the mesh inside `root` using UUID first, then name as fallback.
      * GLTFLoader assigns fresh UUIDs on every load, so name is the reliable key.
@@ -344,27 +406,32 @@ var IoBehaviorManager = /*#__PURE__*/function (_BaseDisposable) {
       var anim = entry.anim,
         mesh = entry.mesh,
         origPos = entry.origPos,
-        origRot = entry.origRot;
+        origRot = entry.origRot,
+        origWorldPos = entry.origWorldPos,
+        origWorldQuat = entry.origWorldQuat,
+        origWorldCenter = entry.origWorldCenter,
+        deviceWorldQuat = entry.deviceWorldQuat,
+        viewerMaxDim = entry.viewerMaxDim;
       var mapping = this._resolveMapping(anim, value);
       if (!mapping) return;
       var types = anim.transformTypes || [];
-      var _iterator6 = _rollupPluginBabelHelpers.createForOfIteratorHelper(types),
-        _step6;
+      var _iterator7 = _rollupPluginBabelHelpers.createForOfIteratorHelper(types),
+        _step7;
       try {
-        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-          var type = _step6.value;
+        for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+          var type = _step7.value;
           if (type === 'translation') {
             this._applyTranslation(mesh, origPos, mapping.transform);
           } else if (type === 'rotation') {
-            this._applyRotation(mesh, origPos, origRot, anim, mapping.rotationTransform);
+            this._applyRotation(mesh, origPos, origRot, anim, mapping.rotationTransform, origWorldPos, origWorldQuat, origWorldCenter, deviceWorldQuat, viewerMaxDim);
           } else if (type === 'color') {
             this._applyColor(mesh, mapping.colorTransform);
           }
         }
       } catch (err) {
-        _iterator6.e(err);
+        _iterator7.e(err);
       } finally {
-        _iterator6.f();
+        _iterator7.f();
       }
     }
 
@@ -501,26 +568,24 @@ var IoBehaviorManager = /*#__PURE__*/function (_BaseDisposable) {
     }
 
     /**
-     * Apply a rotation around an arbitrary pivot point in device-local space,
-     * optionally also displacing the mesh position to simulate orbital motion.
-     *
-     * Math (all in device-local space):
-     *   pivot   = rotAxisOffset
-     *   delta   = origPos - pivot
-     *   newDelta = rotate(delta, angle, axis)
-     *   newPos  = pivot + newDelta
-     *   newRot[axis] = origRot[axis] + angle
+     * Apply a rotation around an arbitrary pivot point using world-space quaternion
+     * math matching the ReconstructionViewer's setMeshPreviewRotationAxis approach.
+     * This ensures the runtime axis/pivot matches what the user configured in the
+     * animation dialog, regardless of the device's parent transform in the scene.
      *
      * @param {THREE.Object3D} mesh
-     * @param {THREE.Vector3}  origPos
-     * @param {THREE.Euler}    origRot
+     * @param {THREE.Vector3}  origPos        - local position at load time (unused, kept for signature compat)
+     * @param {THREE.Euler}    origRot        - local rotation at load time (unused)
      * @param {Object}         anim
-     * @param {number}         angleDeg - Degrees
+     * @param {number}         angleDeg       - Degrees
+     * @param {THREE.Vector3}  origWorldPos   - world position at load time
+     * @param {THREE.Quaternion} origWorldQuat - world quaternion at load time
+     * @param {THREE.Vector3}  origWorldCenter - world bounding-box center at load time
      */
   }, {
     key: "_applyRotation",
-    value: function _applyRotation(mesh, origPos, origRot, anim, angleDeg) {
-      var _anim$rotAxis, _anim$rotAxisOffset, _off$x, _off$y, _off$z;
+    value: function _applyRotation(mesh, origPos, origRot, anim, angleDeg, origWorldPos, origWorldQuat, origWorldCenter, deviceWorldQuat, viewerMaxDim) {
+      var _anim$rotAxis, _anim$rotAxisOffset;
       var angle = THREE__namespace.MathUtils.degToRad(typeof angleDeg === 'number' ? angleDeg : 0);
       var axis = ((_anim$rotAxis = anim.rotAxis) !== null && _anim$rotAxis !== void 0 ? _anim$rotAxis : 'x').toLowerCase();
       var off = (_anim$rotAxisOffset = anim.rotAxisOffset) !== null && _anim$rotAxisOffset !== void 0 ? _anim$rotAxisOffset : {
@@ -529,13 +594,57 @@ var IoBehaviorManager = /*#__PURE__*/function (_BaseDisposable) {
         z: 0
       };
 
-      // Unit vector for the chosen axis
-      var axisVec = new THREE__namespace.Vector3(axis === 'x' ? 1 : 0, axis === 'y' ? 1 : 0, axis === 'z' ? 1 : 0);
-      var pivot = new THREE__namespace.Vector3((_off$x = off.x) !== null && _off$x !== void 0 ? _off$x : 0, (_off$y = off.y) !== null && _off$y !== void 0 ? _off$y : 0, (_off$z = off.z) !== null && _off$z !== void 0 ? _off$z : 0);
-      var delta = origPos.clone().sub(pivot);
-      delta.applyAxisAngle(axisVec, angle);
-      mesh.position.copy(pivot).add(delta);
-      mesh.rotation[axis] = origRot[axis] + angle;
+      // Local axis in the device's coordinate system
+      var localAxisVec = new THREE__namespace.Vector3(axis === 'x' ? 1 : 0, axis === 'y' ? 1 : 0, axis === 'z' ? 1 : 0);
+      if (origWorldPos && origWorldQuat && origWorldCenter) {
+        // Transform the configured axis from device-local space into world space
+        // so that 'X' means the device's local X, not the world X.
+        var worldAxisVec = localAxisVec.clone().applyQuaternion(deviceWorldQuat || new THREE__namespace.Quaternion());
+
+        // rotAxisOffset is stored in dialog-viewer-world space where the model root
+        // has been rotated Rot_Z(π) by default (ReconstructionViewer's else branch).
+        // Translation uses the same convention and negates X/Y to compensate.
+        // For rotation offset we apply the same compensation mathematically:
+        //   offset_runtime = deviceWorldQuat × Rot_Z(π) × offset_dialog × scale
+        // This maps from dialog world space (post Z+180° flip) → model local → world.
+        var scale = viewerMaxDim || 1;
+        var rotZ180 = new THREE__namespace.Quaternion().setFromAxisAngle(new THREE__namespace.Vector3(0, 0, 1), Math.PI);
+        var qCombined = (deviceWorldQuat || new THREE__namespace.Quaternion()).clone().multiply(rotZ180);
+        var offWorld = new THREE__namespace.Vector3((off.x || 0) * scale, (off.y || 0) * scale, (off.z || 0) * scale).applyQuaternion(qCombined);
+        var pivot = origWorldCenter.clone().add(offWorld);
+        var deltaQuat = new THREE__namespace.Quaternion().setFromAxisAngle(worldAxisVec, angle);
+
+        // Rotate world position around pivot
+        var offsetVec = origWorldPos.clone().sub(pivot);
+        offsetVec.applyQuaternion(deltaQuat);
+        var newWorldPos = pivot.clone().add(offsetVec);
+
+        // Compose world quaternion
+        var newWorldQuat = deltaQuat.clone().multiply(origWorldQuat);
+
+        // Convert world position → parent local space
+        if (mesh.parent) {
+          mesh.parent.worldToLocal(newWorldPos);
+        }
+        mesh.position.copy(newWorldPos);
+
+        // Convert quaternion → parent local space
+        if (mesh.parent) {
+          var parentWorldQuat = new THREE__namespace.Quaternion();
+          mesh.parent.getWorldQuaternion(parentWorldQuat);
+          parentWorldQuat.invert();
+          newWorldQuat.premultiply(parentWorldQuat);
+        }
+        mesh.quaternion.copy(newWorldQuat);
+      } else {
+        var _off$x, _off$y, _off$z;
+        // Fallback for entries loaded without world data
+        var _pivot = new THREE__namespace.Vector3((_off$x = off.x) !== null && _off$x !== void 0 ? _off$x : 0, (_off$y = off.y) !== null && _off$y !== void 0 ? _off$y : 0, (_off$z = off.z) !== null && _off$z !== void 0 ? _off$z : 0);
+        var delta = origPos.clone().sub(_pivot);
+        delta.applyAxisAngle(localAxisVec, angle);
+        mesh.position.copy(_pivot).add(delta);
+        mesh.rotation[axis] = origRot[axis] + angle;
+      }
     }
 
     /**

package/dist/cjs/src/managers/controls/transformControlsManager.js

@@ -469,6 +469,7 @@ var TransformControlsManager = /*#__PURE__*/function () {
         raycaster.setFromCamera(mouse, _this4.camera);
         var allIntersects = raycaster.intersectObjects(_this4.scene.children, true);
         var ioDeviceObject = null;
+        var hitMesh = null;
         var _iterator = _rollupPluginBabelHelpers.createForOfIteratorHelper(allIntersects),
           _step;
         try {
@@ -483,7 +484,10 @@ var TransformControlsManager = /*#__PURE__*/function () {
               }
               obj = obj.parent;
             }
-            if (ioDeviceObject) break;
+            if (ioDeviceObject) {
+              hitMesh = hit.object;
+              break;
+            }
           }
         } catch (err) {
           _iterator.e(err);
@@ -498,7 +502,7 @@ var TransformControlsManager = /*#__PURE__*/function () {
         _this4._ioDragStartY = event.clientY;
         _this4._ioDragMoved = false;
         if (_this4.orbitControls) _this4.orbitControls.enabled = false;
-        _this4.callbacks.onIODeviceDrag(ioDeviceObject, 0, true);
+        _this4.callbacks.onIODeviceDrag(ioDeviceObject, 0, true, hitMesh);
         var onMove = function onMove(e) {
           var dx = e.clientX - _this4._ioDragStartX;
           var dy = e.clientY - _this4._ioDragStartY;

package/dist/cjs/src/managers/scene/componentTooltipManager.js

@@ -178,7 +178,7 @@ var ComponentTooltipManager = /*#__PURE__*/function (_BaseDisposable) {
      */
   }, {
     key: "startIODeviceDrag",
-    value: function startIODeviceDrag(ioDeviceObject) {
+    value: function startIODeviceDrag(ioDeviceObject, hitMesh) {
       var _this$sceneViewer2,
         _this2 = this;
       if (!ioDeviceObject || !this._stateAdapter) return;
@@ -197,7 +197,7 @@ var ComponentTooltipManager = /*#__PURE__*/function (_BaseDisposable) {
       }
       var scopedAttachmentId = this._getScopedAttachmentKey(attachmentId, parentUuid);
       var ioBehavMgr = (_this$sceneViewer2 = this.sceneViewer) === null || _this$sceneViewer2 === void 0 || (_this$sceneViewer2 = _this$sceneViewer2.managers) === null || _this$sceneViewer2 === void 0 ? void 0 : _this$sceneViewer2.ioBehaviorManager;
-      var dataPoints = ((ioBehavMgr === null || ioBehavMgr === void 0 ? void 0 : ioBehavMgr.getAnimationDataPoints(parentUuid, attachmentId)) || []).concat((ud === null || ud === void 0 ? void 0 : ud.dataPoints) || [])
+      var dataPoints = ((ioBehavMgr === null || ioBehavMgr === void 0 ? void 0 : ioBehavMgr.getAnimationDataPoints(parentUuid, attachmentId, hitMesh)) || []).concat((ud === null || ud === void 0 ? void 0 : ud.dataPoints) || [])
       // deduplicate by id
       .filter(function (dp, i, arr) {
         return arr.findIndex(function (d) {

package/dist/esm/src/core/centralPlant.js

@@ -31,7 +31,7 @@ var CentralPlant = /*#__PURE__*/function (_BaseDisposable) {
    * Initialize the CentralPlant manager
    * 
    * @constructor
-   * @version 0.3.29
+   * @version 0.3.31
    * @updated 2025-10-22
    * 
    * @description Creates a new CentralPlant instance and initializes internal managers and utilities.

package/dist/esm/src/core/sceneViewer.js

@@ -428,7 +428,7 @@ var sceneViewer = /*#__PURE__*/function (_BaseDisposable) {
             _this4.componentTooltipManager.toggleIODeviceBinaryState(ioDeviceObject);
           }
         },
-        onIODeviceDrag: function onIODeviceDrag(ioDeviceObject, signedDelta, isStart) {
+        onIODeviceDrag: function onIODeviceDrag(ioDeviceObject, signedDelta, isStart, hitMesh) {
           if (isStart) {
             var _ioDeviceObject$userD, _this4$managers$ioBeh, _this4$managers, _this4$managers2;
             // Resolve parentUuid by walking up to the host component.
@@ -455,7 +455,7 @@ var sceneViewer = /*#__PURE__*/function (_BaseDisposable) {
           }
           if (!_this4.componentTooltipManager) return;
           if (isStart) {
-            _this4.componentTooltipManager.startIODeviceDrag(ioDeviceObject);
+            _this4.componentTooltipManager.startIODeviceDrag(ioDeviceObject, hitMesh);
           } else {
             _this4.componentTooltipManager.updateIODeviceDrag(signedDelta);
           }

package/dist/esm/src/managers/behaviors/IoBehaviorManager.js

@@ -46,6 +46,19 @@ var IoBehaviorManager = /*#__PURE__*/function (_BaseDisposable) {
       if (!anims.length) return;
       var key = this._key(parentUuid, attachmentId);
       var entries = [];
+
+      // Capture the device root's world orientation once so each entry can
+      // convert the configured axis from device-local space to world space.
+      var deviceWorldQuat = new THREE.Quaternion();
+      deviceModelRoot.getWorldQuaternion(deviceWorldQuat);
+
+      // Compute the model's native max dimension so rotAxisOffset values (stored
+      // in dialog-viewer-world units, where the model is normalised to 1 unit)
+      // can be scaled to runtime-world units.  viewerMaxDim = 1 / ns_viewer.
+      var _deviceBox = new THREE.Box3().setFromObject(deviceModelRoot);
+      var _deviceSize = new THREE.Vector3();
+      _deviceBox.getSize(_deviceSize);
+      var viewerMaxDim = Math.max(_deviceSize.x, _deviceSize.y, _deviceSize.z) || 1;
       var _iterator = _createForOfIteratorHelper(anims),
         _step;
       try {
@@ -56,11 +69,23 @@ var IoBehaviorManager = /*#__PURE__*/function (_BaseDisposable) {
             console.warn("[IoBehaviorManager] Could not find mesh for animation \"".concat(anim.name || anim.stateVariable, "\" (uuid: ").concat(anim.meshUuid, ", name: \"").concat(anim.meshName, "\")"));
             continue;
           }
+          var worldPos = new THREE.Vector3();
+          mesh.getWorldPosition(worldPos);
+          var worldQuat = new THREE.Quaternion();
+          mesh.getWorldQuaternion(worldQuat);
+          var box = new THREE.Box3().setFromObject(mesh);
+          var worldCenter = new THREE.Vector3();
+          if (!box.isEmpty()) box.getCenter(worldCenter);else worldCenter.copy(worldPos);
           entries.push({
             anim: anim,
             mesh: mesh,
             origPos: mesh.position.clone(),
-            origRot: mesh.rotation.clone()
+            origRot: mesh.rotation.clone(),
+            origWorldPos: worldPos,
+            origWorldQuat: worldQuat,
+            origWorldCenter: worldCenter,
+            deviceWorldQuat: deviceWorldQuat.clone(),
+            viewerMaxDim: viewerMaxDim
           });
         }
       } catch (err) {
@@ -90,16 +115,24 @@ var IoBehaviorManager = /*#__PURE__*/function (_BaseDisposable) {
   }, {
     key: "triggerState",
     value: function triggerState(attachmentId, dataPointId, value, parentUuid) {
-      var key = this._key(parentUuid, attachmentId);
-      var entries = this._entries.get(key);
-      if (!(entries !== null && entries !== void 0 && entries.length)) return;
-      var _iterator2 = _createForOfIteratorHelper(entries),
+      var _iterator2 = _createForOfIteratorHelper(this._entries.values()),
         _step2;
       try {
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var entry = _step2.value;
-          if (entry.anim.stateVariable !== dataPointId) continue;
-          this._applyAnimation(entry, value);
+          var entries = _step2.value;
+          var _iterator3 = _createForOfIteratorHelper(entries),
+            _step3;
+          try {
+            for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+              var entry = _step3.value;
+              if (entry.anim.stateVariable !== dataPointId) continue;
+              this._applyAnimation(entry, value);
+            }
+          } catch (err) {
+            _iterator3.e(err);
+          } finally {
+            _iterator3.f();
+          }
         }
       } catch (err) {
         _iterator2.e(err);
@@ -134,34 +167,47 @@ var IoBehaviorManager = /*#__PURE__*/function (_BaseDisposable) {
   }, {
     key: "getAnimationDataPoints",
     value: function getAnimationDataPoints(parentUuid, attachmentId) {
+      var _this2 = this;
+      var hitMesh = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
       var key = this._key(parentUuid, attachmentId);
       var entries = this._entries.get(key);
       if (!(entries !== null && entries !== void 0 && entries.length)) return [];
 
+      // When a specific mesh was clicked, filter to only animations whose target
+      // mesh is the clicked mesh or an ancestor of it (e.g. the clicked primitive
+      // is inside a group that is the animation target).
+      var filtered = entries;
+      if (hitMesh) {
+        var matching = entries.filter(function (e) {
+          return _this2._isMeshOrDescendant(hitMesh, e.mesh);
+        });
+        if (matching.length > 0) filtered = matching;
+      }
+
       // Collapse multiple mesh entries that share the same stateVariable
       var seen = new Map(); // stateVariable → anim
-      var _iterator3 = _createForOfIteratorHelper(entries),
-        _step3;
+      var _iterator4 = _createForOfIteratorHelper(filtered),
+        _step4;
       try {
-        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-          var anim = _step3.value.anim;
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+          var anim = _step4.value.anim;
           if (!seen.has(anim.stateVariable)) {
             seen.set(anim.stateVariable, anim);
           }
         }
       } catch (err) {
-        _iterator3.e(err);
+        _iterator4.e(err);
       } finally {
-        _iterator3.f();
+        _iterator4.f();
       }
       var dps = [];
-      var _iterator4 = _createForOfIteratorHelper(seen),
-        _step4;
+      var _iterator5 = _createForOfIteratorHelper(seen),
+        _step5;
       try {
-        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-          var _step4$value = _slicedToArray(_step4.value, 2),
-            stateVar = _step4$value[0],
-            _anim = _step4$value[1];
+        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+          var _step5$value = _slicedToArray(_step5.value, 2),
+            stateVar = _step5$value[0],
+            _anim = _step5$value[1];
           // Normalise stateType from AnimateDevicesDialog variants
           var stateType = void 0;
           var raw = (_anim.stateType || '').toLowerCase();
@@ -212,9 +258,9 @@ var IoBehaviorManager = /*#__PURE__*/function (_BaseDisposable) {
           });
         }
       } catch (err) {
-        _iterator4.e(err);
+        _iterator5.e(err);
       } finally {
-        _iterator4.f();
+        _iterator5.f();
       }
       return dps;
     }
@@ -249,19 +295,19 @@ var IoBehaviorManager = /*#__PURE__*/function (_BaseDisposable) {
     key: "unloadForComponent",
     value: function unloadForComponent(parentUuid) {
       var prefix = "".concat(parentUuid, "::");
-      var _iterator5 = _createForOfIteratorHelper(this._entries.keys()),
-        _step5;
+      var _iterator6 = _createForOfIteratorHelper(this._entries.keys()),
+        _step6;
       try {
-        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-          var key = _step5.value;
+        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+          var key = _step6.value;
           if (key.startsWith(prefix)) {
             this._entries.delete(key);
           }
         }
       } catch (err) {
-        _iterator5.e(err);
+        _iterator6.e(err);
       } finally {
-        _iterator5.f();
+        _iterator6.f();
       }
     }
   }, {
@@ -280,6 +326,22 @@ var IoBehaviorManager = /*#__PURE__*/function (_BaseDisposable) {
       return "".concat(parentUuid, "::").concat(attachmentId);
     }
 
+    /**
+     * Returns true if `candidate` is `ancestor` or any descendant of `ancestor`.
+     * @param {THREE.Object3D} candidate
+     * @param {THREE.Object3D} ancestor
+     */
+  }, {
+    key: "_isMeshOrDescendant",
+    value: function _isMeshOrDescendant(candidate, ancestor) {
+      var obj = candidate;
+      while (obj) {
+        if (obj === ancestor) return true;
+        obj = obj.parent;
+      }
+      return false;
+    }
+
     /**
      * Find the mesh inside `root` using UUID first, then name as fallback.
      * GLTFLoader assigns fresh UUIDs on every load, so name is the reliable key.
@@ -320,27 +382,32 @@ var IoBehaviorManager = /*#__PURE__*/function (_BaseDisposable) {
       var anim = entry.anim,
         mesh = entry.mesh,
         origPos = entry.origPos,
-        origRot = entry.origRot;
+        origRot = entry.origRot,
+        origWorldPos = entry.origWorldPos,
+        origWorldQuat = entry.origWorldQuat,
+        origWorldCenter = entry.origWorldCenter,
+        deviceWorldQuat = entry.deviceWorldQuat,
+        viewerMaxDim = entry.viewerMaxDim;
       var mapping = this._resolveMapping(anim, value);
       if (!mapping) return;
       var types = anim.transformTypes || [];
-      var _iterator6 = _createForOfIteratorHelper(types),
-        _step6;
+      var _iterator7 = _createForOfIteratorHelper(types),
+        _step7;
       try {
-        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-          var type = _step6.value;
+        for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+          var type = _step7.value;
           if (type === 'translation') {
             this._applyTranslation(mesh, origPos, mapping.transform);
           } else if (type === 'rotation') {
-            this._applyRotation(mesh, origPos, origRot, anim, mapping.rotationTransform);
+            this._applyRotation(mesh, origPos, origRot, anim, mapping.rotationTransform, origWorldPos, origWorldQuat, origWorldCenter, deviceWorldQuat, viewerMaxDim);
           } else if (type === 'color') {
             this._applyColor(mesh, mapping.colorTransform);
           }
         }
       } catch (err) {
-        _iterator6.e(err);
+        _iterator7.e(err);
       } finally {
-        _iterator6.f();
+        _iterator7.f();
       }
     }
 
@@ -477,26 +544,24 @@ var IoBehaviorManager = /*#__PURE__*/function (_BaseDisposable) {
     }
 
     /**
-     * Apply a rotation around an arbitrary pivot point in device-local space,
-     * optionally also displacing the mesh position to simulate orbital motion.
-     *
-     * Math (all in device-local space):
-     *   pivot   = rotAxisOffset
-     *   delta   = origPos - pivot
-     *   newDelta = rotate(delta, angle, axis)
-     *   newPos  = pivot + newDelta
-     *   newRot[axis] = origRot[axis] + angle
+     * Apply a rotation around an arbitrary pivot point using world-space quaternion
+     * math matching the ReconstructionViewer's setMeshPreviewRotationAxis approach.
+     * This ensures the runtime axis/pivot matches what the user configured in the
+     * animation dialog, regardless of the device's parent transform in the scene.
      *
      * @param {THREE.Object3D} mesh
-     * @param {THREE.Vector3}  origPos
-     * @param {THREE.Euler}    origRot
+     * @param {THREE.Vector3}  origPos        - local position at load time (unused, kept for signature compat)
+     * @param {THREE.Euler}    origRot        - local rotation at load time (unused)
      * @param {Object}         anim
-     * @param {number}         angleDeg - Degrees
+     * @param {number}         angleDeg       - Degrees
+     * @param {THREE.Vector3}  origWorldPos   - world position at load time
+     * @param {THREE.Quaternion} origWorldQuat - world quaternion at load time
+     * @param {THREE.Vector3}  origWorldCenter - world bounding-box center at load time
      */
   }, {
     key: "_applyRotation",
-    value: function _applyRotation(mesh, origPos, origRot, anim, angleDeg) {
-      var _anim$rotAxis, _anim$rotAxisOffset, _off$x, _off$y, _off$z;
+    value: function _applyRotation(mesh, origPos, origRot, anim, angleDeg, origWorldPos, origWorldQuat, origWorldCenter, deviceWorldQuat, viewerMaxDim) {
+      var _anim$rotAxis, _anim$rotAxisOffset;
       var angle = THREE.MathUtils.degToRad(typeof angleDeg === 'number' ? angleDeg : 0);
       var axis = ((_anim$rotAxis = anim.rotAxis) !== null && _anim$rotAxis !== void 0 ? _anim$rotAxis : 'x').toLowerCase();
       var off = (_anim$rotAxisOffset = anim.rotAxisOffset) !== null && _anim$rotAxisOffset !== void 0 ? _anim$rotAxisOffset : {
@@ -505,13 +570,57 @@ var IoBehaviorManager = /*#__PURE__*/function (_BaseDisposable) {
         z: 0
       };
 
-      // Unit vector for the chosen axis
-      var axisVec = new THREE.Vector3(axis === 'x' ? 1 : 0, axis === 'y' ? 1 : 0, axis === 'z' ? 1 : 0);
-      var pivot = new THREE.Vector3((_off$x = off.x) !== null && _off$x !== void 0 ? _off$x : 0, (_off$y = off.y) !== null && _off$y !== void 0 ? _off$y : 0, (_off$z = off.z) !== null && _off$z !== void 0 ? _off$z : 0);
-      var delta = origPos.clone().sub(pivot);
-      delta.applyAxisAngle(axisVec, angle);
-      mesh.position.copy(pivot).add(delta);
-      mesh.rotation[axis] = origRot[axis] + angle;
+      // Local axis in the device's coordinate system
+      var localAxisVec = new THREE.Vector3(axis === 'x' ? 1 : 0, axis === 'y' ? 1 : 0, axis === 'z' ? 1 : 0);
+      if (origWorldPos && origWorldQuat && origWorldCenter) {
+        // Transform the configured axis from device-local space into world space
+        // so that 'X' means the device's local X, not the world X.
+        var worldAxisVec = localAxisVec.clone().applyQuaternion(deviceWorldQuat || new THREE.Quaternion());
+
+        // rotAxisOffset is stored in dialog-viewer-world space where the model root
+        // has been rotated Rot_Z(π) by default (ReconstructionViewer's else branch).
+        // Translation uses the same convention and negates X/Y to compensate.
+        // For rotation offset we apply the same compensation mathematically:
+        //   offset_runtime = deviceWorldQuat × Rot_Z(π) × offset_dialog × scale
+        // This maps from dialog world space (post Z+180° flip) → model local → world.
+        var scale = viewerMaxDim || 1;
+        var rotZ180 = new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(0, 0, 1), Math.PI);
+        var qCombined = (deviceWorldQuat || new THREE.Quaternion()).clone().multiply(rotZ180);
+        var offWorld = new THREE.Vector3((off.x || 0) * scale, (off.y || 0) * scale, (off.z || 0) * scale).applyQuaternion(qCombined);
+        var pivot = origWorldCenter.clone().add(offWorld);
+        var deltaQuat = new THREE.Quaternion().setFromAxisAngle(worldAxisVec, angle);
+
+        // Rotate world position around pivot
+        var offsetVec = origWorldPos.clone().sub(pivot);
+        offsetVec.applyQuaternion(deltaQuat);
+        var newWorldPos = pivot.clone().add(offsetVec);
+
+        // Compose world quaternion
+        var newWorldQuat = deltaQuat.clone().multiply(origWorldQuat);
+
+        // Convert world position → parent local space
+        if (mesh.parent) {
+          mesh.parent.worldToLocal(newWorldPos);
+        }
+        mesh.position.copy(newWorldPos);
+
+        // Convert quaternion → parent local space
+        if (mesh.parent) {
+          var parentWorldQuat = new THREE.Quaternion();
+          mesh.parent.getWorldQuaternion(parentWorldQuat);
+          parentWorldQuat.invert();
+          newWorldQuat.premultiply(parentWorldQuat);
+        }
+        mesh.quaternion.copy(newWorldQuat);
+      } else {
+        var _off$x, _off$y, _off$z;
+        // Fallback for entries loaded without world data
+        var _pivot = new THREE.Vector3((_off$x = off.x) !== null && _off$x !== void 0 ? _off$x : 0, (_off$y = off.y) !== null && _off$y !== void 0 ? _off$y : 0, (_off$z = off.z) !== null && _off$z !== void 0 ? _off$z : 0);
+        var delta = origPos.clone().sub(_pivot);
+        delta.applyAxisAngle(localAxisVec, angle);
+        mesh.position.copy(_pivot).add(delta);
+        mesh.rotation[axis] = origRot[axis] + angle;
+      }
     }
 
     /**

package/dist/esm/src/managers/controls/transformControlsManager.js

@@ -445,6 +445,7 @@ var TransformControlsManager = /*#__PURE__*/function () {
         raycaster.setFromCamera(mouse, _this4.camera);
         var allIntersects = raycaster.intersectObjects(_this4.scene.children, true);
         var ioDeviceObject = null;
+        var hitMesh = null;
         var _iterator = _createForOfIteratorHelper(allIntersects),
           _step;
         try {
@@ -459,7 +460,10 @@ var TransformControlsManager = /*#__PURE__*/function () {
               }
               obj = obj.parent;
             }
-            if (ioDeviceObject) break;
+            if (ioDeviceObject) {
+              hitMesh = hit.object;
+              break;
+            }
           }
         } catch (err) {
           _iterator.e(err);
@@ -474,7 +478,7 @@ var TransformControlsManager = /*#__PURE__*/function () {
         _this4._ioDragStartY = event.clientY;
         _this4._ioDragMoved = false;
         if (_this4.orbitControls) _this4.orbitControls.enabled = false;
-        _this4.callbacks.onIODeviceDrag(ioDeviceObject, 0, true);
+        _this4.callbacks.onIODeviceDrag(ioDeviceObject, 0, true, hitMesh);
         var onMove = function onMove(e) {
           var dx = e.clientX - _this4._ioDragStartX;
           var dy = e.clientY - _this4._ioDragStartY;

package/dist/esm/src/managers/scene/componentTooltipManager.js

@@ -154,7 +154,7 @@ var ComponentTooltipManager = /*#__PURE__*/function (_BaseDisposable) {
      */
   }, {
     key: "startIODeviceDrag",
-    value: function startIODeviceDrag(ioDeviceObject) {
+    value: function startIODeviceDrag(ioDeviceObject, hitMesh) {
       var _this$sceneViewer2,
         _this2 = this;
       if (!ioDeviceObject || !this._stateAdapter) return;
@@ -173,7 +173,7 @@ var ComponentTooltipManager = /*#__PURE__*/function (_BaseDisposable) {
       }
       var scopedAttachmentId = this._getScopedAttachmentKey(attachmentId, parentUuid);
       var ioBehavMgr = (_this$sceneViewer2 = this.sceneViewer) === null || _this$sceneViewer2 === void 0 || (_this$sceneViewer2 = _this$sceneViewer2.managers) === null || _this$sceneViewer2 === void 0 ? void 0 : _this$sceneViewer2.ioBehaviorManager;
-      var dataPoints = ((ioBehavMgr === null || ioBehavMgr === void 0 ? void 0 : ioBehavMgr.getAnimationDataPoints(parentUuid, attachmentId)) || []).concat((ud === null || ud === void 0 ? void 0 : ud.dataPoints) || [])
+      var dataPoints = ((ioBehavMgr === null || ioBehavMgr === void 0 ? void 0 : ioBehavMgr.getAnimationDataPoints(parentUuid, attachmentId, hitMesh)) || []).concat((ud === null || ud === void 0 ? void 0 : ud.dataPoints) || [])
       // deduplicate by id
       .filter(function (dp, i, arr) {
         return arr.findIndex(function (d) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@2112-lab/central-plant",
-  "version": "0.3.29",
+  "version": "0.3.31",
   "description": "Utility modules for the Central Plant Application",
   "main": "dist/bundle/index.js",
   "module": "dist/esm/src/index.js",