Code cleanup (#1217) (#1219)

(cherry picked from commit 7ac8abc)

Signed-off-by: Maksim Derbasov <ntfs.hard@gmail.com>
Co-authored-by: Maksim Derbasov <ntfs.hard@gmail.com>

Author: mergify[bot]

examples/actor_animation/GlutWindow.cc

@@ -250,13 +250,13 @@ void updatePose(double _time)
   for (auto &v : g_visuals)
   {
   //! [update pose]
-    std::map<std::string, gz::math::Matrix4d> animFrames;
-    animFrames = g_skelAnim->PoseAt(_time, true);
+    std::map<std::string, gz::math::Matrix4d> animFrames =
+            g_skelAnim->PoseAt(_time, true);
     std::map<std::string, gz::math::Matrix4d> skinFrames;
-    for (auto pair : animFrames)
+    for (const auto &pair : animFrames)
     {
-      std::string animNodeName = pair.first;
-      auto animTf = pair.second;
+      const auto &animNodeName = pair.first;
+      const auto &animTf = pair.second;
 
       std::string skinName =
           g_skel->NodeNameAnimToSkin(g_animIdx, animNodeName);

examples/actor_animation/Main.cc

@@ -209,13 +209,13 @@ int main(int _argc, char** _argv)
   std::vector<VisualPtr> visuals;
   ic::SkeletonPtr skel = nullptr;
 
-  for (auto engineName : engineNames)
+  for (const auto &engineName : engineNames)
   {
     std::cout << "Starting engine [" << engineName << "]" << std::endl;
     try
     {
       std::map<std::string, std::string> params;
-      if (engineName.compare("ogre2") == 0
+      if (engineName == "ogre2"
           && graphicsApi == GraphicsAPI::METAL)
       {
         params["metal"] = "1";

examples/boundingbox_camera/Main.cc

@@ -263,15 +263,15 @@ int main(int _argc, char** _argv)
     const std::string type3d = "3D";
     const std::string type2dVisible = "2D_visible";
     const std::string type2dFull = "2D_full";
-    if (type2dVisible.compare(_argv[1]) == 0)
+    if (type2dVisible == _argv[1])
     {
       bboxType = BoundingBoxType::BBT_VISIBLEBOX2D;
     }
-    else if (type2dFull.compare(_argv[1]) == 0)
+    else if (type2dFull == _argv[1])
     {
       bboxType = BoundingBoxType::BBT_FULLBOX2D;
     }
-    else if (type3d.compare(_argv[1]) != 0)
+    else if (type3d != _argv[1])
     {
       gzerr << "Invalid bounding box type given. Valid options are: "
             << type3d << ", " << type2dVisible << ", or "
@@ -298,7 +298,7 @@ int main(int _argc, char** _argv)
     try
     {
       std::map<std::string, std::string> params;
-      if (engineName.compare("ogre2") == 0
+      if (engineName == "ogre2"
           && graphicsApi == GraphicsAPI::METAL)
       {
         params["metal"] = "1";

examples/camera_tracking/Main.cc

@@ -140,12 +140,12 @@ int main(int _argc, char** _argv)
 
   engineNames.push_back(ogreEngineName);
 
-  for (auto engineName : engineNames)
+  for (const auto &engineName : engineNames)
   {
     try
     {
       std::map<std::string, std::string> params;
-      if (engineName.compare("ogre2") == 0
+      if (engineName == "ogre2"
           && graphicsApi == GraphicsAPI::METAL)
       {
         params["metal"] = "1";
@@ -163,7 +163,6 @@ int main(int _argc, char** _argv)
     }
     catch (...)
     {
-      // std::cout << ex.what() << std::endl;
       std::cerr << "Error starting up: " << engineName << std::endl;
     }
   }

examples/custom_scene_viewer/ManualSceneDemo.cc

@@ -153,7 +153,7 @@ CameraPtr ManualSceneDemo::CurrentCamera()
 //////////////////////////////////////////////////
 void ManualSceneDemo::Run()
 {
-  for (auto builder : this->builders)
+  for (auto &builder : this->builders)
   {
     builder->SetScenes(this->scenes);
     builder->SetCameras(this->cameras);
@@ -199,7 +199,7 @@ int main(int _argc, char** _argv)
   }
 
   std::map<std::string, std::string> params;
-  if (ogreEngineName.compare("ogre2") == 0
+  if (ogreEngineName == "ogre2"
       && graphicsApi == GraphicsAPI::METAL)
   {
     params["metal"] = "1";

examples/custom_scene_viewer/SceneBuilder.cc

@@ -55,7 +55,7 @@ void SceneBuilder::SetCameras(const CameraList &_cameras)
 //////////////////////////////////////////////////
 void SceneBuilder::BuildScenes()
 {
-  for (auto scene : this->scenes)
+  for (auto &scene : this->scenes)
   {
     this->ClearScene(scene);
     this->BuildScene(scene);
@@ -65,7 +65,7 @@ void SceneBuilder::BuildScenes()
 //////////////////////////////////////////////////
 void SceneBuilder::ResetCameras()
 {
-  for (auto camera : this->cameras)
+  for (auto &camera : this->cameras)
   {
     this->ResetCamera(camera);
   }
@@ -74,7 +74,7 @@ void SceneBuilder::ResetCameras()
 //////////////////////////////////////////////////
 void SceneBuilder::UpdateScenes()
 {
-  for (auto scene : this->scenes)
+  for (auto &scene : this->scenes)
   {
     this->UpdateScene(scene);
   }
@@ -110,7 +110,7 @@ void SceneBuilder::UpdateScene(ScenePtr)
 //////////////////////////////////////////////////
 void SceneBuilder::RegisterMaterials()
 {
-  for (auto scene : this->scenes)
+  for (auto &scene : this->scenes)
   {
     this->RegisterMaterials(scene);
   }
@@ -139,7 +139,6 @@ void SceneBuilder::RegisterMaterials(ScenePtr _scene)
     mat->SetReflectivity(0);
   }
 
-
   if (!_scene->MaterialRegistered("Green"))
   {
     MaterialPtr mat = _scene->CreateMaterial("Green");
@@ -170,14 +169,15 @@ void SceneBuilder::RegisterMaterials(ScenePtr _scene)
     mat->SetReflectivity(0);
   }
 
-  std::vector<std::string> baseNames;
-  baseNames.push_back("Blue");
-  baseNames.push_back("Green");
-  baseNames.push_back("Red");
-  baseNames.push_back("White");
-  baseNames.push_back("Yellow");
+  std::vector<std::string> baseNames = {
+    "Blue",
+    "Green",
+    "Red",
+    "White",
+    "Yellow"
+  };
 
-  for (auto baseName : baseNames)
+  for (const auto &baseName : baseNames)
   {
     std::string parentName = baseName;
     std::string childName = "Texture" + baseName;
@@ -189,7 +189,7 @@ void SceneBuilder::RegisterMaterials(ScenePtr _scene)
     }
   }
 
-  for (auto baseName : baseNames)
+  for (const auto &baseName : baseNames)
   {
     std::string parentName = "Texture" + baseName;
     std::string childName = "Normal" + baseName;
@@ -202,7 +202,7 @@ void SceneBuilder::RegisterMaterials(ScenePtr _scene)
     }
   }
 
-  for (auto baseName : baseNames)
+  for (const auto &baseName : baseNames)
   {
     std::string parentName = "Texture" + baseName;
     std::string childName = "Reflect" + baseName;
@@ -214,7 +214,7 @@ void SceneBuilder::RegisterMaterials(ScenePtr _scene)
     }
   }
 
-  for (auto baseName : baseNames)
+  for (const auto &baseName : baseNames)
   {
     std::string parentName = "Normal" + baseName;
     std::string childName = "NormalReflect" + baseName;
@@ -226,7 +226,7 @@ void SceneBuilder::RegisterMaterials(ScenePtr _scene)
     }
   }
 
-  for (auto baseName : baseNames)
+  for (const auto &baseName : baseNames)
   {
     std::string parentName = baseName;
     std::string childName = "Trans" + baseName;

examples/custom_shaders_uniforms/Main.cc

@@ -179,12 +179,12 @@ int main(int _argc, char** _argv)
 
   engineNames.push_back(ogreEngineName);
 
-  for (auto engineName : engineNames)
+  for (const auto &engineName : engineNames)
   {
     try
     {
       std::map<std::string, std::string> params;
-      if (engineName.compare("ogre2") == 0
+      if (engineName == "ogre2"
           && graphicsApi == GraphicsAPI::METAL)
       {
         params["metal"] = "1";

examples/depth_camera/Main.cc

@@ -176,7 +176,7 @@ int main(int _argc, char** _argv)
   try
   {
     std::map<std::string, std::string> params;
-    if (engineName.compare("ogre2") == 0
+    if (engineName == "ogre2"
         && graphicsApi == GraphicsAPI::METAL)
     {
       params["metal"] = "1";

examples/frustum_visual/Main.cc

@@ -155,12 +155,12 @@ int main(int _argc, char** _argv)
 
   engineNames.push_back(ogreEngineName);
 
-  for (auto engineName : engineNames)
+  for (const auto &engineName : engineNames)
   {
     try
     {
       std::map<std::string, std::string> params;
-      if (engineName.compare("ogre2") == 0
+      if (engineName == "ogre2"
           && graphicsApi == GraphicsAPI::METAL)
       {
         params["metal"] = "1";
@@ -178,7 +178,6 @@ int main(int _argc, char** _argv)
     }
     catch (...)
     {
-      // std::cout << ex.what() << std::endl;
       std::cerr << "Error starting up: " << engineName << std::endl;
     }
   }

examples/global_illumination/Main.cc

@@ -363,7 +363,7 @@ int main(int _argc, char **_argv)
   std::vector<CameraPtr> cameras;
 
   std::map<std::string, std::string> params;
-  if (engineName.compare("ogre2") == 0
+  if (engineName == "ogre2"
       && graphicsApi == GraphicsAPI::VULKAN)
   {
     params["vulkan"] = "1";