Apply scale, and fix codecheck

Signed-off-by: Nate Koenig <[email protected]>
gazebosim · Jan 28, 2021 · e44a66e · e44a66e
1 parent 7de643d
commit e44a66e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/ServerPrivate.cc b/src/ServerPrivate.cc
@@ -227,15 +227,15 @@ void ServerPrivate::AddRecordPlugin(const ServerConfig &_config)
   bool sdfUseLogRecord = (recordPluginElem != nullptr);
 
   bool hasRecordResources {false};
-  bool hasCompress {false};
   bool hasRecordTopics {false};
 
   bool sdfRecordResources;
-  bool sdfCompress;
   std::vector<std::string> sdfRecordTopics;
 
   if (sdfUseLogRecord)
   {
+    bool hasCompress {false};
+    bool sdfCompress;
     std::tie(sdfRecordResources, hasRecordResources) =
       recordPluginElem->Get<bool>("record_resources", false);
     std::tie(sdfCompress, hasCompress) =

diff --git a/src/systems/collada_world_exporter/ColladaWorldExporter.cc b/src/systems/collada_world_exporter/ColladaWorldExporter.cc
@@ -55,6 +55,9 @@ using namespace systems;
 
 class ignition::gazebo::systems::ColladaWorldExporterPrivate
 {
+  // Default constructor
+  public: ColladaWorldExporterPrivate() = default;
+
   /// \brief Has the world already been exported?.
   private: bool exported{false};
 
@@ -217,6 +220,8 @@ class ignition::gazebo::systems::ColladaWorldExporterPrivate
             i = worldMesh.AddMaterial(mat);
           }
 
+          scale = _geom->Data().MeshShape()->Scale();
+
           addSubmeshFunc(i);
         }
       }

diff --git a/test/integration/diff_drive_system.cc b/test/integration/diff_drive_system.cc
@@ -358,7 +358,8 @@ TEST_P(DiffDriveTest, OdomFrameId)
 
   int sleep = 0;
   int maxSleep = 30;
-  for (; odomPosesCount < 5 && sleep < maxSleep; ++sleep)
+  // cppcheck-suppress knownConditionTrueFalse
+  for (; odomPosesCount < 5 && sleep < maxSleep; ++sleep) // NOLINT
   {
     std::this_thread::sleep_for(std::chrono::milliseconds(100));
   }
@@ -408,6 +409,7 @@ TEST_P(DiffDriveTest, OdomCustomFrameId)
 
   int sleep = 0;
   int maxSleep = 30;
+  // cppcheck-suppress knownConditionTrueFalse
   for (; odomPosesCount < 5 && sleep < maxSleep; ++sleep)
   {
     std::this_thread::sleep_for(std::chrono::milliseconds(100));