Merge pull request #618 from gazebosim/header_migration

ign -> gz Header Migration : ign-rendering
gazebosim · May 9, 2022 · ff16689 · ff16689
2 parents 24506d0 + 5c0254e
commit ff16689
Show file tree

Hide file tree

Showing 557 changed files with 36,006 additions and 31,821 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,7 +15,9 @@ set(IGN_CMAKE_VER ${ignition-cmake3_VERSION_MAJOR})
 #============================================================================
 # Set up the project
 #============================================================================
-ign_configure_project(VERSION_SUFFIX pre1)
+ign_configure_project(
+  REPLACE_IGNITION_INCLUDE_PATH gz/rendering
+  VERSION_SUFFIX pre1)
 
 #============================================================================
 # Set project-specific options

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -31,5 +31,5 @@ if (DOXYGEN_FOUND)
     COMMENT "Generating API documentation with Doxygen" VERBATIM)
 
   install(FILES ${CMAKE_BINARY_DIR}/doc/${PROJECT_NAME_LOWER}.tag.xml
-    DESTINATION ${CMAKE_INSTALL_PREFIX}/share/ignition/${PROJECT_NAME_LOWER}_${PROJECT_VERSION_MINOR})
+    DESTINATION ${CMAKE_INSTALL_PREFIX}/share/gz/${PROJECT_NAME_LOWER}_${PROJECT_VERSION_MINOR})
 endif()
diff --git a/examples/actor_animation/GlutWindow.cc b/examples/actor_animation/GlutWindow.cc
@@ -34,16 +34,16 @@
 #include <map>
 #include <string>
 
-#include <ignition/math/Matrix4.hh>
-#include <ignition/common/Console.hh>
-#include <ignition/common/Mesh.hh>
-#include <ignition/common/Skeleton.hh>
-#include <ignition/common/SkeletonAnimation.hh>
-#include <ignition/rendering/Camera.hh>
-#include <ignition/rendering/Image.hh>
-#include <ignition/rendering/OrbitViewController.hh>
-#include <ignition/rendering/RayQuery.hh>
-#include <ignition/rendering/Scene.hh>
+#include <gz/math/Matrix4.hh>
+#include <gz/common/Console.hh>
+#include <gz/common/Mesh.hh>
+#include <gz/common/Skeleton.hh>
+#include <gz/common/SkeletonAnimation.hh>
+#include <gz/rendering/Camera.hh>
+#include <gz/rendering/Image.hh>
+#include <gz/rendering/OrbitViewController.hh>
+#include <gz/rendering/RayQuery.hh>
+#include <gz/rendering/Scene.hh>
 
 #include "GlutWindow.hh"
 #include "example_config.hh"

diff --git a/examples/actor_animation/GlutWindow.hh b/examples/actor_animation/GlutWindow.hh
@@ -14,12 +14,12 @@
  * limitations under the License.
  *
  */
-#ifndef IGNITION_RENDERING_EXAMPLES_ACTOR_ANIMATION_GLUTWINDOW_HH_
-#define IGNITION_RENDERING_EXAMPLES_ACTOR_ANIMATION_GLUTWINDOW_HH_
+#ifndef GZ_RENDERING_EXAMPLES_ACTOR_ANIMATION_GLUTWINDOW_HH_
+#define GZ_RENDERING_EXAMPLES_ACTOR_ANIMATION_GLUTWINDOW_HH_
 
 #include <vector>
-#include "ignition/rendering/RenderTypes.hh"
-#include "ignition/common/graphics/Types.hh"
+#include "gz/rendering/RenderTypes.hh"
+#include "gz/common/graphics/Types.hh"
 
 namespace ir = ignition::rendering;
 namespace ic = ignition::common;

diff --git a/examples/actor_animation/Main.cc b/examples/actor_animation/Main.cc
@@ -27,12 +27,12 @@
 #include <iostream>
 #include <vector>
 
-#include <ignition/common/Console.hh>
-#include <ignition/common/Skeleton.hh>
-#include <ignition/common/SkeletonAnimation.hh>
-#include <ignition/common/MeshManager.hh>
-#include <ignition/common/Mesh.hh>
-#include <ignition/rendering.hh>
+#include <gz/common/Console.hh>
+#include <gz/common/Skeleton.hh>
+#include <gz/common/SkeletonAnimation.hh>
+#include <gz/common/MeshManager.hh>
+#include <gz/common/Mesh.hh>
+#include <gz/rendering.hh>
 
 #include "example_config.hh"
 #include "GlutWindow.hh"

