Merge pull request #430 from arntanguy/topic/FixScaleV

[GUI] Fix display of Visual's scaleV
jrl-umi3218 · Feb 2, 2024 · 15f2b8f · 15f2b8f
2 parents 585c5db + 81bffd6
commit 15f2b8f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/include/mc_rtc/visual_utils.h b/include/mc_rtc/visual_utils.h
@@ -103,14 +103,20 @@ inline rbd::parsers::Visual makeVisualBox(const Eigen::Vector3d & dim, const mc_
 inline constexpr auto getVisualBox = details::getVisualGeometry<rbd::parsers::Geometry::Type::BOX>;
 
 /** Returns a new Visual that holds a Mesh object */
-inline rbd::parsers::Visual makeVisualMesh(const std::string & path, double scale)
+inline rbd::parsers::Visual makeVisualMesh(const std::string & path, Eigen::Vector3d scaleV)
 {
   rbd::parsers::Geometry::Mesh m;
   m.filename = path;
-  m.scale = scale;
+  m.scaleV = scaleV;
   return details::makeVisual(m, {});
 }
 
+/** Returns a new Visual that holds a Mesh object */
+inline rbd::parsers::Visual makeVisualMesh(const std::string & path, double scale)
+{
+  return makeVisualMesh(path, Eigen::Vector3d(scale, scale, scale));
+}
+
 /** Get the mesh data if the visual is a mesh, throws otherwise */
 inline constexpr auto getVisualMesh = details::getVisualGeometry<rbd::parsers::Geometry::Type::MESH>;
 

diff --git a/src/mc_rbdyn/configuration_io.cpp b/src/mc_rbdyn/configuration_io.cpp
@@ -685,15 +685,15 @@ rbd::parsers::Geometry::Mesh ConfigurationLoader<rbd::parsers::Geometry::Mesh>::
 {
   rbd::parsers::Geometry::Mesh m;
   m.filename = static_cast<std::string>(config("filename"));
-  m.scale = config("scale");
+  m.scaleV = config("scaleV");
   return m;
 }
 
 mc_rtc::Configuration ConfigurationLoader<rbd::parsers::Geometry::Mesh>::save(const rbd::parsers::Geometry::Mesh & m)
 {
   mc_rtc::Configuration config;
   config.add("filename", m.filename);
-  config.add("scale", m.scale);
+  config.add("scaleV", m.scaleV);
   return config;
 }
 

diff --git a/tests/testJsonIO.cpp b/tests/testJsonIO.cpp
@@ -274,7 +274,7 @@ bool operator==(const Geometry::Sphere & lhs, const Geometry::Sphere & rhs)
 
 bool operator==(const Geometry::Mesh & lhs, const Geometry::Mesh & rhs)
 {
-  return lhs.filename == rhs.filename && lhs.scale == rhs.scale;
+  return lhs.filename == rhs.filename && lhs.scaleV == rhs.scaleV;
 }
 
 bool operator==(const Geometry::Superellipsoid & lhs, const Geometry::Superellipsoid & rhs)