@2112-lab/central-plant 0.3.47 → 0.3.48

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

@@ -1,5 +1,6 @@
 import { createClass as _createClass, objectSpread2 as _objectSpread2, toConsumableArray as _toConsumableArray, typeof as _typeof, classCallCheck as _classCallCheck, asyncToGenerator as _asyncToGenerator, regenerator as _regenerator, createForOfIteratorHelper as _createForOfIteratorHelper } from '../../../_virtual/_rollupPluginBabelHelpers.js';
 import * as THREE from 'three';
+import { getHardcodedUuid } from '../../utils/nameUtils.js';
 import { attachIODevicesToComponent } from '../../utils/ioDeviceUtils.js';
 import { registerBehaviorsForComponent } from '../../utils/behaviorRegistration.js';
 import modelPreloader from '../../rendering/modelPreloader.js';
@@ -138,36 +139,58 @@ var ModelManager = /*#__PURE__*/function () {
      * @param {THREE.Object3D} targetMesh - The mesh whose connectors to preserve
      * @param {string} parentUuid - The UUID of the parent component
      */
+    /**
+     * Identifies all connector objects within a model hierarchy and prepares them
+     * to be preserved when the model is replaced or modified.
+     * Uses traverse() to find connectors at any depth in the hierarchy.
+     * @param {THREE.Object3D} targetMesh - The root of the model to search
+     * @param {string} parentUuid - The UUID of the parent component
+     * @returns {Array<THREE.Object3D>} Array of cloned and prepared connector objects
+     */
   }, {
     key: "_preserveConnectorChildren",
     value: function _preserveConnectorChildren(targetMesh, parentUuid) {
       var _this = this;
       var connectorChildren = [];
-      targetMesh.children.forEach(function (child, index) {
+      var connectorIndex = 0;
+
+      // Use traverse to find connectors at ANY depth in the hierarchy
+      targetMesh.traverse(function (child) {
         var _child$userData;
         var isConnectorGeometry = child.geometry && (child.geometry.uuid === 'CONNECTOR-GEO' || child.geometry.type === 'SphereGeometry' && child.geometry.parameters);
         var isConnectorByName = child.name && child.name.toLowerCase().includes('connector');
-        // Also recognise connectors declared via userData (e.g. inline connectors from SAMPLE_1.json
-        // whose geometry may be a fallback BufferGeometry rather than a SphereGeometry).
         var isConnectorByUserData = ((_child$userData = child.userData) === null || _child$userData === void 0 ? void 0 : _child$userData.objectType) === 'connector';
         if (isConnectorGeometry && isConnectorByName || isConnectorByUserData) {
+          connectorIndex++;
+
           // Ensure userData exists and has worldBoundingBox
           if (!child.userData) child.userData = {};
           if (!child.userData.worldBoundingBox) {
             child.userData.worldBoundingBox = _this._calculateWorldBoundingBox(child);
           }
 
-          // Clone and preserve critical userData
+          // Clone the connector
           var clonedConnector = child.clone();
 
-          // Generate proper connector UUID based on parent component UUID
-          // Format: COMPONENT-UUID-CONNECTOR-INDEX (matching JSON import pattern)
-          var connectorUuid = "".concat(parentUuid, "-CONNECTOR-").concat(index + 1);
+          // CRITICAL: Convert nested world position to root-relative position
+          // This ensures the connector stays in the same place when re-added as a direct child of targetMesh
+          var targetInverse = targetMesh.matrixWorld.clone().invert();
+          var worldPos = new THREE.Vector3();
+          child.getWorldPosition(worldPos);
+          clonedConnector.position.copy(worldPos.applyMatrix4(targetInverse));
+
+          // Get hardcoded UUID if it exists (e.g. from JSON mesh placeholder)
+          // This ensures compatibility with existing scene JSON naming conventions
+          var existingUuid = getHardcodedUuid(child);
+
+          // Generate fallback UUID only if existing one isn't already parent-prefixed
+          // Format: COMPONENT-UUID-CONNECTOR-INDEX (stable fallback)
+          var connectorUuid = existingUuid && existingUuid.includes(parentUuid) ? existingUuid : "".concat(parentUuid, "-CONNECTOR-").concat(connectorIndex);
           clonedConnector.uuid = connectorUuid;
           if (child.userData) {
             clonedConnector.userData = _objectSpread2({}, child.userData);
 
-            // Deep copy critical data - handle both array [x,y,z] and object {x,y,z} formats
+            // Deep copy critical data
             if (child.userData.worldBoundingBox) {
               var wbb = child.userData.worldBoundingBox;
               clonedConnector.userData.worldBoundingBox = {
@@ -176,7 +199,6 @@ var ModelManager = /*#__PURE__*/function () {
               };
             }
             if (child.userData.direction) {
-              // Handle both array [x,y,z] and object {x,y,z} formats
               if (Array.isArray(child.userData.direction)) {
                 clonedConnector.userData.direction = _toConsumableArray(child.userData.direction);
               } else if (_typeof(child.userData.direction) === 'object') {
@@ -188,11 +210,12 @@ var ModelManager = /*#__PURE__*/function () {
 
             // Set originalUuid to match the actual uuid (maintains consistency)
             clonedConnector.userData.originalUuid = connectorUuid;
-            clonedConnector.userData.objectType = child.userData.objectType || (child.name.toLowerCase().includes('connector') ? 'connector' : 'gateway');
+            clonedConnector.userData.objectType = child.userData.objectType || 'connector';
           }
           connectorChildren.push(clonedConnector);
         }
       });
+      console.log("\uD83D\uDEE1\uFE0F Preserved ".concat(connectorChildren.length, " connector(s) for component ").concat(parentUuid));
       return connectorChildren;
     }
 

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

@@ -1,5 +1,5 @@
 import { createClass as _createClass, classCallCheck as _classCallCheck, toConsumableArray as _toConsumableArray, objectSpread2 as _objectSpread2, asyncToGenerator as _asyncToGenerator, regenerator as _regenerator } from '../../../_virtual/_rollupPluginBabelHelpers.js';
-import 'three';
+import * as THREE from 'three';
 import { GLTFExporter } from '../../../node_modules/three/examples/jsm/exporters/GLTFExporter.js';
 import { getHardcodedUuid } from '../../utils/nameUtils.js';
 
@@ -81,6 +81,11 @@ var SceneExportManager = /*#__PURE__*/function () {
       // Helper function to convert Three.js object to minimal JSON format
       var convertObjectToJson = function convertObjectToJson(threeObject) {
         var _threeObject$name, _threeObject$userData, _threeObject$userData2, _threeObject$userData3, _threeObject$userData4, _threeObject$userData5, _threeObject$userData6, _threeObject$userData7, _threeObject$userData8, _threeObject$userData9, _threeObject$userData0, _threeObject$userData1, _threeObject$userData10;
+        // Ensure world matrices are updated for this subtree before exporting
+        if (threeObject.updateMatrixWorld) {
+          threeObject.updateMatrixWorld(true);
+        }
+
         // Skip certain objects that shouldn't be exported
         if (!threeObject || (_threeObject$name = threeObject.name) !== null && _threeObject$name !== void 0 && _threeObject$name.includes('Polyline') ||
         // Skip pipe paths
@@ -238,19 +243,23 @@ var SceneExportManager = /*#__PURE__*/function () {
               }
             });
           } else if (((_threeObject$userData11 = threeObject.userData) === null || _threeObject$userData11 === void 0 ? void 0 : _threeObject$userData11.objectType) === 'component') {
-            // For components, only export connectors that have objectType='connector'
-            // Standard dictionary-injected connectors should be exported so connections work on re-import
-            threeObject.children.forEach(function (child) {
+            // For components, export all connectors (including deep children within GLFs)
+            threeObject.traverse(function (child) {
               var _child$userData2;
               if (((_child$userData2 = child.userData) === null || _child$userData2 === void 0 ? void 0 : _child$userData2.objectType) === 'connector') {
+                // Calculate position relative to component root
+                var componentMatrixWorldInverse = threeObject.matrixWorld.clone().invert();
+                var childWorldPos = new THREE.Vector3();
+                child.getWorldPosition(childWorldPos);
+                var relativePos = childWorldPos.applyMatrix4(componentMatrixWorldInverse);
                 exportableChildren.push({
                   uuid: child.uuid,
                   name: child.name,
                   type: 'Mesh',
                   position: {
-                    x: roundIfClose(child.position.x),
-                    y: roundIfClose(child.position.y),
-                    z: roundIfClose(child.position.z)
+                    x: roundIfClose(relativePos.x),
+                    y: roundIfClose(relativePos.y),
+                    z: roundIfClose(relativePos.z)
                   },
                   userData: _objectSpread2({}, child.userData)
                 });

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

@@ -1324,24 +1324,29 @@ var SceneOperationsManager = /*#__PURE__*/function () {
           children: [] // Initialize children array
         };
 
-        // Collect children that are connectors
-        if (componentModel.children) {
-          componentModel.children.forEach(function (child) {
-            if (child.userData && child.userData.objectType === 'connector') {
-              componentSceneData.children.push({
-                uuid: child.uuid,
-                name: child.name,
-                type: 'Mesh',
-                position: {
-                  x: child.position.x,
-                  y: child.position.y,
-                  z: child.position.z
-                },
-                userData: _objectSpread2({}, child.userData)
-              });
-            }
-          });
-        }
+        // Collect children that are connectors (using traverse to find deep children in models)
+        componentModel.traverse(function (child) {
+          if (child.userData && child.userData.objectType === 'connector') {
+            // Calculate position relative to component root
+            // This ensures that when we re-add it as a direct child of the component,
+            // it maintains the same world position relative to the component.
+            var componentMatrixWorldInverse = componentModel.matrixWorld.clone().invert();
+            var childWorldPos = new THREE.Vector3();
+            child.getWorldPosition(childWorldPos);
+            var relativePos = childWorldPos.applyMatrix4(componentMatrixWorldInverse);
+            componentSceneData.children.push({
+              uuid: child.uuid,
+              name: child.name,
+              type: 'Mesh',
+              position: {
+                x: relativePos.x,
+                y: relativePos.y,
+                z: relativePos.z
+              },
+              userData: _objectSpread2({}, child.userData)
+            });
+          }
+        });
 
         // Add the component to the scene data
         if (!currentSceneData.scene.children) {

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

@@ -155,41 +155,36 @@ function computeFilteredBoundingBox(object) {
  */
 function computeIODeviceBoundingBoxes(componentObject) {
   var results = [];
-  var _iterator = _createForOfIteratorHelper(componentObject.children),
-    _step;
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var _child$userData;
-      var child = _step.value;
-      if (((_child$userData = child.userData) === null || _child$userData === void 0 ? void 0 : _child$userData.objectType) !== 'io-device') continue;
-      var bbox = new THREE.Box3().setFromObject(child);
-      if (!bbox.isEmpty()) {
-        results.push({
-          uuid: child.uuid,
-          userData: {
-            objectType: 'io-device',
-            deviceId: child.userData.deviceId || null,
-            attachmentId: child.userData.attachmentId || null,
-            parentComponentId: child.userData.parentComponentId || componentObject.uuid
-          },
-          worldBoundingBox: {
-            min: [bbox.min.x, bbox.min.y, bbox.min.z],
-            max: [bbox.max.x, bbox.max.y, bbox.max.z]
-          }
-        });
-      }
+  componentObject.traverse(function (child) {
+    var _child$userData;
+    if (((_child$userData = child.userData) === null || _child$userData === void 0 ? void 0 : _child$userData.objectType) !== 'io-device') return;
+    var bbox = new THREE.Box3().setFromObject(child);
+    var worldPos = new THREE.Vector3();
+    child.getWorldPosition(worldPos);
+    if (!bbox.isEmpty()) {
+      results.push({
+        uuid: child.uuid,
+        userData: {
+          objectType: 'io-device',
+          deviceId: child.userData.deviceId || null,
+          attachmentId: child.userData.attachmentId || null,
+          parentComponentId: child.userData.parentComponentId || componentObject.uuid,
+          // Sync position for pathfinder
+          position: [worldPos.x, worldPos.y, worldPos.z]
+        },
+        worldBoundingBox: {
+          min: [bbox.min.x, bbox.min.y, bbox.min.z],
+          max: [bbox.max.x, bbox.max.y, bbox.max.z]
+        }
+      });
     }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
-  }
+  });
   return results;
 }
 
 /**
  * Computes individual world-space bounding boxes for each connector child
- * of a component.
+ * of a component. Supports deep children (e.g. within GLB model hierarchy).
  * 
  * @param {THREE.Object3D} componentObject - The component's Three.js object
  * @returns {Array<{uuid: string, userData: Object, worldBoundingBox: {min: number[], max: number[]}}>}
@@ -197,38 +192,40 @@ function computeIODeviceBoundingBoxes(componentObject) {
  */
 function computeConnectorBoundingBoxes(componentObject) {
   var results = [];
-  var _iterator2 = _createForOfIteratorHelper(componentObject.children),
-    _step2;
-  try {
-    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-      var _child$userData2;
-      var child = _step2.value;
-      if (((_child$userData2 = child.userData) === null || _child$userData2 === void 0 ? void 0 : _child$userData2.objectType) !== 'connector') continue;
-      var bbox = new THREE.Box3().setFromObject(child);
+  componentObject.traverse(function (child) {
+    var _child$userData2;
+    if (((_child$userData2 = child.userData) === null || _child$userData2 === void 0 ? void 0 : _child$userData2.objectType) !== 'connector') return;
+    var bbox = new THREE.Box3().setFromObject(child);
+    var worldPos = new THREE.Vector3();
+    child.getWorldPosition(worldPos);
 
-      // Fallback if mesh is too small or empty (sometimes connectors are just points)
-      if (bbox.isEmpty() || bbox.getSize(new THREE.Vector3()).length() < 0.01) {
-        var worldPos = new THREE.Vector3();
-        child.getWorldPosition(worldPos);
-        var size = 0.1;
-        bbox.setFromCenterAndSize(worldPos, new THREE.Vector3(size, size, size));
-      }
-      results.push({
-        uuid: child.uuid,
-        userData: _objectSpread2(_objectSpread2({}, child.userData), {}, {
-          objectType: 'connector'
-        }),
-        worldBoundingBox: {
-          min: [bbox.min.x, bbox.min.y, bbox.min.z],
-          max: [bbox.max.x, bbox.max.y, bbox.max.z]
-        }
-      });
+    // Compute world-space direction vector (Crucial for rotation-aware pathfinding)
+    // Default to [0, 0, 1] if not specified (Standard for our coordinate system)
+    var localDirData = child.userData && Array.isArray(child.userData.direction) ? child.userData.direction : [0, 0, 1];
+    var localDir = new THREE.Vector3(localDirData[0], localDirData[1], localDirData[2]);
+    var worldQuat = new THREE.Quaternion();
+    child.getWorldQuaternion(worldQuat);
+    var worldDir = localDir.clone().applyQuaternion(worldQuat).normalize();
+
+    // Fallback if mesh is too small or empty (sometimes connectors are just points)
+    if (bbox.isEmpty() || bbox.getSize(new THREE.Vector3()).length() < 0.01) {
+      var size = 0.1;
+      bbox.setFromCenterAndSize(worldPos, new THREE.Vector3(size, size, size));
     }
-  } catch (err) {
-    _iterator2.e(err);
-  } finally {
-    _iterator2.f();
-  }
+    results.push({
+      uuid: child.uuid,
+      userData: _objectSpread2(_objectSpread2({}, child.userData), {}, {
+        objectType: 'connector',
+        // Update both position AND direction for pathfinder
+        position: [worldPos.x, worldPos.y, worldPos.z],
+        direction: [worldDir.x, worldDir.y, worldDir.z]
+      }),
+      worldBoundingBox: {
+        min: [bbox.min.x, bbox.min.y, bbox.min.z],
+        max: [bbox.max.x, bbox.max.y, bbox.max.z]
+      }
+    });
+  });
   return results;
 }
 
@@ -328,11 +325,11 @@ function createSelectionBoxHelpers(object) {
  * @param {THREE.Scene} scene - The scene (for finding objects by uuid)
  */
 function updateSelectionBoxHelpers(helpers, selectedObjects, scene) {
-  var _iterator3 = _createForOfIteratorHelper(helpers),
-    _step3;
+  var _iterator = _createForOfIteratorHelper(helpers),
+    _step;
   try {
     var _loop = function _loop() {
-      var helper = _step3.value;
+      var helper = _step.value;
       var _helper$userData = helper.userData,
         sourceObjectUuid = _helper$userData.sourceObjectUuid,
         isFiltered = _helper$userData.isFiltered,
@@ -363,13 +360,13 @@ function updateSelectionBoxHelpers(helpers, selectedObjects, scene) {
         helper.update();
       }
     };
-    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
       if (_loop()) continue;
     }
   } catch (err) {
-    _iterator3.e(err);
+    _iterator.e(err);
   } finally {
-    _iterator3.f();
+    _iterator.f();
   }
 }
 

package/package.json

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