Register MeshInertialCalculator when loading sim from an SDF string (#…

…2754) Signed-off-by: Ian Chen <ichen@openrobotics.org>
gazebosim · Feb 4, 2025 · 78954a5 · 78954a5
1 parent 55f471f
commit 78954a5
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 30 deletions.
diff --git a/src/ServerPrivate.cc b/src/ServerPrivate.cc
@@ -584,6 +584,13 @@ sdf::Errors ServerPrivate::LoadSdfRootHelper(const ServerConfig &_config)
 {
   sdf::Errors errors;
 
+  sdf::ParserConfig sdfParserConfig = sdf::ParserConfig::GlobalConfig();
+  sdfParserConfig.SetStoreResolvedURIs(true);
+  sdfParserConfig.SetCalculateInertialConfiguration(
+    sdf::ConfigureResolveAutoInertials::SKIP_CALCULATION_IN_LOAD);
+  MeshInertiaCalculator meshInertiaCalculator;
+  sdfParserConfig.RegisterCustomInertiaCalc(meshInertiaCalculator);
+
   switch (_config.Source())
   {
     // Load a world if specified. Check SDF string first, then SDF file
@@ -606,10 +613,6 @@ sdf::Errors ServerPrivate::LoadSdfRootHelper(const ServerConfig &_config)
         msg += "File path [" + _config.SdfFile() + "].\n";
       }
       gzmsg << msg;
-      sdf::ParserConfig sdfParserConfig = sdf::ParserConfig::GlobalConfig();
-      sdfParserConfig.SetStoreResolvedURIs(true);
-      sdfParserConfig.SetCalculateInertialConfiguration(
-        sdf::ConfigureResolveAutoInertials::SKIP_CALCULATION_IN_LOAD);
       errors = this->sdfRoot.LoadSdfString(
         _config.SdfString(), sdfParserConfig);
       this->sdfRoot.ResolveAutoInertials(errors, sdfParserConfig);
@@ -633,13 +636,6 @@ sdf::Errors ServerPrivate::LoadSdfRootHelper(const ServerConfig &_config)
       gzmsg << "Loading SDF world file[" << filePath << "].\n";
 
       sdf::Root sdfRootLocal;
-      sdf::ParserConfig sdfParserConfig = sdf::ParserConfig::GlobalConfig();
-      sdfParserConfig.SetStoreResolvedURIs(true);
-      sdfParserConfig.SetCalculateInertialConfiguration(
-        sdf::ConfigureResolveAutoInertials::SKIP_CALCULATION_IN_LOAD);
-
-      MeshInertiaCalculator meshInertiaCalculator;
-      sdfParserConfig.RegisterCustomInertiaCalc(meshInertiaCalculator);
       // \todo(nkoenig) Async resource download.
       // This call can block for a long period of time while
       // resources are downloaded. Blocking here causes the GUI to block with

diff --git a/test/integration/mesh_inertia_calculation.cc b/test/integration/mesh_inertia_calculation.cc
@@ -50,20 +50,39 @@ class MeshInertiaCalculationTest : public InternalFixture<::testing::Test>
 {
 };
 
-TEST(MeshInertiaCalculationTest, CylinderColladaMeshInertiaCalculation)
+/// \brief Load an SDF world and run mesh inertia tests. Two tests are run
+/// one after another: 1) the server is launched with path to SDF file, and
+/// 2) ther server is launched from an sdf string.
+/// \param[in] _path Path to SDF
+/// \param[in] _testFunc Test function that checks mesh inertia values
+void loadSdfAndTest(const std::string &_path,
+    std::function<void(const gz::sim::ServerConfig &)> _testFunc)
 {
-  size_t kIter = 100u;
-
-  // Start server and run.
+  // Test mesh inertial calculator with sdf loaded from file
   gz::sim::ServerConfig serverConfig;
-  serverConfig.SetSdfFile(common::joinPaths(
-      PROJECT_SOURCE_PATH, "test", "worlds", "mesh_inertia_calculation.sdf"));
-
+  serverConfig.SetSdfFile(_path);
   common::setenv(
       "GZ_SIM_RESOURCE_PATH",
       common::joinPaths(PROJECT_SOURCE_PATH, "test", "worlds", "models"));
+  _testFunc(serverConfig);
+
+
+  // Test mesh inertial calculator with sdf loaded from string
+  std::ifstream sdfFile(_path);
+  std::stringstream buffer;
+  buffer << sdfFile.rdbuf();
+  gz::sim::ServerConfig serverConfigSdfStr;
+  serverConfigSdfStr.SetSdfString(buffer.str());
+  _testFunc(serverConfigSdfStr);
+}
 
-  gz::sim::Server server(serverConfig);
+void cylinderColladaMeshInertiaCalculation(
+    const gz::sim::ServerConfig &_serverConfig)
+{
+  size_t kIter = 100u;
+
+  // Start server and run.
+  gz::sim::Server server(_serverConfig);
 
   // Create a system just to get the ECM
   EntityComponentManager *ecm;
@@ -126,21 +145,20 @@ TEST(MeshInertiaCalculationTest, CylinderColladaMeshInertiaCalculation)
   EXPECT_EQ(link.WorldInertialPose(*ecm).value(), gz::math::Pose3d::Zero);
 }
 
-TEST(MeshInertiaCalculationTest,
-  CylinderColladaMeshWithNonCenterOriginInertiaCalculation)
+TEST(MeshInertiaCalculationTest, CylinderColladaMeshInertiaCalculation)
+{
+  std::string sdfFilePath = common::joinPaths(
+      PROJECT_SOURCE_PATH, "test", "worlds", "mesh_inertia_calculation.sdf");
+  loadSdfAndTest(sdfFilePath, cylinderColladaMeshInertiaCalculation);
+}
+
+void cylinderColladaMeshWithNonCenterOriginInertiaCalculation(
+    const gz::sim::ServerConfig &_serverConfig)
 {
   size_t kIter = 100u;
 
   // Start server and run.
-  gz::sim::ServerConfig serverConfig;
-  serverConfig.SetSdfFile(common::joinPaths(
-      PROJECT_SOURCE_PATH, "test", "worlds", "mesh_inertia_calculation.sdf"));
-
-  common::setenv(
-      "GZ_SIM_RESOURCE_PATH",
-      common::joinPaths(PROJECT_SOURCE_PATH, "test", "worlds", "models"));
-
-  gz::sim::Server server(serverConfig);
+  gz::sim::Server server(_serverConfig);
 
   // Create a system just to get the ECM
   EntityComponentManager *ecm;
@@ -206,4 +224,14 @@ TEST(MeshInertiaCalculationTest,
   // the center of mass (inertial pose) will be 1m above the ground
   EXPECT_EQ(link.WorldInertialPose(*ecm).value(),
     gz::math::Pose3d(0, 0, 1, 0, 0, 0));
+
+}
+
+TEST(MeshInertiaCalculationTest,
+  CylinderColladaMeshWithNonCenterOriginInertiaCalculation)
+{
+  std::string sdfFilePath = common::joinPaths(
+      PROJECT_SOURCE_PATH, "test", "worlds", "mesh_inertia_calculation.sdf");
+
+  loadSdfAndTest(sdfFilePath, cylinderColladaMeshInertiaCalculation);
 }