diff --git a/examples/camera_tracking/GlutWindow.cc b/examples/camera_tracking/GlutWindow.cc
@@ -31,12 +31,12 @@
 
 #include <mutex>
 
-#include <ignition/common/Console.hh>
-#include <ignition/rendering/Camera.hh>
-#include <ignition/rendering/Image.hh>
-#include <ignition/rendering/RayQuery.hh>
-#include <ignition/rendering/Scene.hh>
-#include <ignition/rendering/OrbitViewController.hh>
+#include <gz/common/Console.hh>
+#include <gz/rendering/Camera.hh>
+#include <gz/rendering/Image.hh>
+#include <gz/rendering/RayQuery.hh>
+#include <gz/rendering/Scene.hh>
+#include <gz/rendering/OrbitViewController.hh>
 
 #include "GlutWindow.hh"
 

diff --git a/examples/camera_tracking/GlutWindow.hh b/examples/camera_tracking/GlutWindow.hh
@@ -14,11 +14,11 @@
  * limitations under the License.
  *
  */
-#ifndef IGNITION_RENDERING_EXAMPLES_CAMERA_TRACKING_GLUTWINDOW_HH_
-#define IGNITION_RENDERING_EXAMPLES_CAMERA_TRACKING_GLUTWINDOW_HH_
+#ifndef GZ_RENDERING_EXAMPLES_CAMERA_TRACKING_GLUTWINDOW_HH_
+#define GZ_RENDERING_EXAMPLES_CAMERA_TRACKING_GLUTWINDOW_HH_
 
 #include <vector>
-#include <ignition/rendering/RenderTypes.hh>
+#include <gz/rendering/RenderTypes.hh>
 
 namespace ir = ignition::rendering;
 

diff --git a/examples/camera_tracking/Main.cc b/examples/camera_tracking/Main.cc
@@ -27,8 +27,8 @@
 #include <iostream>
 #include <vector>
 
-#include <ignition/common/Console.hh>
-#include <ignition/rendering.hh>
+#include <gz/common/Console.hh>
+#include <gz/rendering.hh>
 #include "GlutWindow.hh"
 
 using namespace ignition;

diff --git a/examples/custom_scene_viewer/DemoWindow.cc b/examples/custom_scene_viewer/DemoWindow.cc
@@ -33,7 +33,7 @@
 #include <string>
 #include <vector>
 
-#include <ignition/rendering.hh>
+#include <gz/rendering.hh>
 
 #include "ManualSceneDemo.hh"
 #include "DemoWindow.hh"

diff --git a/examples/custom_scene_viewer/DemoWindow.hh b/examples/custom_scene_viewer/DemoWindow.hh
@@ -14,8 +14,8 @@
  * limitations under the License.
  *
  */
-#ifndef IGNITION_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_DEMOWINDOW_HH_
-#define IGNITION_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_DEMOWINDOW_HH_
+#ifndef GZ_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_DEMOWINDOW_HH_
+#define GZ_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_DEMOWINDOW_HH_
 
 #include "TestTypes.hh"
 

diff --git a/examples/custom_scene_viewer/ManualSceneDemo.cc b/examples/custom_scene_viewer/ManualSceneDemo.cc
@@ -25,7 +25,7 @@
 #endif
 
 #include <iostream>
-#include <ignition/common/Console.hh>
+#include <gz/common/Console.hh>
 #include "ManualSceneDemo.hh"
 #include "SceneBuilder.hh"
 #include "DemoWindow.hh"

diff --git a/examples/custom_scene_viewer/ManualSceneDemo.hh b/examples/custom_scene_viewer/ManualSceneDemo.hh
@@ -14,12 +14,12 @@
  * limitations under the License.
  *
  */
-#ifndef IGNITION_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_MANUALSCENEDEMO_HH_
-#define IGNITION_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_MANUALSCENEDEMO_HH_
+#ifndef GZ_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_MANUALSCENEDEMO_HH_
+#define GZ_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_MANUALSCENEDEMO_HH_
 
 #include <map>
 #include <string>
-#include <ignition/rendering.hh>
+#include <gz/rendering.hh>
 #include "TestTypes.hh"
 
 namespace ignition

diff --git a/examples/custom_scene_viewer/SceneBuilder.hh b/examples/custom_scene_viewer/SceneBuilder.hh
@@ -14,8 +14,8 @@
  * limitations under the License.
  *
  */
-#ifndef IGNITION_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_SCENEBUILDER_HH_
-#define IGNITION_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_SCENEBUILDER_HH_
+#ifndef GZ_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_SCENEBUILDER_HH_
+#define GZ_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_SCENEBUILDER_HH_
 
 #include <string>
 #include "TestTypes.hh"

