use CLI args for TestUSDSceneHierarchy

Author: Medyan-Naser

application/testing/tests.usd.cmake

@@ -21,7 +21,7 @@ f3d_test(NAME TestUSDZMaterials DATA McUsd.usdz PLUGIN usd ARGS --camera-positio
 f3d_test(NAME TestUSDZMaterialsInterationReload DATA McUsd.usdz PLUGIN usd INTERACTION NO_BASELINE) # Up
 
 # Scene hierarchy test for USD importer
-f3d_test(NAME TestUSDSceneHierarchy DATA primitives.usda PLUGIN usd INTERACTION UI) # Shift+H
+f3d_test(NAME TestUSDSceneHierarchy DATA primitives.usda ARGS --scene-hierarchy PLUGIN usd UI)
 
 if(NOT F3D_MACOS_BUNDLE)
   file(COPY "${F3D_SOURCE_DIR}/plugins/usd/configs/config.d/" DESTINATION "${CMAKE_BINARY_DIR}/share/f3d/configs/config_build.d")

plugins/usd/module/vtkF3DUSDImporter.cxx

@@ -178,19 +178,7 @@ class vtkF3DUSDImporter::vtkInternals
     }
 
     // Create a valid node name (vtkDataAssembly requires valid XML names)
-    std::string nodeName = name;
-    if (nodeName.empty() || std::isdigit(static_cast<unsigned char>(nodeName[0])))
-    {
-      nodeName = "node_" + nodeName;
-    }
-    // Replace invalid characters
-    for (char& c : nodeName)
-    {
-      if (!std::isalnum(static_cast<unsigned char>(c)) && c != '_')
-      {
-        c = '_';
-      }
-    }
+    std::string nodeName = vtkDataAssembly::MakeValidNodeName(name.c_str());
 
     int nodeId = hierarchy->AddNode(nodeName.c_str(), parentNodeId);
     hierarchy->SetAttribute(nodeId, "label", name.c_str());