ign -> gz Macro Migration : gz-rendering (#643)

gazebosim · Jun 18, 2022 · c797d8b · c797d8b
1 parent 17fc9af
commit c797d8b
Show file tree

Hide file tree

Showing 125 changed files with 300 additions and 284 deletions.
diff --git a/Migration.md b/Migration.md
@@ -17,6 +17,14 @@ release will remove the deprecated code.
    Use `gz/...` instead.
 4. The environment variable `IGN_RENDERING_PLUGIN_PATH` is deprecated. Use `GZ_RENDERING_PLUGIN_PATH` instead.
 5. The environment variable `IGN_RENDERING_RESOURCE_PATH` is deprecated. Use `GZ_RENDERING_RESOURCE_PATH` instead.
+6. The following `IGN_` prefixed macros are deprecated and will be removed in future versions.
+   Additionally, they will only be available when including the corresponding `ignition/...` header.
+   Use the `GZ_` prefix instead.
+    1. `IGN_RENDERING_REGISTER_RENDER_PASS`
+    2. `IGN_VISIBILITY_ALL`
+    3. `IGN_VISIBILITY_SELECTION`
+    4. `IGN_VISIBILITY_GUI`
+    5. `IGN_VISIBILITY_SELECTABLE`
 ## Gazebo Rendering 6.2.1 to 6.X
 
 ### Modifications

diff --git a/examples/actor_animation/Main.cc b/examples/actor_animation/Main.cc
@@ -150,7 +150,7 @@ void buildScene(ScenePtr _scene, std::vector<VisualPtr> &_visuals,
   camera->SetImageHeight(600);
   camera->SetAntiAliasing(2);
   camera->SetAspectRatio(1.333);
-  camera->SetHFOV(IGN_PI / 2);
+  camera->SetHFOV(GZ_PI / 2);
   root->AddChild(camera);
 }
 

diff --git a/examples/camera_tracking/Main.cc b/examples/camera_tracking/Main.cc
@@ -66,7 +66,7 @@ void buildScene(ScenePtr _scene)
   camera->SetImageHeight(600);
   camera->SetAntiAliasing(2);
   camera->SetAspectRatio(1.333);
-  camera->SetHFOV(IGN_PI / 2);
+  camera->SetHFOV(GZ_PI / 2);
   root->AddChild(camera);
 }
 

diff --git a/examples/custom_scene_viewer/ManualSceneDemo.cc b/examples/custom_scene_viewer/ManualSceneDemo.cc
@@ -110,7 +110,7 @@ void ManualSceneDemo::AddCamera(const std::string &_engineName,
   camera->SetImageHeight(480);
   camera->SetAntiAliasing(2);
   camera->SetAspectRatio(1.333);
-  camera->SetHFOV(IGN_PI / 2);
+  camera->SetHFOV(GZ_PI / 2);
   root->AddChild(camera);
 
   this->scenes.push_back(scene);

diff --git a/examples/custom_scene_viewer/SceneBuilder.cc b/examples/custom_scene_viewer/SceneBuilder.cc
@@ -352,7 +352,7 @@ void AllShapesSceneBuilder::BuildScene(ScenePtr _scene)
   VisualPtr box = _scene->CreateVisual(BOX);
   box->AddGeometry(_scene->CreateBox());
   box->SetLocalPosition(2.2, -0.8, 0.2);
-  box->SetLocalRotation(IGN_PI / 4, 0.0, IGN_PI / 4);
+  box->SetLocalRotation(GZ_PI / 4, 0.0, GZ_PI / 4);
   box->SetLocalScale(0.5, 0.5, 0.5);
   box->SetMaterial("Yellow");
   root->AddChild(box);
@@ -523,7 +523,7 @@ void TransparencySceneBuilder::BuildScene(ScenePtr _scene)
   VisualPtr background = _scene->CreateVisual();
   background->AddGeometry(_scene->CreatePlane());
   background->SetLocalPosition(4, 0, 4);
-  background->SetLocalRotation(0, -IGN_PI / 2, 0);
+  background->SetLocalRotation(0, -GZ_PI / 2, 0);
   background->SetLocalScale(10, 10, 1);
   background->SetMaterial("TextureWhite");
   root->AddChild(background);
@@ -631,7 +631,7 @@ void BoxSceneBuilder::BuildScene(ScenePtr _scene)
   VisualPtr box = _scene->CreateVisual(BOX);
   box->AddGeometry(_scene->CreateBox());
   box->SetLocalPosition(3.0, 0.0, 0.5);
-  box->SetLocalRotation(0.0, 0.0, IGN_PI / 4);
+  box->SetLocalRotation(0.0, 0.0, GZ_PI / 4);
   box->SetMaterial("Red");
   root->AddChild(box);
 }