diff --git a/examples/custom_scene_viewer/TestTypes.hh b/examples/custom_scene_viewer/TestTypes.hh
@@ -14,11 +14,11 @@
  * limitations under the License.
  *
  */
-#ifndef IGNITION_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_TESTYPES_HH_
-#define IGNITION_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_TESTYPES_HH_
+#ifndef GZ_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_TESTYPES_HH_
+#define GZ_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_TESTYPES_HH_
 
 #include <vector>
-#include <ignition/rendering.hh>
+#include <gz/rendering.hh>
 
 namespace ignition
 {

diff --git a/examples/custom_shaders/custom_shaders.cc b/examples/custom_shaders/custom_shaders.cc
@@ -14,9 +14,9 @@
  * limitations under the License.
  *
 */
-#include <ignition/common/Image.hh>
-#include <ignition/common/Filesystem.hh>
-#include <ignition/rendering.hh>
+#include <gz/common/Image.hh>
+#include <gz/common/Filesystem.hh>
+#include <gz/rendering.hh>
 
 #include "example_config.hh"
 

diff --git a/examples/custom_shaders_uniforms/GlutWindow.cc b/examples/custom_shaders_uniforms/GlutWindow.cc
@@ -38,11 +38,11 @@
 
 #include <mutex>
 
-#include <ignition/common/Console.hh>
-#include <ignition/rendering.hh>
-#include <ignition/rendering/Camera.hh>
-#include <ignition/rendering/Image.hh>
-#include <ignition/rendering/Scene.hh>
+#include <gz/common/Console.hh>
+#include <gz/rendering.hh>
+#include <gz/rendering/Camera.hh>
+#include <gz/rendering/Image.hh>
+#include <gz/rendering/Scene.hh>
 
 #include "GlutWindow.hh"
 

diff --git a/examples/custom_shaders_uniforms/GlutWindow.hh b/examples/custom_shaders_uniforms/GlutWindow.hh
@@ -14,11 +14,11 @@
  * limitations under the License.
  *
  */
-#ifndef IGNITION_RENDERING_EXAMPLES_CUSTOM_SHADERS_UNIFORMS_DEMO_GLUTWINDOW_HH_
-#define IGNITION_RENDERING_EXAMPLES_CUSTOM_SHADERS_UNIFORMS_DEMO_GLUTWINDOW_HH_
+#ifndef GZ_RENDERING_EXAMPLES_CUSTOM_SHADERS_UNIFORMS_DEMO_GLUTWINDOW_HH_
+#define GZ_RENDERING_EXAMPLES_CUSTOM_SHADERS_UNIFORMS_DEMO_GLUTWINDOW_HH_
 
 #include <vector>
-#include "ignition/rendering/RenderTypes.hh"
+#include "gz/rendering/RenderTypes.hh"
 
 namespace ir = ignition::rendering;
 

diff --git a/examples/custom_shaders_uniforms/Main.cc b/examples/custom_shaders_uniforms/Main.cc
@@ -33,8 +33,8 @@
 #include <iostream>
 #include <vector>
 
-#include <ignition/common/Console.hh>
-#include <ignition/rendering.hh>
+#include <gz/common/Console.hh>
+#include <gz/rendering.hh>
 
 #include "example_config.hh"
 

diff --git a/examples/depth_camera/GlutWindow.cc b/examples/depth_camera/GlutWindow.cc
@@ -34,18 +34,18 @@
 #include <string>
 #include <vector>
 
-#include <ignition/common/Console.hh>
-#include <ignition/common/Image.hh>
-
-#include <ignition/math/Vector2.hh>
-
-#include <ignition/rendering/Camera.hh>
-#include <ignition/rendering/Image.hh>
-#include <ignition/rendering/OrbitViewController.hh>
-#include <ignition/rendering/RayQuery.hh>
-#include <ignition/rendering/Scene.hh>
-#include <ignition/rendering/SegmentationCamera.hh>
-#include <ignition/rendering/DepthCamera.hh>
+#include <gz/common/Console.hh>
+#include <gz/common/Image.hh>
+
+#include <gz/math/Vector2.hh>
+
+#include <gz/rendering/Camera.hh>
+#include <gz/rendering/Image.hh>
+#include <gz/rendering/OrbitViewController.hh>
+#include <gz/rendering/RayQuery.hh>
+#include <gz/rendering/Scene.hh>
+#include <gz/rendering/SegmentationCamera.hh>
+#include <gz/rendering/DepthCamera.hh>
 
 #include "GlutWindow.hh"
 

diff --git a/examples/depth_camera/GlutWindow.hh b/examples/depth_camera/GlutWindow.hh
@@ -14,11 +14,11 @@
  * limitations under the License.
  *
  */
-#ifndef IGNITION_RENDERING_EXAMPLES_DEPTH_CAMERA_GLUTWINDOW_HH_
-#define IGNITION_RENDERING_EXAMPLES_DEPTH_CAMERA_GLUTWINDOW_HH_
+#ifndef GZ_RENDERING_EXAMPLES_DEPTH_CAMERA_GLUTWINDOW_HH_
+#define GZ_RENDERING_EXAMPLES_DEPTH_CAMERA_GLUTWINDOW_HH_
 
 #include <vector>
-#include "ignition/rendering/RenderTypes.hh"
+#include "gz/rendering/RenderTypes.hh"
 
 namespace ir = ignition::rendering;
 

diff --git a/examples/depth_camera/Main.cc b/examples/depth_camera/Main.cc
@@ -28,9 +28,9 @@
 #include <string>
 #include <vector>
 
-#include <ignition/common/Console.hh>
-#include <ignition/common/MeshManager.hh>
-#include <ignition/rendering.hh>
+#include <gz/common/Console.hh>
+#include <gz/common/MeshManager.hh>
+#include <gz/rendering.hh>
 
 #include "example_config.hh"
 #include "GlutWindow.hh"

diff --git a/examples/gazebo_scene_viewer/CameraWindow.cc b/examples/gazebo_scene_viewer/CameraWindow.cc
@@ -33,9 +33,9 @@
 #include <gazebo/common/Console.hh>
 #include <gazebo/transport/TransportIface.hh>
 
-#include <ignition/rendering/Camera.hh>
-#include <ignition/rendering/Image.hh>
-#include <ignition/rendering/Scene.hh>
+#include <gz/rendering/Camera.hh>
+#include <gz/rendering/Image.hh>
+#include <gz/rendering/Scene.hh>
 
 #include "CameraWindow.hh"
 #include "SceneManager.hh"

diff --git a/examples/gazebo_scene_viewer/CameraWindow.hh b/examples/gazebo_scene_viewer/CameraWindow.hh
@@ -14,11 +14,11 @@
  * limitations under the License.
  *
  */
-#ifndef IGNITION_RENDERING_EXAMPLES_CAMERAWINDOW_HH_
-#define IGNITION_RENDERING_EXAMPLES_CAMERAWINDOW_HH_
+#ifndef GZ_RENDERING_EXAMPLES_CAMERAWINDOW_HH_
+#define GZ_RENDERING_EXAMPLES_CAMERAWINDOW_HH_
 
 #include <vector>
-#include "ignition/rendering/RenderTypes.hh"
+#include "gz/rendering/RenderTypes.hh"
 
 namespace gz = ignition::rendering;
 

diff --git a/examples/gazebo_scene_viewer/GazeboDemo.cc b/examples/gazebo_scene_viewer/GazeboDemo.cc
@@ -28,11 +28,11 @@
 #include <gazebo/common/Console.hh>
 #include <gazebo/transport/TransportIface.hh>
 
-#include <ignition/rendering/Camera.hh>
-#include <ignition/rendering/RenderingIface.hh>
-#include <ignition/rendering/RenderEngine.hh>
-#include <ignition/rendering/Scene.hh>
-#include <ignition/rendering/Visual.hh>
+#include <gz/rendering/Camera.hh>
+#include <gz/rendering/RenderingIface.hh>
+#include <gz/rendering/RenderEngine.hh>
+#include <gz/rendering/Scene.hh>
+#include <gz/rendering/Visual.hh>
 
 #include "CameraWindow.hh"
 #include "SceneManager.hh"

diff --git a/examples/gazebo_scene_viewer/GazeboWorldDemo.cc b/examples/gazebo_scene_viewer/GazeboWorldDemo.cc
@@ -25,14 +25,14 @@
 #endif
 
 #include <iostream>
-#include <ignition/common/Console.hh>
+#include <gz/common/Console.hh>
 #include <gazebo/transport/TransportIface.hh>
 
-#include <ignition/rendering/Camera.hh>
-#include <ignition/rendering/RenderingIface.hh>
-#include <ignition/rendering/RenderEngine.hh>
-#include <ignition/rendering/Scene.hh>
-#include <ignition/rendering/Visual.hh>
+#include <gz/rendering/Camera.hh>
+#include <gz/rendering/RenderingIface.hh>
+#include <gz/rendering/RenderEngine.hh>
+#include <gz/rendering/Scene.hh>
+#include <gz/rendering/Visual.hh>
 
 #include "CameraWindow.hh"
 #include "SceneManager.hh"