@archvisioninc/canvas 2.4.5 → 2.4.6

package/dist/helpers/initHelpers.js

@@ -332,11 +332,12 @@ const initMetadataKeyDefaults = () => {
 };
 const checkForRootNode = () => {
   let rootNode = scene.getNodeById('__root__');
-  let node0 = scene.getNodeById(node0Name);
+  let node0 = rootNode?.getChildren()?.find?.((child, index) => child.name === node0Name && index === 0);
   const isTransformNode = item => item?.getClassName() === 'TransformNode';
   const userMeshes = getUserMeshes();
   const userNodes = getUserNodes();
   const topLevelUserNodes = userNodes.filter(node => node.parent === null);
+  const otherNode0Nodes = userNodes?.filter(node => node.name === node0Name && node.parent !== rootNode);
   if (!rootNode) {
     rootNode = new BABYLON.Mesh('__root__', scene);
     rootNode.isPickable = false;
@@ -345,7 +346,7 @@ const checkForRootNode = () => {
     rootNode.isPointerBlocker = true;
     rootNode.isHitTestVisible = false;
   }
-  if (!isTransformNode(node0) || !node0) {
+  if (!node0 || !isTransformNode(node0)) {
     node0 = new BABYLON.TransformNode(node0Name, scene);
     node0.isPickable = false;
     node0.isVisible = false;
@@ -355,6 +356,11 @@ const checkForRootNode = () => {
     node0.parent = rootNode;
   }
 
+  // NOTE: This renames all other node0's to avoid conflict with the main node0 for transformations etc.
+  if (!_.isEmpty(otherNode0Nodes)) {
+    otherNode0Nodes?.forEach((node, index) => node.name = `node0_(${index})`);
+  }
+
   // NOTE: This handles correcting any third-party files that have __root__ and children
   // but not node0, and makes sure everything is a child of the newly created node0.
   rootNode.getChildren().forEach(child => {
@@ -362,16 +368,17 @@ const checkForRootNode = () => {
     const isNode0 = child.name === node0Name && transformNode;
     const parentedToNode0 = child.parent.name === node0Name && transformNode;
     const hasNode0AsChild = child.getChildren().find(node => node.name === node0Name);
-    if (!isNode0 && !parentedToNode0 && !hasNode0AsChild) child.setParent(node0);
+    if (!isNode0 && !parentedToNode0 && !hasNode0AsChild) {
+      child.setParent(node0);
+    }
   });
 
   // NOTE: This handles correcting any parentless user meshes from a third-party file and makes
-  // sure they are parented to node0.
+  // sure they are named with the prefix "mesh" and parented to node0.
   userMeshes.forEach(mesh => {
     if (mesh.name === node0Name && !isTransformNode(mesh)) mesh.name = 'mesh0';
     if (mesh.parent === null) mesh.setParent(node0);
   });
-  if (node0.parent !== rootNode) node0.setParent(rootNode);
 
   // NOTE: This handles correcting any parentless user nodes from a third-party file and makes
   // sure they are parented to node0.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@archvisioninc/canvas",
-  "version": "2.4.5",
+  "version": "2.4.6",
   "private": false,
   "main": "dist/Canvas.js",
   "module": "dist/Canvas.js",

package/src/package/helpers/initHelpers.js

@@ -371,11 +371,12 @@ const initMetadataKeyDefaults = () => {
 
 const checkForRootNode = () => {
   let rootNode = scene.getNodeById('__root__');
-  let node0 = scene.getNodeById(node0Name);
+  let node0 = rootNode?.getChildren()?.find?.((child, index) => child.name === node0Name && index === 0);
   const isTransformNode = item => item?.getClassName() === 'TransformNode';
   const userMeshes = getUserMeshes();
   const userNodes = getUserNodes();
   const topLevelUserNodes = userNodes.filter(node => node.parent === null);
+  const otherNode0Nodes = userNodes?.filter(node => node.name === node0Name && node.parent !== rootNode);
 
   if (!rootNode) {
     rootNode = new BABYLON.Mesh('__root__', scene);
@@ -386,7 +387,7 @@ const checkForRootNode = () => {
     rootNode.isHitTestVisible = false;
   }
 
-  if (!isTransformNode(node0) || !node0) {
+  if (!node0 || !isTransformNode(node0)) {
     node0 = new BABYLON.TransformNode(node0Name, scene);
     node0.isPickable = false;
     node0.isVisible = false;
@@ -396,6 +397,11 @@ const checkForRootNode = () => {
     node0.parent = rootNode;
   }
 
+  // NOTE: This renames all other node0's to avoid conflict with the main node0 for transformations etc.
+  if (!_.isEmpty(otherNode0Nodes)) {
+    otherNode0Nodes?.forEach((node, index) => node.name = `node0_(${index})`);
+  }
+
   // NOTE: This handles correcting any third-party files that have __root__ and children
   // but not node0, and makes sure everything is a child of the newly created node0.
   rootNode.getChildren().forEach(child => {
@@ -404,18 +410,18 @@ const checkForRootNode = () => {
     const parentedToNode0 = child.parent.name === node0Name && transformNode;
     const hasNode0AsChild = child.getChildren().find(node => node.name === node0Name);
 
-    if (!isNode0 && !parentedToNode0 && !hasNode0AsChild) child.setParent(node0);
+    if (!isNode0 && !parentedToNode0 && !hasNode0AsChild) {
+      child.setParent(node0);
+    }
   });
 
   // NOTE: This handles correcting any parentless user meshes from a third-party file and makes
-  // sure they are parented to node0.
+  // sure they are named with the prefix "mesh" and parented to node0.
   userMeshes.forEach(mesh => {
     if (mesh.name === node0Name && !isTransformNode(mesh)) mesh.name = 'mesh0';
     if (mesh.parent === null) mesh.setParent(node0);
   });
 
-  if (node0.parent !== rootNode) node0.setParent(rootNode);
-
   // NOTE: This handles correcting any parentless user nodes from a third-party file and makes
   // sure they are parented to node0.
   topLevelUserNodes?.forEach(node => node.setParent(node0));