diff --git a/examples/custom_shaders/custom_shaders.cc b/examples/custom_shaders/custom_shaders.cc
@@ -184,7 +184,7 @@ void BuildScene(gz::rendering::ScenePtr _scene)
   box->AddGeometry(_scene->CreateBox());
   box->SetOrigin(0.0, 0.5, 0.0);
   box->SetLocalPosition(3, 0, 0);
-  box->SetLocalRotation(IGN_PI / 4, 0, IGN_PI / 3);
+  box->SetLocalRotation(GZ_PI / 4, 0, GZ_PI / 3);
   box->SetLocalScale(1, 2.5, 1);
   box->SetMaterial(shader);
   //! [add shader to visual]

diff --git a/examples/custom_shaders_uniforms/Main.cc b/examples/custom_shaders_uniforms/Main.cc
@@ -126,7 +126,7 @@ void buildScene(ScenePtr _scene,
   camera->SetImageHeight(600);
   camera->SetAntiAliasing(2);
   camera->SetAspectRatio(1.333);
-  camera->SetHFOV(IGN_PI / 2);
+  camera->SetHFOV(GZ_PI / 2);
   root->AddChild(camera);
 
   // track target

diff --git a/examples/depth_camera/Main.cc b/examples/depth_camera/Main.cc
@@ -111,7 +111,7 @@ void buildScene(ScenePtr _scene)
   camera->SetImageWidth(800);
   camera->SetImageHeight(600);
   camera->SetAspectRatio(1.333);
-  camera->SetHFOV(IGN_PI / 2);
+  camera->SetHFOV(GZ_PI / 2);
   camera->SetImageFormat(PixelFormat::PF_FLOAT32_RGBA);
   camera->SetNearClipPlane(0.15);
   camera->SetFarClipPlane(10.0);

diff --git a/examples/gazebo_scene_viewer/GazeboDemo.cc b/examples/gazebo_scene_viewer/GazeboDemo.cc
@@ -80,7 +80,7 @@ CameraPtr CreateCamera(const std::string &_engine)
   camera->SetImageHeight(480);
   camera->SetAntiAliasing(2);
   camera->SetAspectRatio(1.333);
-  camera->SetHFOV(IGN_PI / 2);
+  camera->SetHFOV(GZ_PI / 2);
   root->AddChild(camera);
 
   return camera;

diff --git a/examples/gazebo_scene_viewer/GazeboWorldDemo.cc b/examples/gazebo_scene_viewer/GazeboWorldDemo.cc
@@ -80,7 +80,7 @@ CameraPtr CreateCamera(const std::string &_engine)
   camera->SetImageHeight(480);
   camera->SetAntiAliasing(2);
   camera->SetAspectRatio(1.333);
-  camera->SetHFOV(IGN_PI / 3);
+  camera->SetHFOV(GZ_PI / 3);
   root->AddChild(camera);
 
   return camera;

diff --git a/examples/heightmap/Main.cc b/examples/heightmap/Main.cc
@@ -271,7 +271,7 @@ void buildScene(ScenePtr _scene, bool _buildDemScene)
   camera->SetImageHeight(900);
   camera->SetAntiAliasing(2);
   camera->SetAspectRatio(1.333);
-  camera->SetHFOV(IGN_PI / 2);
+  camera->SetHFOV(GZ_PI / 2);
   root->AddChild(camera);
 //! [create camera]
 }

diff --git a/examples/hello_world_plugin/HelloWorldPlugin.cc b/examples/hello_world_plugin/HelloWorldPlugin.cc
@@ -100,5 +100,5 @@ namespace mock
 }
 
 // Register this plugin
-IGNITION_ADD_PLUGIN(mock::HelloWorldPlugin,
+GZ_ADD_PLUGIN(mock::HelloWorldPlugin,
                     gz::rendering::RenderEnginePlugin)
diff --git a/examples/lidar_visual/Main.cc b/examples/lidar_visual/Main.cc
@@ -152,7 +152,7 @@ void buildScene(ScenePtr _scene)
   camera->SetImageHeight(900);
   camera->SetAntiAliasing(2);
   camera->SetAspectRatio(1.333);
-  camera->SetHFOV(IGN_PI / 2);
+  camera->SetHFOV(GZ_PI / 2);
   root->AddChild(camera);
 }
 

