More ign to gz changes (#795)

Signed-off-by: Ian Chen <[email protected]>

Author: iche033

examples/boundingbox_camera/GlutWindow.cc

@@ -146,7 +146,7 @@ void handleMouse()
     g_rayQuery = rayCamera->Scene()->CreateRayQuery();
     if (!g_rayQuery)
     {
-      ignerr << "Failed to create Ray Query" << std::endl;
+      gzerr << "Failed to create Ray Query" << std::endl;
       return;
     }
   }
@@ -285,8 +285,8 @@ bool SaveImage(const uint8_t *_data)
   {
     if (!gz::common::createDirectories(savePath))
     {
-      ignerr << "Could not create a directory [" << savePath
-             << "] for saving images.\n";
+      gzerr << "Could not create a directory [" << savePath
+            << "] for saving images.\n";
       return false;
     }
   }
@@ -409,7 +409,7 @@ void run(std::vector<gz::rendering::CameraPtr> &_cameras)
 {
   if (_cameras.empty())
   {
-    ignerr << "No cameras found. Scene will not be rendered" << std::endl;
+    gzerr << "No cameras found. Scene will not be rendered" << std::endl;
     return;
   }
 

examples/boundingbox_camera/Main.cc

@@ -223,8 +223,8 @@ std::vector<CameraPtr> createCameras(const std::string &_engineName,
   RenderEngine *engine = rendering::engine(_engineName);
   if (!engine)
   {
-    ignwarn << "Engine '" << _engineName
-              << "' is not supported" << std::endl;
+    gzwarn << "Engine '" << _engineName
+           << "' is not supported" << std::endl;
     return std::vector<CameraPtr>();
   }
   ScenePtr scene = engine->CreateScene("scene");
@@ -263,10 +263,10 @@ int main(int _argc, char** _argv)
     }
     else if (type3d.compare(_argv[1]) != 0)
     {
-      ignerr << "Invalid bounding box type given. Valid options are: "
-             << type3d << ", " << type2dVisible << ", or "
-             << type2dFull << "\n";
-      ignerr << "you entered " << _argv[1] << "\n";
+      gzerr << "Invalid bounding box type given. Valid options are: "
+            << type3d << ", " << type2dVisible << ", or "
+            << type2dFull << "\n";
+      gzerr << "you entered " << _argv[1] << "\n";
       return -1;
     }
   }

ogre2/src/Ogre2RayQuery.cc

@@ -104,8 +104,8 @@ void Ogre2RayQuery::SetFromCamera(const CameraPtr &_camera,
   }
   else
   {
-    ignwarn << "Attempted to set non-finite origin from camera ["
-            << camera->Name() << "]" << std::endl;
+    gzwarn << "Attempted to set non-finite origin from camera ["
+           << camera->Name() << "]" << std::endl;
   }
 
   auto directionMath = Ogre2Conversions::Convert(ray.getDirection());
@@ -115,8 +115,8 @@ void Ogre2RayQuery::SetFromCamera(const CameraPtr &_camera,
   }
   else
   {
-    ignwarn << "Attempted to set non-finite direction from camera ["
-            << camera->Name() << "]" << std::endl;
+    gzwarn << "Attempted to set non-finite direction from camera ["
+           << camera->Name() << "]" << std::endl;
   }
 
   this->dataPtr->imgPos.X() = static_cast<int>(

src/OrbitViewController.cc

@@ -94,8 +94,8 @@ void OrbitViewController::Zoom(const double _value)
 {
   if (!std::isfinite(_value))
   {
-    ignerr << "Failed to zoom by non-finite value [" << _value << "]"
-           << std::endl;
+    gzerr << "Failed to zoom by non-finite value [" << _value << "]"
+          << std::endl;
     return;
   }
 
@@ -122,8 +122,8 @@ void OrbitViewController::Pan(const math::Vector2d &_value)
 {
   if (!_value.IsFinite())
   {
-    ignerr << "Failed to pan by non-finite value [" << _value << "]"
-           << std::endl;
+    gzerr << "Failed to pan by non-finite value [" << _value << "]"
+          << std::endl;
     return;
   }
 
@@ -135,8 +135,8 @@ void OrbitViewController::Pan(const math::Vector2d &_value)
 
   if (!this->dataPtr->camera->WorldPosition().IsFinite())
   {
-    ignerr << "Camera world position isn't finite ["
-           << this->dataPtr->camera->WorldPosition() << "]" << std::endl;
+    gzerr << "Camera world position isn't finite ["
+          << this->dataPtr->camera->WorldPosition() << "]" << std::endl;
     return;
   }
 
@@ -171,8 +171,8 @@ void OrbitViewController::Orbit(const math::Vector2d &_value)
 {
   if (!_value.IsFinite())
   {
-    ignerr << "Failed to orbit by non-finite value [" << _value << "]"
-           << std::endl;
+    gzerr << "Failed to orbit by non-finite value [" << _value << "]"
+          << std::endl;
     return;
   }
 

test/common_test/Mesh_TEST.cc

@@ -32,7 +32,7 @@
 using namespace gz;
 using namespace rendering;
 
-class MeshTest : public CommonRenderingTest 
+class MeshTest : public CommonRenderingTest
 {
   public: const std::string TEST_MEDIA_PATH =
         common::joinPaths(std::string(PROJECT_SOURCE_PATH),
@@ -300,7 +300,7 @@ TEST_F(MeshTest, MeshClone)
   {
     // since the "top level mesh" has a material, the submesh materials are not
     // unique copies:
-    // https://github.com/gazebosim/gz-rendering/blob/8f961d0c4cc755b6a2ca217d5a73de268ef95514/include/ignition/rendering/base/BaseMesh.hh#L293
+    // https://github.com/gazebosim/gz-rendering/blob/696885518a6b3ef461b06af094b7f32a51e8ad83/include/gz/rendering/base/BaseMesh.hh#L305
     auto clonedSubMesh = clonedMesh->SubMeshByIndex(i);
     auto originalSubMesh = clonedMesh->SubMeshByIndex(i);
     compareMaterials(clonedSubMesh->Material(), originalSubMesh->Material(),