@2112-lab/central-plant 0.3.44 → 0.3.46

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

@@ -17,6 +17,7 @@ import { KeyboardControlsManager } from '../managers/controls/keyboardControlsMa
 import { PathfindingManager } from '../managers/pathfinding/pathfindingManager.js';
 import { PathFlowManager } from '../managers/pathfinding/PathFlowManager.js';
 import { SceneOperationsManager } from '../managers/scene/sceneOperationsManager.js';
+import { CollisionManager } from '../managers/scene/collisionManager.js';
 import { AnimationManager } from '../managers/scene/animationManager.js';
 import { CameraControlsManager } from '../managers/controls/cameraControlsManager.js';
 import { ComponentDragManager } from '../managers/controls/componentDragManager.js';
@@ -145,6 +146,7 @@ var CentralPlantInternals = /*#__PURE__*/function () {
       this.centralPlant.managers.keyboardControlsManager = new KeyboardControlsManager(this.centralPlant.sceneViewer);
       this.centralPlant.managers.pathfindingManager = new PathfindingManager(this.centralPlant.sceneViewer);
       this.centralPlant.managers.pathFlowManager = new PathFlowManager(this.centralPlant.sceneViewer);
+      this.centralPlant.managers.collisionManager = new CollisionManager(this.centralPlant.sceneViewer);
       this.centralPlant.managers.sceneOperationsManager = new SceneOperationsManager(this.centralPlant.sceneViewer);
       this.centralPlant.managers.animationManager = new AnimationManager(this.centralPlant.sceneViewer);
       this.centralPlant.managers.cameraControlsManager = new CameraControlsManager(this.centralPlant.sceneViewer);

package/dist/esm/src/index.js

@@ -14,7 +14,7 @@ export { buildCrossBehavior, buildIntraBehavior, normalizeBehavior, parseCrossBe
 export { registerBehaviorsForComponent, reloadBehaviorsForDeviceAsset } from './utils/behaviorRegistration.js';
 export { applyDefaultIoDeviceStates, getIoBehaviorManager, getScopedAttachmentKey, resolveDataPoints } from './utils/behaviorDispatch.js';
 export { applyCrossComponentBehaviors, loadCrossComponentBehaviors, refreshSceneIntraBehaviors, reregisterSceneBehaviors, scanSceneIoEndpoints } from './utils/behaviorSceneUtils.js';
-export { collectSceneLibraryIds, embedComponentDefinitions, getComponentDictionary } from './utils/demoSceneUtils.js';
+export { collectSceneLibraryIds, getComponentDictionary } from './utils/demoSceneUtils.js';
 export { applyModelRootTranslation, applyModelRootTranslationFromWorldBase, modelOffsetToWorldDelta } from './utils/animationTransformUtils.js';
 export { ComponentManager } from './managers/components/componentManager.js';
 export { AnimationManager } from './managers/scene/animationManager.js';

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

@@ -28,6 +28,13 @@ var IoBehaviorManager = /*#__PURE__*/function (_BaseDisposable) {
     /** @type {Map<string, Object[]>} cache key → data point definitions */
     _this._dataPointsCache = new Map();
 
+    // Listen for object transformations to invalidate world-pose caches
+    if (_this.sceneViewer && typeof _this.sceneViewer.on === 'function') {
+      _this.sceneViewer.on('objectTransformed', function () {
+        return _this.invalidateCaches();
+      });
+    }
+
     /**
      * Injected by the host application to read and write I/O device state.
      * Set via configure(). Shape:
@@ -89,6 +96,13 @@ 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;
           }
+
+          // Ensure world matrix is fresh before capturing rest world pose
+          if (typeof mesh.updateWorldMatrix === 'function') {
+            mesh.updateWorldMatrix(true, false);
+          } else {
+            mesh.updateMatrixWorld(true);
+          }
           var worldPos = new THREE.Vector3();
           mesh.getWorldPosition(worldPos);
           var worldQuat = new THREE.Quaternion();
@@ -679,6 +693,40 @@ var IoBehaviorManager = /*#__PURE__*/function (_BaseDisposable) {
       this._attachmentParentMap.clear();
       this._dataPointsCache.clear();
     }
+
+    /**
+     * Invalidate world-space pose caches for all registered entries.
+     * Call this when components are moved or rotated to ensure behaviors
+     * recalculate their world-space rest pose.
+     */
+  }, {
+    key: "invalidateCaches",
+    value: function invalidateCaches() {
+      var _iterator9 = _createForOfIteratorHelper(this._entries.values()),
+        _step9;
+      try {
+        for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+          var entryList = _step9.value;
+          var _iterator0 = _createForOfIteratorHelper(entryList),
+            _step0;
+          try {
+            for (_iterator0.s(); !(_step0 = _iterator0.n()).done;) {
+              var entry = _step0.value;
+              delete entry._restWorldCache;
+            }
+          } catch (err) {
+            _iterator0.e(err);
+          } finally {
+            _iterator0.f();
+          }
+        }
+      } catch (err) {
+        _iterator9.e(err);
+      } finally {
+        _iterator9.f();
+      }
+      this._dataPointsCache.clear();
+    }
   }, {
     key: "dispose",
     value: function dispose() {
@@ -757,11 +805,11 @@ var IoBehaviorManager = /*#__PURE__*/function (_BaseDisposable) {
       var mapping = this._resolveMapping(anim, value);
       if (!mapping) return;
       var types = anim.transformTypes || [];
-      var _iterator9 = _createForOfIteratorHelper(types),
-        _step9;
+      var _iterator1 = _createForOfIteratorHelper(types),
+        _step1;
       try {
-        for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
-          var type = _step9.value;
+        for (_iterator1.s(); !(_step1 = _iterator1.n()).done;) {
+          var type = _step1.value;
           if (type === 'translation') {
             this._applyTranslation(entry, mapping.transform);
           } else if (type === 'rotation') {
@@ -771,9 +819,9 @@ var IoBehaviorManager = /*#__PURE__*/function (_BaseDisposable) {
           }
         }
       } catch (err) {
-        _iterator9.e(err);
+        _iterator1.e(err);
       } finally {
-        _iterator9.f();
+        _iterator1.f();
       }
     }
 
@@ -933,7 +981,14 @@ var IoBehaviorManager = /*#__PURE__*/function (_BaseDisposable) {
       var savedQuat = mesh.quaternion.clone();
       mesh.position.copy(origPos);
       mesh.rotation.copy(origRot);
-      mesh.updateMatrixWorld(true);
+
+      // Ensure all ancestors are updated so getWorldPosition is accurate
+      // even if a parent component was recently moved.
+      if (typeof mesh.updateWorldMatrix === 'function') {
+        mesh.updateWorldMatrix(true, false);
+      } else {
+        mesh.updateMatrixWorld(true);
+      }
       var origWorldPos = new THREE.Vector3();
       mesh.getWorldPosition(origWorldPos);
       var origWorldQuat = new THREE.Quaternion();

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

@@ -643,6 +643,7 @@ var ComponentDragManager = /*#__PURE__*/function (_BaseDisposable) {
       // Find intersection with ground plane
       var intersection = this.raycaster.ray.intersectPlane(this.dropPlane, this.dropIntersection);
       if (intersection) {
+        var _this$sceneViewer$col;
         // Apply 0.5 unit transform snapping to intersection point
         var snappedPosition = this._applyTransformSnap(intersection);
         this.dragData.previewObject.position.copy(snappedPosition);
@@ -650,7 +651,7 @@ var ComponentDragManager = /*#__PURE__*/function (_BaseDisposable) {
 
         // Check for overlap and update color accordingly
         var wasOverlapping = this.dragData.isOverlapping;
-        this.dragData.isOverlapping = this._checkBoundingBoxOverlap();
+        this.dragData.isOverlapping = !!((_this$sceneViewer$col = this.sceneViewer.collisionManager) !== null && _this$sceneViewer$col !== void 0 && _this$sceneViewer$col.checkCollision(this.dragData.previewObject));
 
         // Update color if overlap state changed
         if (wasOverlapping !== this.dragData.isOverlapping) {

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

@@ -0,0 +1,119 @@
+import { createClass as _createClass, createForOfIteratorHelper as _createForOfIteratorHelper, classCallCheck as _classCallCheck } from '../../../_virtual/_rollupPluginBabelHelpers.js';
+import * as THREE from 'three';
+
+var CollisionManager = /*#__PURE__*/function () {
+  /**
+   * @param {Object} sceneViewer - The scene viewer instance
+   */
+  function CollisionManager(sceneViewer) {
+    _classCallCheck(this, CollisionManager);
+    this.sceneViewer = sceneViewer;
+  }
+
+  /**
+   * Check if a given object overlaps with any other relevant objects in the scene.
+   * @param {THREE.Object3D} object - The object to check for collisions
+   * @param {Array<string>} excludeTypes - Object types to exclude from checking (e.g. ['ground'])
+   * @returns {Object|null} Collision info {object, objectType} if collision detected, null otherwise
+   */
+  return _createClass(CollisionManager, [{
+    key: "checkCollision",
+    value: function checkCollision(object) {
+      var _this$sceneViewer,
+        _this = this;
+      var excludeTypes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ['isBaseGround', 'isBaseGrid', 'isBrickWall'];
+      if (!((_this$sceneViewer = this.sceneViewer) !== null && _this$sceneViewer !== void 0 && _this$sceneViewer.scene) || !object) return null;
+
+      // Compute high-quality bounding box for the object being checked
+      // We use setFromObject here because the target object just moved
+      var objectBBox = new THREE.Box3().setFromObject(object);
+
+      // Narrow down potential colliders
+      var collisionDetected = null;
+
+      // Optimization: Only check the root-level CP objects to avoid O(N^2) complexity with meshes
+      this.sceneViewer.scene.traverse(function (child) {
+        var _child$userData, _child$userData2, _child$userData3, _child$userData4, _child$userData5;
+        if (collisionDetected) return; // Short circuit
+
+        // Skip the object itself and its descendants
+        if (child === object || _this._isDescendantOf(object, child)) return;
+
+        // Filter by CP object types at the root level (skip internal meshes during traverse)
+        var isCPRootObject = ((_child$userData = child.userData) === null || _child$userData === void 0 ? void 0 : _child$userData.objectType) === 'component' || ((_child$userData2 = child.userData) === null || _child$userData2 === void 0 ? void 0 : _child$userData2.objectType) === 'segment' || ((_child$userData3 = child.userData) === null || _child$userData3 === void 0 ? void 0 : _child$userData3.objectType) === 'gateway' || ((_child$userData4 = child.userData) === null || _child$userData4 === void 0 ? void 0 : _child$userData4.objectType) === 'connector' || ((_child$userData5 = child.userData) === null || _child$userData5 === void 0 ? void 0 : _child$userData5.ioConfig); // IO Device
+
+        if (isCPRootObject && !_this._shouldExclude(child, excludeTypes)) {
+          // Use cached worldBoundingBox if available, otherwise compute it (and cache it)
+          var childBBox;
+          if (child.userData.worldBoundingBox && !child.userData.isMoving) {
+            var _min$x, _min$y, _min$z, _max$x, _max$y, _max$z;
+            // Use stored worldBoundingBox (handles array or Box3 format)
+            var min = child.userData.worldBoundingBox.min;
+            var max = child.userData.worldBoundingBox.max;
+            childBBox = new THREE.Box3(new THREE.Vector3((_min$x = min.x) !== null && _min$x !== void 0 ? _min$x : min[0], (_min$y = min.y) !== null && _min$y !== void 0 ? _min$y : min[1], (_min$z = min.z) !== null && _min$z !== void 0 ? _min$z : min[2]), new THREE.Vector3((_max$x = max.x) !== null && _max$x !== void 0 ? _max$x : max[0], (_max$y = max.y) !== null && _max$y !== void 0 ? _max$y : max[1], (_max$z = max.z) !== null && _max$z !== void 0 ? _max$z : max[2]));
+          } else {
+            // Fallback to high-quality computation for moving objects or first-time checks
+            childBBox = new THREE.Box3().setFromObject(child);
+
+            // Cache the result for next time (non-moving objects)
+            if (!child.userData.isMoving) {
+              child.userData.worldBoundingBox = {
+                min: [childBBox.min.x, childBBox.min.y, childBBox.min.z],
+                max: [childBBox.max.x, childBBox.max.y, childBBox.max.z]
+              };
+            }
+          }
+          if (objectBBox.intersectsBox(childBBox)) {
+            collisionDetected = {
+              object: child,
+              objectType: child.userData.objectType,
+              uuid: child.uuid,
+              name: child.name || child.userData.libraryId || child.uuid
+            };
+          }
+        }
+      });
+      return collisionDetected;
+    }
+
+    /**
+     * Helper to check if a node is a descendant of a specific parent
+     * @private
+     */
+  }, {
+    key: "_isDescendantOf",
+    value: function _isDescendantOf(parent, child) {
+      var node = child.parent;
+      while (node !== null) {
+        if (node === parent) return true;
+        node = node.parent;
+      }
+      return false;
+    }
+
+    /**
+     * Helper to determine if an object should be excluded from collision checking
+     * @private
+     */
+  }, {
+    key: "_shouldExclude",
+    value: function _shouldExclude(object, excludeTypes) {
+      if (object.userData.isPreview) return true;
+      var _iterator = _createForOfIteratorHelper(excludeTypes),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var type = _step.value;
+          if (object.userData[type]) return true;
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+      return false;
+    }
+  }]);
+}();
+
+export { CollisionManager };

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

@@ -145,6 +145,8 @@ var SceneExportManager = /*#__PURE__*/function () {
           // Internal tracking - not needed in export
           'initialPosition',
           // Internal tracking - not needed in export
+          'attachedDevices',
+          // Stored in smart component dictionary, not scene JSON
           // Exclude internal segment tracking properties
           'segmentId',
           // Internal tracking

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

@@ -1309,55 +1309,20 @@ var SceneOperationsManager = /*#__PURE__*/function () {
             y: componentModel.scale.y,
             z: componentModel.scale.z
           },
-          userData: _objectSpread2(_objectSpread2({}, componentModel.userData), {}, {
+          userData: _objectSpread2(_objectSpread2({}, function () {
+            var ud = _objectSpread2({}, componentModel.userData);
+            delete ud.attachedDevices; // Instance data belongs in dictionary, not scene JSON
+            delete ud.isDeclared; // Runtime flag
+            delete ud.originalUuid; // Runtime tracking
+            return ud;
+          }()), {}, {
             worldBoundingBox: {
               min: boundingBox.min.toArray(),
               max: boundingBox.max.toArray()
             }
-          }),
-          children: []
+          })
         };
 
-        // Process children (connectors, etc.) if they exist
-        if (componentModel.children && componentModel.children.length > 0) {
-          componentModel.children.forEach(function (child) {
-            var _child$userData0, _child$userData1;
-            var childType = ((_child$userData0 = child.userData) === null || _child$userData0 === void 0 ? void 0 : _child$userData0.objectType) || ((_child$userData1 = child.userData) === null || _child$userData1 === void 0 ? void 0 : _child$userData1.objectType);
-            if (childType === 'connector') {
-              var _child$geometry;
-              var childBoundingBox = new THREE.Box3().setFromObject(child);
-              var childSceneData = {
-                uuid: child.uuid,
-                name: child.name,
-                type: child.type,
-                position: {
-                  x: child.position.x,
-                  y: child.position.y,
-                  z: child.position.z
-                },
-                rotation: {
-                  x: THREE.MathUtils.radToDeg(child.rotation.x),
-                  y: THREE.MathUtils.radToDeg(child.rotation.y),
-                  z: THREE.MathUtils.radToDeg(child.rotation.z)
-                },
-                scale: {
-                  x: child.scale.x,
-                  y: child.scale.y,
-                  z: child.scale.z
-                },
-                userData: _objectSpread2(_objectSpread2({}, child.userData), {}, {
-                  worldBoundingBox: {
-                    min: childBoundingBox.min.toArray(),
-                    max: childBoundingBox.max.toArray()
-                  }
-                }),
-                geometry: ((_child$geometry = child.geometry) === null || _child$geometry === void 0 ? void 0 : _child$geometry.uuid) || 'CONNECTOR-GEO'
-              };
-              componentSceneData.children.push(childSceneData);
-            }
-          });
-        }
-
         // Add the component to the scene data
         if (!currentSceneData.scene.children) {
           currentSceneData.scene.children = [];
@@ -1366,7 +1331,6 @@ var SceneOperationsManager = /*#__PURE__*/function () {
         console.log('✅ addComponentToSceneData: Component added to scene data successfully', {
           componentId: componentModel.uuid,
           libraryId: (_componentModel$userD = componentModel.userData) === null || _componentModel$userD === void 0 ? void 0 : _componentModel$userD.libraryId,
-          childrenCount: componentSceneData.children.length,
           totalSceneChildren: currentSceneData.scene.children.length
         });
         return true;
@@ -1407,8 +1371,8 @@ var SceneOperationsManager = /*#__PURE__*/function () {
       if (segment.children && segment.children.length > 0) {
         var childrenToRemove = _toConsumableArray(segment.children);
         childrenToRemove.forEach(function (child) {
-          var _child$userData10;
-          if ((_child$userData10 = child.userData) !== null && _child$userData10 !== void 0 && _child$userData10.isPipeElbow) {
+          var _child$userData0;
+          if ((_child$userData0 = child.userData) !== null && _child$userData0 !== void 0 && _child$userData0.isPipeElbow) {
             console.log("\uD83D\uDDD1\uFE0F Removing elbow child from segment before manualization: ".concat(child.uuid));
             segment.remove(child);
             if (child.geometry) child.geometry.dispose();

package/dist/esm/src/utils/animationTransformUtils.js

@@ -32,7 +32,14 @@ function modelOffsetToWorldDelta(modelRoot, offset, customQuat) {
 function applyModelRootTranslation(mesh, modelRoot, origLocalPos, modelOffset, customQuat) {
   if (!mesh || !modelRoot || !origLocalPos) return;
   mesh.position.copy(origLocalPos);
-  mesh.updateMatrixWorld(true);
+
+  // Ensure all ancestors are updated so getWorldPosition is accurate
+  // even if a parent component was recently moved.
+  if (typeof mesh.updateWorldMatrix === 'function') {
+    mesh.updateWorldMatrix(true, false);
+  } else {
+    mesh.updateMatrixWorld(true);
+  }
   var origWorldPos = new THREE.Vector3();
   mesh.getWorldPosition(origWorldPos);
   var newWorldPos = origWorldPos.add(modelOffsetToWorldDelta(modelRoot, modelOffset, customQuat));

package/dist/esm/src/utils/demoSceneUtils.js

@@ -1,19 +1,7 @@
-import { typeof as _typeof, objectWithoutProperties as _objectWithoutProperties, objectSpread2 as _objectSpread2 } from '../../_virtual/_rollupPluginBabelHelpers.js';
-
-var _excluded = ["componentDefinitions"];
 /**
- * Helpers for portable demo scene JSON (embedded component definitions).
+ * Helpers for portable demo scene JSON.
  */
 
-function cloneDefinition(def) {
-  if (!def || _typeof(def) !== 'object') return null;
-  try {
-    return JSON.parse(JSON.stringify(def));
-  } catch (_unused) {
-    return _objectSpread2({}, def);
-  }
-}
-
 /**
  * Collect unique library IDs referenced by scene nodes.
  * @param {Object} sceneData
@@ -35,43 +23,6 @@ function collectSceneLibraryIds(sceneData) {
   return Array.from(ids);
 }
 
-/**
- * Embed component/device definitions required by a scene into the JSON payload.
- * @param {Object} sceneData
- * @param {Record<string, Object>} componentDictionary
- * @returns {Object}
- */
-function embedComponentDefinitions(sceneData) {
-  var componentDictionary = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  if (!sceneData || _typeof(sceneData) !== 'object') return sceneData;
-  var libraryIds = collectSceneLibraryIds(sceneData);
-  var componentDefinitions = {};
-  var deviceIds = new Set();
-  libraryIds.forEach(function (libraryId) {
-    var def = componentDictionary[libraryId];
-    if (!def) return;
-    componentDefinitions[libraryId] = cloneDefinition(def);
-    var attachedDevices = def.attachedDevices;
-    if (!attachedDevices || _typeof(attachedDevices) !== 'object') return;
-    Object.values(attachedDevices).forEach(function (att) {
-      if (att !== null && att !== void 0 && att.deviceId) deviceIds.add(att.deviceId);
-    });
-  });
-  deviceIds.forEach(function (deviceId) {
-    if (componentDefinitions[deviceId]) return;
-    var deviceDef = componentDictionary[deviceId];
-    if (deviceDef) componentDefinitions[deviceId] = cloneDefinition(deviceDef);
-  });
-  if (!Object.keys(componentDefinitions).length) {
-    sceneData.componentDefinitions;
-      var rest = _objectWithoutProperties(sceneData, _excluded);
-    return rest;
-  }
-  return _objectSpread2(_objectSpread2({}, sceneData), {}, {
-    componentDefinitions: componentDefinitions
-  });
-}
-
 /**
  * Resolve the live component dictionary from a CentralPlant instance.
  * @param {Object} centralPlant
@@ -82,4 +33,4 @@ function getComponentDictionary(centralPlant) {
   return (centralPlant === null || centralPlant === void 0 || (_centralPlant$getUtil = centralPlant.getUtility) === null || _centralPlant$getUtil === void 0 || (_centralPlant$getUtil = _centralPlant$getUtil.call(centralPlant, 'modelPreloader')) === null || _centralPlant$getUtil === void 0 ? void 0 : _centralPlant$getUtil.componentDictionary) || (centralPlant === null || centralPlant === void 0 || (_centralPlant$manager = centralPlant.managers) === null || _centralPlant$manager === void 0 || (_centralPlant$manager = _centralPlant$manager.componentDataManager) === null || _centralPlant$manager === void 0 ? void 0 : _centralPlant$manager.componentDictionary) || {};
 }
 
-export { collectSceneLibraryIds, embedComponentDefinitions, getComponentDictionary };
+export { collectSceneLibraryIds, getComponentDictionary };

package/package.json

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