diff --git a/examples/mesh_viewer/Main.cc b/examples/mesh_viewer/Main.cc
@@ -94,7 +94,7 @@ void buildScene(ScenePtr _scene)
   camera->SetImageHeight(600);
   camera->SetAntiAliasing(2);
   camera->SetAspectRatio(1.333);
-  camera->SetHFOV(IGN_PI / 2);
+  camera->SetHFOV(GZ_PI / 2);
   root->AddChild(camera);
 //! [create camera]
 }

diff --git a/examples/mouse_picking/Main.cc b/examples/mouse_picking/Main.cc
@@ -87,7 +87,7 @@ void buildScene(ScenePtr _scene)
   box->AddGeometry(_scene->CreateBox());
   box->SetOrigin(0.0, 0.5, 0.0);
   box->SetLocalPosition(3, 0, 0);
-  box->SetLocalRotation(IGN_PI / 4, 0, IGN_PI / 3);
+  box->SetLocalRotation(GZ_PI / 4, 0, GZ_PI / 3);
   box->SetLocalScale(1, 2.5, 1);
   box->SetMaterial(blue);
   root->AddChild(box);
@@ -100,7 +100,7 @@ void buildScene(ScenePtr _scene)
   camera->SetImageHeight(600);
   camera->SetAntiAliasing(2);
   camera->SetAspectRatio(1.333);
-  camera->SetHFOV(IGN_PI / 2);
+  camera->SetHFOV(GZ_PI / 2);
   root->AddChild(camera);
 }
 

diff --git a/examples/ogre2_demo/Main.cc b/examples/ogre2_demo/Main.cc
@@ -269,7 +269,7 @@ void buildScene(ScenePtr _scene)
   camera->SetImageHeight(600);
   camera->SetAntiAliasing(2);
   camera->SetAspectRatio(1.333);
-  camera->SetHFOV(IGN_PI / 2);
+  camera->SetHFOV(GZ_PI / 2);
   root->AddChild(camera);
 }
 

diff --git a/examples/particles_demo/Main.cc b/examples/particles_demo/Main.cc
@@ -94,7 +94,7 @@ void buildScene(ScenePtr _scene)
   camera->SetImageHeight(600);
   camera->SetAntiAliasing(2);
   camera->SetAspectRatio(1.333);
-  camera->SetHFOV(IGN_PI / 2);
+  camera->SetHFOV(GZ_PI / 2);
   root->AddChild(camera);
   //! [create camera]
 

diff --git a/examples/render_pass/Main.cc b/examples/render_pass/Main.cc
@@ -104,7 +104,7 @@ void buildScene(ScenePtr _scene)
   box->AddGeometry(_scene->CreateBox());
   box->SetOrigin(0.0, 0.5, 0.0);
   box->SetLocalPosition(3, 0, 0);
-  box->SetLocalRotation(IGN_PI / 4, 0, IGN_PI / 3);
+  box->SetLocalRotation(GZ_PI / 4, 0, GZ_PI / 3);
   box->SetLocalScale(1, 2.5, 1);
   box->SetMaterial(blue);
   root->AddChild(box);
@@ -132,7 +132,7 @@ void buildScene(ScenePtr _scene)
   camera->SetImageHeight(600);
   camera->SetAntiAliasing(2);
   camera->SetAspectRatio(1.333);
-  camera->SetHFOV(IGN_PI / 2);
+  camera->SetHFOV(GZ_PI / 2);
   root->AddChild(camera);
 }
 

diff --git a/examples/segmentation_camera/Main.cc b/examples/segmentation_camera/Main.cc
@@ -111,7 +111,7 @@ void buildScene(ScenePtr _scene)
   camera->SetImageHeight(600);
   camera->SetImageFormat(PixelFormat::PF_R8G8B8);
   camera->SetAspectRatio(1.333);
-  camera->SetHFOV(IGN_PI / 2);
+  camera->SetHFOV(GZ_PI / 2);
   camera->EnableColoredMap(true);
   camera->SetSegmentationType(SegmentationType::ST_SEMANTIC);
   root->AddChild(camera);

diff --git a/examples/simple_demo/Main.cc b/examples/simple_demo/Main.cc
@@ -113,7 +113,7 @@ void buildScene(ScenePtr _scene)
   box->AddGeometry(_scene->CreateBox());
   box->SetOrigin(0.0, 0.5, 0.0);
   box->SetLocalPosition(3, 0, 0);
-  box->SetLocalRotation(IGN_PI / 4, 0, IGN_PI / 3);
+  box->SetLocalRotation(GZ_PI / 4, 0, GZ_PI / 3);
   box->SetLocalScale(1, 2.5, 1);
   box->SetMaterial(blue);
   root->AddChild(box);
@@ -178,7 +178,7 @@ void buildScene(ScenePtr _scene)
   camera->SetImageHeight(600);
   camera->SetAntiAliasing(2);
   camera->SetAspectRatio(1.333);
-  camera->SetHFOV(IGN_PI / 2);
+  camera->SetHFOV(GZ_PI / 2);
   root->AddChild(camera);
 
   // track target

diff --git a/examples/simple_demo_qml/IgnitionRenderer.cc b/examples/simple_demo_qml/IgnitionRenderer.cc
@@ -99,7 +99,7 @@ void BuildScene(gz::rendering::ScenePtr _scene)
   box->AddGeometry(_scene->CreateBox());
   box->SetOrigin(0.0, 0.5, 0.0);
   box->SetLocalPosition(3, 0, 0);
-  box->SetLocalRotation(IGN_PI / 4, 0, IGN_PI / 3);
+  box->SetLocalRotation(GZ_PI / 4, 0, GZ_PI / 3);
   box->SetLocalScale(1, 2.5, 1);
   box->SetMaterial(blue);
   root->AddChild(box);
@@ -162,7 +162,7 @@ void BuildScene(gz::rendering::ScenePtr _scene)
   camera->SetImageHeight(600);
   camera->SetAntiAliasing(2);
   camera->SetAspectRatio(800.0/600.0);
-  camera->SetHFOV(IGN_PI / 2);
+  camera->SetHFOV(GZ_PI / 2);
   root->AddChild(camera);
 
   // track target
@@ -175,7 +175,7 @@ gz::rendering::CameraPtr CreateCamera(const std::string &_engineName)
   // create and populate scene
   std::map<std::string, std::string> params;
 
-  // ensure that the QML application and Ignition / Ogre2 share an OpenGL
+  // ensure that the QML application and Gazebo / Ogre2 share an OpenGL
   // context
   params["useCurrentGLContext"] = "1";
   RenderEngine *engine = rendering::engine(_engineName, params);

diff --git a/examples/simple_demo_qml/IgnitionRenderer.hh b/examples/simple_demo_qml/IgnitionRenderer.hh
@@ -22,8 +22,8 @@
 
 #include <gz/rendering.hh>
 
-/// \brief Ignition renderer class. This manages  the initialisation
-/// and update of an Ignition rendering engine instance and makes the
+/// \brief Gazebo renderer class. This manages the initialisation
+/// and update of a Gazebo rendering engine instance and makes the
 /// rendered texture available in a shared context for an application
 /// to apply to a render surface.
 class IgnitionRenderer

diff --git a/examples/text_geom/Main.cc b/examples/text_geom/Main.cc
@@ -93,7 +93,7 @@ void buildScene(ScenePtr _scene)
   camera->SetImageHeight(600);
   camera->SetAntiAliasing(2);
   camera->SetAspectRatio(1.333);
-  camera->SetHFOV(IGN_PI / 2);
+  camera->SetHFOV(GZ_PI / 2);
   root->AddChild(camera);
 }
 

diff --git a/examples/thermal_camera/Main.cc b/examples/thermal_camera/Main.cc
@@ -97,7 +97,7 @@ void buildScene(ScenePtr _scene)
   camera->SetFarClipPlane(6);
   camera->SetNearClipPlane(1.0);
   camera->SetAspectRatio(1.333);
-  camera->SetHFOV(IGN_PI / 2);
+  camera->SetHFOV(GZ_PI / 2);
   camera->SetAmbientTemperature(293.0);
   camera->SetAmbientTemperatureRange(5.0);
   camera->SetLinearResolution(0.01);

diff --git a/examples/transform_control/Main.cc b/examples/transform_control/Main.cc
@@ -84,7 +84,7 @@ void buildScene(ScenePtr _scene)
   camera->SetImageHeight(600);
   camera->SetAntiAliasing(2);
   camera->SetAspectRatio(1.333);
-  camera->SetHFOV(IGN_PI / 2);
+  camera->SetHFOV(GZ_PI / 2);
   root->AddChild(camera);
 }
 

diff --git a/examples/view_control/Main.cc b/examples/view_control/Main.cc
@@ -102,7 +102,7 @@ void buildScene(ScenePtr _scene)
   box->AddGeometry(_scene->CreateBox());
   box->SetOrigin(0.0, 0.5, 0.0);
   box->SetLocalPosition(3, 0, 0);
-  box->SetLocalRotation(IGN_PI / 4, 0, IGN_PI / 3);
+  box->SetLocalRotation(GZ_PI / 4, 0, GZ_PI / 3);
   box->SetLocalScale(1, 2.5, 1);
   box->SetMaterial(blue);
   root->AddChild(box);
@@ -130,7 +130,7 @@ void buildScene(ScenePtr _scene)
   camera->SetImageHeight(600);
   camera->SetAntiAliasing(2);
   camera->SetAspectRatio(1.333);
-  camera->SetHFOV(IGN_PI / 2);
+  camera->SetHFOV(GZ_PI / 2);
   root->AddChild(camera);
 }
 

diff --git a/examples/visualization_demo/Main.cc b/examples/visualization_demo/Main.cc
@@ -208,7 +208,7 @@ void buildScene(ScenePtr _scene)
   camera->SetImageHeight(600);
   camera->SetAntiAliasing(2);
   camera->SetAspectRatio(1.333);
-  camera->SetHFOV(IGN_PI / 2);
+  camera->SetHFOV(GZ_PI / 2);
   root->AddChild(camera);
 
   // track target

diff --git a/examples/waves/Main.cc b/examples/waves/Main.cc
@@ -119,7 +119,7 @@ void buildScene(ScenePtr _scene,
   camera->SetImageHeight(600);
   camera->SetAntiAliasing(4);
   camera->SetAspectRatio(1.333);
-  camera->SetHFOV(IGN_PI / 2);
+  camera->SetHFOV(GZ_PI / 2);
   root->AddChild(camera);
 }
 

diff --git a/examples/wide_angle_camera/Main.cc b/examples/wide_angle_camera/Main.cc
@@ -121,7 +121,7 @@ void buildScene(ScenePtr _scene)
   CameraLens lens;
   lens.SetCustomMappingFunction(1.05, 4.0, AFT_TAN, 1.0, 0.0);
   lens.SetType(MFT_CUSTOM);
-  lens.SetCutOffAngle(IGN_PI);
+  lens.SetCutOffAngle(GZ_PI);
 
   WideAngleCameraPtr camera = _scene->CreateWideAngleCamera("camera");
   camera->SetLens(lens);

diff --git a/include/gz/rendering/BoundingBox.hh b/include/gz/rendering/BoundingBox.hh
@@ -61,9 +61,9 @@ inline namespace GZ_RENDERING_VERSION_NAMESPACE {
 
     /// \internal
     /// \brief Private data
-    IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING
+    GZ_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING
     private: std::unique_ptr<BoundingBoxPrivate> dataPtr;
-    IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING
+    GZ_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING
   };
 }
 }

diff --git a/include/gz/rendering/CameraLens.hh b/include/gz/rendering/CameraLens.hh
@@ -182,7 +182,7 @@ namespace gz
 
       /// \internal
       /// \brief Private data pointer
-      IGN_UTILS_UNIQUE_IMPL_PTR(dataPtr)
+      GZ_UTILS_UNIQUE_IMPL_PTR(dataPtr)
     };
     }
   }

diff --git a/include/gz/rendering/HeightmapDescriptor.hh b/include/gz/rendering/HeightmapDescriptor.hh
@@ -86,9 +86,9 @@ inline namespace GZ_RENDERING_VERSION_NAMESPACE {
     public: void SetNormal(const std::string &_normal);
 
     /// \brief Private data pointer.
-    IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING
+    GZ_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING
     private: std::unique_ptr<HeightmapTexturePrivate> dataPtr;
-    IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING
+    GZ_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING
   };
 
   /// \brief Blend information to be used between textures on heightmaps.
@@ -135,9 +135,9 @@ inline namespace GZ_RENDERING_VERSION_NAMESPACE {
     public: void SetFadeDistance(double _fadeDistance);
 
     /// \brief Private data pointer.
-    IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING
+    GZ_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING
     private: std::unique_ptr<HeightmapBlendPrivate> dataPtr;
-    IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING
+    GZ_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING
   };
 
   /// \class HeightmapDescriptor HeightmapDescriptor.hh
@@ -252,9 +252,9 @@ inline namespace GZ_RENDERING_VERSION_NAMESPACE {
 
     /// \internal
     /// \brief Private data
-    IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING
+    GZ_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING
     private: std::unique_ptr<HeightmapDescriptorPrivate> dataPtr;
-    IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING
+    GZ_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING
   };
 }
 }