From a8b31e9f15f880d5ccce35de2d9ef2eb9aa6e295 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Thu, 18 Aug 2022 20:42:06 -0700 Subject: [PATCH] Migrate include statements Signed-off-by: methylDragon --- CMakeLists.txt | 2 +- examples/actor_animation/GlutWindow.cc | 20 ++++---- examples/actor_animation/GlutWindow.hh | 4 +- examples/actor_animation/Main.cc | 10 ++-- examples/camera_tracking/GlutWindow.cc | 12 ++--- examples/camera_tracking/GlutWindow.hh | 2 +- examples/camera_tracking/Main.cc | 4 +- examples/custom_scene_viewer/DemoWindow.cc | 2 +- .../custom_scene_viewer/ManualSceneDemo.cc | 2 +- .../custom_scene_viewer/ManualSceneDemo.hh | 2 +- examples/custom_scene_viewer/TestTypes.hh | 2 +- examples/custom_shaders/custom_shaders.cc | 6 +-- examples/gazebo_scene_viewer/CameraWindow.cc | 8 ++-- examples/gazebo_scene_viewer/CameraWindow.hh | 2 +- examples/gazebo_scene_viewer/GazeboDemo.cc | 2 +- .../gazebo_scene_viewer/GazeboWorldDemo.cc | 4 +- examples/gazebo_scene_viewer/SceneManager.cc | 6 +-- examples/gazebo_scene_viewer/SceneManager.hh | 4 +- .../SceneManagerPrivate.hh | 10 ++-- .../hello_world_plugin/HelloWorldPlugin.cc | 10 ++-- examples/mesh_viewer/GlutWindow.cc | 12 ++--- examples/mesh_viewer/GlutWindow.hh | 2 +- examples/mesh_viewer/Main.cc | 6 +-- examples/mouse_picking/GlutWindow.cc | 16 +++---- examples/mouse_picking/GlutWindow.hh | 2 +- examples/mouse_picking/Main.cc | 4 +- examples/ogre2_demo/GlutWindow.cc | 14 +++--- examples/ogre2_demo/GlutWindow.hh | 2 +- examples/ogre2_demo/Main.cc | 6 +-- examples/render_pass/GlutWindow.cc | 10 ++-- examples/render_pass/GlutWindow.hh | 2 +- examples/render_pass/Main.cc | 4 +- examples/simple_demo/GlutWindow.cc | 8 ++-- examples/simple_demo/GlutWindow.hh | 2 +- examples/simple_demo/Main.cc | 4 +- examples/text_geom/GlutWindow.cc | 8 ++-- examples/text_geom/GlutWindow.hh | 2 +- examples/text_geom/Main.cc | 4 +- examples/thermal_camera/GlutWindow.cc | 10 ++-- examples/thermal_camera/GlutWindow.hh | 2 +- examples/thermal_camera/Main.cc | 6 +-- examples/transform_control/GlutWindow.cc | 14 +++--- examples/transform_control/GlutWindow.hh | 2 +- examples/transform_control/Main.cc | 4 +- examples/view_control/GlutWindow.cc | 12 ++--- examples/view_control/GlutWindow.hh | 2 +- examples/view_control/Main.cc | 4 +- include/gz/rendering/ArrowVisual.hh | 4 +- include/gz/rendering/AxisVisual.hh | 4 +- include/gz/rendering/Camera.hh | 16 +++---- include/gz/rendering/CompositeVisual.hh | 4 +- include/gz/rendering/DepthCamera.hh | 4 +- include/gz/rendering/GaussianNoisePass.hh | 6 +-- include/gz/rendering/Geometry.hh | 8 ++-- include/gz/rendering/GizmoVisual.hh | 10 ++-- include/gz/rendering/GpuRays.hh | 10 ++-- include/gz/rendering/Grid.hh | 6 +-- include/gz/rendering/Image.hh | 8 ++-- include/gz/rendering/Light.hh | 6 +-- include/gz/rendering/Marker.hh | 14 +++--- include/gz/rendering/Material.hh | 14 +++--- include/gz/rendering/Mesh.hh | 8 ++-- include/gz/rendering/MeshDescriptor.hh | 6 +-- include/gz/rendering/MoveToHelper.hh | 10 ++-- include/gz/rendering/Node.hh | 12 ++--- include/gz/rendering/Object.hh | 6 +-- include/gz/rendering/OrbitViewController.hh | 10 ++-- include/gz/rendering/PixelFormat.hh | 4 +- include/gz/rendering/RayQuery.hh | 12 ++--- include/gz/rendering/RenderEngine.hh | 6 +-- include/gz/rendering/RenderEngineManager.hh | 8 ++-- include/gz/rendering/RenderEnginePlugin.hh | 6 +-- include/gz/rendering/RenderPass.hh | 6 +-- include/gz/rendering/RenderPassSystem.hh | 10 ++-- include/gz/rendering/RenderTarget.hh | 10 ++-- include/gz/rendering/RenderTypes.hh | 2 +- include/gz/rendering/RenderingIface.hh | 6 +-- include/gz/rendering/Scene.hh | 18 +++---- include/gz/rendering/Sensor.hh | 4 +- include/gz/rendering/ShaderParam.hh | 6 +-- include/gz/rendering/ShaderParams.hh | 4 +- include/gz/rendering/ShaderType.hh | 4 +- include/gz/rendering/Storage.hh | 20 ++++---- include/gz/rendering/Text.hh | 10 ++-- include/gz/rendering/ThermalCamera.hh | 2 +- include/gz/rendering/TransformController.hh | 16 +++---- include/gz/rendering/TransformType.hh | 6 +-- include/gz/rendering/Utils.hh | 14 +++--- include/gz/rendering/ViewController.hh | 8 ++-- include/gz/rendering/Visual.hh | 4 +- include/gz/rendering/base/BaseArrowVisual.hh | 4 +- include/gz/rendering/base/BaseAxisVisual.hh | 6 +-- include/gz/rendering/base/BaseCamera.hh | 24 +++++----- include/gz/rendering/base/BaseDepthCamera.hh | 6 +-- .../rendering/base/BaseGaussianNoisePass.hh | 4 +- include/gz/rendering/base/BaseGeometry.hh | 4 +- include/gz/rendering/base/BaseGizmoVisual.hh | 16 +++---- include/gz/rendering/base/BaseGpuRays.hh | 22 ++++----- include/gz/rendering/base/BaseGrid.hh | 4 +- include/gz/rendering/base/BaseLight.hh | 2 +- include/gz/rendering/base/BaseMarker.hh | 8 ++-- include/gz/rendering/base/BaseMaterial.hh | 8 ++-- include/gz/rendering/base/BaseMesh.hh | 6 +-- include/gz/rendering/base/BaseNode.hh | 6 +-- include/gz/rendering/base/BaseObject.hh | 4 +- include/gz/rendering/base/BaseRayQuery.hh | 8 ++-- include/gz/rendering/base/BaseRenderEngine.hh | 6 +-- include/gz/rendering/base/BaseRenderPass.hh | 2 +- include/gz/rendering/base/BaseRenderTarget.hh | 8 ++-- include/gz/rendering/base/BaseRenderTypes.hh | 2 +- include/gz/rendering/base/BaseScene.hh | 10 ++-- include/gz/rendering/base/BaseSensor.hh | 2 +- include/gz/rendering/base/BaseStorage.hh | 6 +-- include/gz/rendering/base/BaseText.hh | 4 +- .../gz/rendering/base/BaseThermalCamera.hh | 4 +- include/gz/rendering/base/BaseVisual.hh | 8 ++-- include/gz/rendering/base/base.hh.in | 2 +- include/gz/rendering/rendering.hh.in | 2 +- .../gz/rendering/ogre/OgreArrowVisual.hh | 4 +- .../gz/rendering/ogre/OgreAxisVisual.hh | 4 +- ogre/include/gz/rendering/ogre/OgreCamera.hh | 8 ++-- .../gz/rendering/ogre/OgreConversions.hh | 14 +++--- .../gz/rendering/ogre/OgreDepthCamera.hh | 24 +++++----- .../gz/rendering/ogre/OgreDynamicLines.hh | 8 ++-- .../rendering/ogre/OgreDynamicRenderable.hh | 8 ++-- .../rendering/ogre/OgreGaussianNoisePass.hh | 10 ++-- .../include/gz/rendering/ogre/OgreGeometry.hh | 6 +-- .../gz/rendering/ogre/OgreGizmoVisual.hh | 4 +- ogre/include/gz/rendering/ogre/OgreGpuRays.hh | 22 ++++----- ogre/include/gz/rendering/ogre/OgreGrid.hh | 6 +-- ogre/include/gz/rendering/ogre/OgreLight.hh | 6 +-- ogre/include/gz/rendering/ogre/OgreMarker.hh | 6 +-- .../include/gz/rendering/ogre/OgreMaterial.hh | 8 ++-- .../gz/rendering/ogre/OgreMaterialSwitcher.hh | 12 ++--- ogre/include/gz/rendering/ogre/OgreMesh.hh | 8 ++-- .../gz/rendering/ogre/OgreMeshFactory.hh | 6 +-- ogre/include/gz/rendering/ogre/OgreNode.hh | 8 ++-- ogre/include/gz/rendering/ogre/OgreObject.hh | 8 ++-- .../gz/rendering/ogre/OgreRTShaderSystem.hh | 8 ++-- .../include/gz/rendering/ogre/OgreRayQuery.hh | 8 ++-- .../gz/rendering/ogre/OgreRenderEngine.hh | 16 +++---- .../gz/rendering/ogre/OgreRenderPass.hh | 8 ++-- .../gz/rendering/ogre/OgreRenderTarget.hh | 16 +++---- .../ogre/OgreRenderTargetMaterial.hh | 8 ++-- .../gz/rendering/ogre/OgreRenderTypes.hh | 2 +- ogre/include/gz/rendering/ogre/OgreScene.hh | 6 +-- .../gz/rendering/ogre/OgreSelectionBuffer.hh | 4 +- ogre/include/gz/rendering/ogre/OgreSensor.hh | 4 +- ogre/include/gz/rendering/ogre/OgreStorage.hh | 18 +++---- ogre/include/gz/rendering/ogre/OgreText.hh | 12 ++--- .../gz/rendering/ogre/OgreThermalCamera.hh | 24 +++++----- ogre/include/gz/rendering/ogre/OgreVisual.hh | 6 +-- ogre/include/gz/rendering/ogre/ogre.hh.in | 2 +- ogre/src/OgreArrowVisual.cc | 2 +- ogre/src/OgreAxisVisual.cc | 2 +- ogre/src/OgreCamera.cc | 16 +++---- ogre/src/OgreConversions.cc | 2 +- ogre/src/OgreDepthCamera.cc | 6 +-- ogre/src/OgreDynamicLines.cc | 6 +-- ogre/src/OgreDynamicRenderable.cc | 4 +- ogre/src/OgreGaussianNoisePass.cc | 8 ++-- ogre/src/OgreGeometry.cc | 6 +-- ogre/src/OgreGizmoVisual.cc | 2 +- ogre/src/OgreGpuRays.cc | 18 +++---- ogre/src/OgreGrid.cc | 8 ++-- ogre/src/OgreLight.cc | 10 ++-- ogre/src/OgreMarker.cc | 12 ++--- ogre/src/OgreMaterial.cc | 18 +++---- ogre/src/OgreMaterialSwitcher.cc | 8 ++-- ogre/src/OgreMesh.cc | 12 ++--- ogre/src/OgreMeshFactory.cc | 28 +++++------ ogre/src/OgreNode.cc | 12 ++--- ogre/src/OgreObject.cc | 4 +- ogre/src/OgreRTShaderSystem.cc | 20 ++++---- ogre/src/OgreRayQuery.cc | 12 ++--- ogre/src/OgreRenderEngine.cc | 26 +++++----- ogre/src/OgreRenderPass.cc | 2 +- ogre/src/OgreRenderTarget.cc | 26 +++++----- ogre/src/OgreRenderTargetMaterial.cc | 4 +- ogre/src/OgreScene.cc | 48 +++++++++---------- ogre/src/OgreSelectionBuffer.cc | 12 ++--- ogre/src/OgreSensor.cc | 2 +- ogre/src/OgreText.cc | 10 ++-- ogre/src/OgreThermalCamera.cc | 10 ++-- ogre/src/OgreVisual.cc | 8 ++-- .../include/gz/rendering/ogre2/Ogre2Camera.hh | 6 +-- .../gz/rendering/ogre2/Ogre2Conversions.hh | 16 +++---- .../gz/rendering/ogre2/Ogre2DepthCamera.hh | 10 ++-- .../rendering/ogre2/Ogre2DynamicRenderable.hh | 8 ++-- .../rendering/ogre2/Ogre2GaussianNoisePass.hh | 8 ++-- .../gz/rendering/ogre2/Ogre2Geometry.hh | 4 +- .../gz/rendering/ogre2/Ogre2GizmoVisual.hh | 4 +- .../gz/rendering/ogre2/Ogre2GpuRays.hh | 22 ++++----- ogre2/include/gz/rendering/ogre2/Ogre2Grid.hh | 6 +-- .../include/gz/rendering/ogre2/Ogre2Light.hh | 6 +-- .../include/gz/rendering/ogre2/Ogre2Marker.hh | 6 +-- .../gz/rendering/ogre2/Ogre2Material.hh | 6 +-- .../rendering/ogre2/Ogre2MaterialSwitcher.hh | 10 ++-- ogre2/include/gz/rendering/ogre2/Ogre2Mesh.hh | 8 ++-- .../gz/rendering/ogre2/Ogre2MeshFactory.hh | 10 ++-- ogre2/include/gz/rendering/ogre2/Ogre2Node.hh | 6 +-- .../include/gz/rendering/ogre2/Ogre2Object.hh | 8 ++-- .../gz/rendering/ogre2/Ogre2RayQuery.hh | 8 ++-- .../gz/rendering/ogre2/Ogre2RenderEngine.hh | 12 ++--- .../gz/rendering/ogre2/Ogre2RenderPass.hh | 8 ++-- .../gz/rendering/ogre2/Ogre2RenderTarget.hh | 12 ++--- .../ogre2/Ogre2RenderTargetMaterial.hh | 6 +-- .../gz/rendering/ogre2/Ogre2RenderTypes.hh | 4 +- .../include/gz/rendering/ogre2/Ogre2Scene.hh | 8 ++-- .../rendering/ogre2/Ogre2SelectionBuffer.hh | 4 +- .../include/gz/rendering/ogre2/Ogre2Sensor.hh | 4 +- .../gz/rendering/ogre2/Ogre2Storage.hh | 14 +++--- .../gz/rendering/ogre2/Ogre2ThermalCamera.hh | 12 ++--- .../include/gz/rendering/ogre2/Ogre2Visual.hh | 6 +-- ogre2/include/gz/rendering/ogre2/ogre2.hh.in | 2 +- ogre2/src/Ogre2Camera.cc | 16 +++---- ogre2/src/Ogre2Conversions.cc | 2 +- ogre2/src/Ogre2DepthCamera.cc | 24 +++++----- ogre2/src/Ogre2DynamicRenderable.cc | 12 ++--- ogre2/src/Ogre2GaussianNoisePass.cc | 10 ++-- ogre2/src/Ogre2Geometry.cc | 6 +-- ogre2/src/Ogre2GizmoVisual.cc | 2 +- ogre2/src/Ogre2GpuRays.cc | 34 ++++++------- ogre2/src/Ogre2Grid.cc | 10 ++-- ogre2/src/Ogre2Light.cc | 10 ++-- ogre2/src/Ogre2Marker.cc | 16 +++---- ogre2/src/Ogre2Material.cc | 18 +++---- ogre2/src/Ogre2MaterialSwitcher.cc | 10 ++-- ogre2/src/Ogre2Mesh.cc | 12 ++--- ogre2/src/Ogre2MeshFactory.cc | 30 ++++++------ ogre2/src/Ogre2Node.cc | 12 ++--- ogre2/src/Ogre2Object.cc | 6 +-- ogre2/src/Ogre2RayQuery.cc | 20 ++++---- ogre2/src/Ogre2RenderEngine.cc | 24 +++++----- ogre2/src/Ogre2RenderPass.cc | 2 +- ogre2/src/Ogre2RenderTarget.cc | 18 +++---- ogre2/src/Ogre2RenderTargetMaterial.cc | 2 +- ogre2/src/Ogre2Scene.cc | 44 ++++++++--------- ogre2/src/Ogre2SelectionBuffer.cc | 20 ++++---- ogre2/src/Ogre2Sensor.cc | 2 +- ogre2/src/Ogre2ThermalCamera.cc | 26 +++++----- ogre2/src/Ogre2Visual.cc | 12 ++--- .../gz/rendering/optix/OptixArrowVisual.hh | 4 +- .../gz/rendering/optix/OptixAxisVisual.hh | 4 +- optix/include/gz/rendering/optix/OptixBox.hh | 2 +- .../include/gz/rendering/optix/OptixCamera.hh | 6 +-- optix/include/gz/rendering/optix/OptixCone.hh | 2 +- .../gz/rendering/optix/OptixConversions.hh | 12 ++--- .../gz/rendering/optix/OptixCylinder.hh | 2 +- .../gz/rendering/optix/OptixGeometry.hh | 6 +-- optix/include/gz/rendering/optix/OptixGrid.hh | 8 ++-- .../include/gz/rendering/optix/OptixLight.hh | 8 ++-- .../gz/rendering/optix/OptixLightManager.hh | 10 ++-- .../gz/rendering/optix/OptixMaterial.hh | 6 +-- optix/include/gz/rendering/optix/OptixMesh.hh | 8 ++-- .../gz/rendering/optix/OptixMeshFactory.hh | 10 ++-- optix/include/gz/rendering/optix/OptixNode.hh | 8 ++-- .../include/gz/rendering/optix/OptixObject.hh | 6 +-- .../gz/rendering/optix/OptixPrimitive.hh | 2 +- .../gz/rendering/optix/OptixRenderEngine.hh | 8 ++-- .../gz/rendering/optix/OptixRenderTarget.hh | 8 ++-- .../gz/rendering/optix/OptixRenderTypes.hh | 2 +- .../include/gz/rendering/optix/OptixScene.hh | 8 ++-- .../include/gz/rendering/optix/OptixSensor.hh | 4 +- .../include/gz/rendering/optix/OptixSphere.hh | 2 +- .../gz/rendering/optix/OptixStorage.hh | 18 +++---- .../gz/rendering/optix/OptixTextureFactory.hh | 6 +-- .../include/gz/rendering/optix/OptixVisual.hh | 6 +-- optix/include/gz/rendering/optix/optix.hh.in | 2 +- optix/src/OptixArrowVisual.cc | 2 +- optix/src/OptixAxisVisual.cc | 2 +- optix/src/OptixBox.cc | 2 +- optix/src/OptixCamera.cc | 10 ++-- optix/src/OptixCamera.cu | 2 +- optix/src/OptixCone.cc | 2 +- optix/src/OptixConversions.cc | 2 +- optix/src/OptixCylinder.cc | 2 +- optix/src/OptixGeometry.cc | 6 +-- optix/src/OptixGrid.cc | 6 +-- optix/src/OptixLight.cc | 10 ++-- optix/src/OptixLightManager.cc | 8 ++-- optix/src/OptixMaterial.cc | 12 ++--- optix/src/OptixMaterial.cu | 4 +- optix/src/OptixMesh.cc | 10 ++-- optix/src/OptixMeshFactory.cc | 10 ++-- optix/src/OptixMissProgram.cu | 2 +- optix/src/OptixNode.cc | 10 ++-- optix/src/OptixObject.cc | 4 +- optix/src/OptixPrimitive.cc | 8 ++-- optix/src/OptixRenderEngine.cc | 12 ++--- optix/src/OptixRenderTarget.cc | 8 ++-- optix/src/OptixScene.cc | 38 +++++++-------- optix/src/OptixSensor.cc | 2 +- optix/src/OptixSphere.cc | 2 +- optix/src/OptixTextureFactory.cc | 8 ++-- optix/src/OptixVisual.cc | 8 ++-- src/Camera_TEST.cc | 14 +++--- src/GaussianNoisePass.cc | 2 +- src/GaussianNoisePass_TEST.cc | 10 ++-- src/GizmoVisual_TEST.cc | 10 ++-- src/Grid_TEST.cc | 10 ++-- src/Image.cc | 2 +- src/Light_TEST.cc | 10 ++-- src/Marker.cc | 2 +- src/Marker_TEST.cc | 10 ++-- src/Material_TEST.cc | 16 +++---- src/MeshDescriptor.cc | 8 ++-- src/MeshDescriptor_TEST.cc | 14 +++--- src/Mesh_TEST.cc | 12 ++--- src/MoveToHelper.cc | 10 ++-- src/MoveToHelper_TEST.cc | 10 ++-- src/Node_TEST.cc | 12 ++--- src/OrbitViewController.cc | 8 ++-- src/OrbitViewController_TEST.cc | 12 ++--- src/PixelFormat.cc | 4 +- src/PixelFormat_TEST.cc | 2 +- src/RayQuery_TEST.cc | 12 ++--- src/RenderEngineManager.cc | 14 +++--- src/RenderEnginePlugin.cc | 2 +- src/RenderEngine_TEST.cc | 8 ++-- src/RenderPassSystem.cc | 4 +- src/RenderPassSystem_TEST.cc | 10 ++-- src/RenderTarget_TEST.cc | 16 +++---- src/RenderingIface.cc | 10 ++-- src/RenderingIface_TEST.cc | 8 ++-- src/Scene_TEST.cc | 10 ++-- src/ShaderParam.cc | 2 +- src/ShaderParam_TEST.cc | 2 +- src/ShaderParams.cc | 2 +- src/ShaderParams_TEST.cc | 2 +- src/ShaderType.cc | 4 +- src/Text_TEST.cc | 10 ++-- src/ThermalCamera_TEST.cc | 10 ++-- src/TransformController.cc | 16 +++---- src/TransformController_TEST.cc | 12 ++--- src/Utils.cc | 12 ++--- src/Utils_TEST.cc | 18 +++---- src/Visual_TEST.cc | 12 ++--- src/base/BaseObject.cc | 2 +- src/base/BaseRenderEngine.cc | 6 +-- src/base/BaseScene.cc | 44 ++++++++--------- test/integration/camera.cc | 10 ++-- test/integration/depth_camera.cc | 14 +++--- test/integration/gpu_rays.cc | 14 +++--- test/integration/render_pass.cc | 22 ++++----- test/integration/scene.cc | 10 ++-- test/integration/shadows.cc | 16 +++---- test/integration/thermal_camera.cc | 14 +++--- test/performance/scene_factory.cc | 8 ++-- test/test_config.h.in | 2 +- 350 files changed, 1522 insertions(+), 1522 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e2e675a88..690a0c672 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ find_package(ignition-cmake2 2.14.0 REQUIRED) #============================================================================ ign_configure_project( REPLACE_IGNITION_INCLUDE_PATH gz/rendering - VERSION_SUFFIX pre1 + VERSION_SUFFIX ) #============================================================================ diff --git a/examples/actor_animation/GlutWindow.cc b/examples/actor_animation/GlutWindow.cc index deab60a2e..fd321cbf9 100644 --- a/examples/actor_animation/GlutWindow.cc +++ b/examples/actor_animation/GlutWindow.cc @@ -33,16 +33,16 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "GlutWindow.hh" #include "example_config.hh" diff --git a/examples/actor_animation/GlutWindow.hh b/examples/actor_animation/GlutWindow.hh index c6246f113..c8d8ab3c7 100644 --- a/examples/actor_animation/GlutWindow.hh +++ b/examples/actor_animation/GlutWindow.hh @@ -18,8 +18,8 @@ #define GZ_RENDERING_EXAMPLES_ACTOR_ANIMATION_GLUTWINDOW_HH_ #include -#include "ignition/rendering/RenderTypes.hh" -#include "ignition/common/graphics/Types.hh" +#include "gz/rendering/RenderTypes.hh" +#include "gz/common/graphics/Types.hh" namespace ir = gz::rendering; namespace ic = gz::common; diff --git a/examples/actor_animation/Main.cc b/examples/actor_animation/Main.cc index acee916a9..db431f6e6 100644 --- a/examples/actor_animation/Main.cc +++ b/examples/actor_animation/Main.cc @@ -27,11 +27,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "example_config.hh" #include "GlutWindow.hh" diff --git a/examples/camera_tracking/GlutWindow.cc b/examples/camera_tracking/GlutWindow.cc index 60241e02d..b4f66ead2 100644 --- a/examples/camera_tracking/GlutWindow.cc +++ b/examples/camera_tracking/GlutWindow.cc @@ -31,12 +31,12 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "GlutWindow.hh" diff --git a/examples/camera_tracking/GlutWindow.hh b/examples/camera_tracking/GlutWindow.hh index bf378309a..8670a65b8 100644 --- a/examples/camera_tracking/GlutWindow.hh +++ b/examples/camera_tracking/GlutWindow.hh @@ -18,7 +18,7 @@ #define GZ_RENDERING_EXAMPLES_CAMERA_TRACKING_GLUTWINDOW_HH_ #include -#include +#include namespace ir = gz::rendering; diff --git a/examples/camera_tracking/Main.cc b/examples/camera_tracking/Main.cc index 584462605..4dad951fb 100644 --- a/examples/camera_tracking/Main.cc +++ b/examples/camera_tracking/Main.cc @@ -27,8 +27,8 @@ #include #include -#include -#include +#include +#include #include "GlutWindow.hh" using namespace gz; diff --git a/examples/custom_scene_viewer/DemoWindow.cc b/examples/custom_scene_viewer/DemoWindow.cc index acb1223e1..64b03bd67 100644 --- a/examples/custom_scene_viewer/DemoWindow.cc +++ b/examples/custom_scene_viewer/DemoWindow.cc @@ -32,7 +32,7 @@ #include #include -#include +#include #include "ManualSceneDemo.hh" #include "DemoWindow.hh" diff --git a/examples/custom_scene_viewer/ManualSceneDemo.cc b/examples/custom_scene_viewer/ManualSceneDemo.cc index 97e9c0c49..68fe501e2 100644 --- a/examples/custom_scene_viewer/ManualSceneDemo.cc +++ b/examples/custom_scene_viewer/ManualSceneDemo.cc @@ -15,7 +15,7 @@ * */ #include -#include +#include #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 index cc84d15ae..766a9ad19 100644 --- a/examples/custom_scene_viewer/ManualSceneDemo.hh +++ b/examples/custom_scene_viewer/ManualSceneDemo.hh @@ -18,7 +18,7 @@ #define GZ_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_MANUALSCENEDEMO_HH_ #include -#include +#include #include "TestTypes.hh" namespace gz diff --git a/examples/custom_scene_viewer/TestTypes.hh b/examples/custom_scene_viewer/TestTypes.hh index d8bc04e18..020cbb40c 100644 --- a/examples/custom_scene_viewer/TestTypes.hh +++ b/examples/custom_scene_viewer/TestTypes.hh @@ -18,7 +18,7 @@ #define GZ_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_TESTYPES_HH_ #include -#include +#include namespace gz { diff --git a/examples/custom_shaders/custom_shaders.cc b/examples/custom_shaders/custom_shaders.cc index d76743864..ec02581c7 100644 --- a/examples/custom_shaders/custom_shaders.cc +++ b/examples/custom_shaders/custom_shaders.cc @@ -14,9 +14,9 @@ * limitations under the License. * */ -#include -#include -#include +#include +#include +#include #include "example_config.hh" diff --git a/examples/gazebo_scene_viewer/CameraWindow.cc b/examples/gazebo_scene_viewer/CameraWindow.cc index 6ffb0547b..6b60d23f9 100644 --- a/examples/gazebo_scene_viewer/CameraWindow.cc +++ b/examples/gazebo_scene_viewer/CameraWindow.cc @@ -31,10 +31,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include "SceneManager.hh" diff --git a/examples/gazebo_scene_viewer/CameraWindow.hh b/examples/gazebo_scene_viewer/CameraWindow.hh index efed62246..0ed0bb3e4 100644 --- a/examples/gazebo_scene_viewer/CameraWindow.hh +++ b/examples/gazebo_scene_viewer/CameraWindow.hh @@ -18,7 +18,7 @@ #define GZ_RENDERING_EXAMPLES_CAMERAWINDOW_HH_ #include -#include "ignition/rendering/RenderTypes.hh" +#include "gz/rendering/RenderTypes.hh" namespace gz = gz::rendering; diff --git a/examples/gazebo_scene_viewer/GazeboDemo.cc b/examples/gazebo_scene_viewer/GazeboDemo.cc index c99752b18..06d613a4c 100644 --- a/examples/gazebo_scene_viewer/GazeboDemo.cc +++ b/examples/gazebo_scene_viewer/GazeboDemo.cc @@ -18,7 +18,7 @@ #include #include -#include +#include #include "CameraWindow.hh" #include "SceneManager.hh" diff --git a/examples/gazebo_scene_viewer/GazeboWorldDemo.cc b/examples/gazebo_scene_viewer/GazeboWorldDemo.cc index b0679c42c..57a758095 100644 --- a/examples/gazebo_scene_viewer/GazeboWorldDemo.cc +++ b/examples/gazebo_scene_viewer/GazeboWorldDemo.cc @@ -15,10 +15,10 @@ * */ #include -#include +#include #include -#include +#include #include "CameraWindow.hh" #include "SceneManager.hh" diff --git a/examples/gazebo_scene_viewer/SceneManager.cc b/examples/gazebo_scene_viewer/SceneManager.cc index bcbadf44f..3c603583a 100644 --- a/examples/gazebo_scene_viewer/SceneManager.cc +++ b/examples/gazebo_scene_viewer/SceneManager.cc @@ -17,9 +17,9 @@ #include -#include -#include -#include +#include +#include +#include #include "SceneManager.hh" #include "SceneManagerPrivate.hh" diff --git a/examples/gazebo_scene_viewer/SceneManager.hh b/examples/gazebo_scene_viewer/SceneManager.hh index 1c74d14fe..62ef3758d 100644 --- a/examples/gazebo_scene_viewer/SceneManager.hh +++ b/examples/gazebo_scene_viewer/SceneManager.hh @@ -27,8 +27,8 @@ #endif #include -#include -#include "ignition/rendering/RenderTypes.hh" +#include +#include "gz/rendering/RenderTypes.hh" namespace gz { diff --git a/examples/gazebo_scene_viewer/SceneManagerPrivate.hh b/examples/gazebo_scene_viewer/SceneManagerPrivate.hh index 78c7bc487..29a7600f7 100644 --- a/examples/gazebo_scene_viewer/SceneManagerPrivate.hh +++ b/examples/gazebo_scene_viewer/SceneManagerPrivate.hh @@ -21,13 +21,13 @@ #include #include -#include +#include -#include -#include +#include +#include -#include "ignition/rendering/RenderTypes.hh" -#include "ignition/rendering/ShaderType.hh" +#include "gz/rendering/RenderTypes.hh" +#include "gz/rendering/ShaderType.hh" #include "gazebo/transport/Node.hh" namespace gz diff --git a/examples/hello_world_plugin/HelloWorldPlugin.cc b/examples/hello_world_plugin/HelloWorldPlugin.cc index 16da69265..e3348b912 100644 --- a/examples/hello_world_plugin/HelloWorldPlugin.cc +++ b/examples/hello_world_plugin/HelloWorldPlugin.cc @@ -15,13 +15,13 @@ * */ -#include +#include -#include +#include -#include "ignition/rendering/RenderEnginePlugin.hh" -#include "ignition/rendering/base/BaseRenderEngine.hh" -#include "ignition/rendering/base/BaseRenderTypes.hh" +#include "gz/rendering/RenderEnginePlugin.hh" +#include "gz/rendering/base/BaseRenderEngine.hh" +#include "gz/rendering/base/BaseRenderTypes.hh" namespace mock { diff --git a/examples/mesh_viewer/GlutWindow.cc b/examples/mesh_viewer/GlutWindow.cc index 534c963ee..02413dffd 100644 --- a/examples/mesh_viewer/GlutWindow.cc +++ b/examples/mesh_viewer/GlutWindow.cc @@ -31,12 +31,12 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "GlutWindow.hh" diff --git a/examples/mesh_viewer/GlutWindow.hh b/examples/mesh_viewer/GlutWindow.hh index 51846dcaa..7674df2c3 100644 --- a/examples/mesh_viewer/GlutWindow.hh +++ b/examples/mesh_viewer/GlutWindow.hh @@ -18,7 +18,7 @@ #define GZ_RENDERING_EXAMPLES_MESH_VIEWER_GLUTWINDOW_HH_ #include -#include "ignition/rendering/RenderTypes.hh" +#include "gz/rendering/RenderTypes.hh" namespace ir = gz::rendering; diff --git a/examples/mesh_viewer/Main.cc b/examples/mesh_viewer/Main.cc index 96d68adb2..8d444a7ce 100644 --- a/examples/mesh_viewer/Main.cc +++ b/examples/mesh_viewer/Main.cc @@ -27,9 +27,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "example_config.hh" #include "GlutWindow.hh" diff --git a/examples/mouse_picking/GlutWindow.cc b/examples/mouse_picking/GlutWindow.cc index e761943b4..43a6dcac6 100644 --- a/examples/mouse_picking/GlutWindow.cc +++ b/examples/mouse_picking/GlutWindow.cc @@ -31,14 +31,14 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "GlutWindow.hh" diff --git a/examples/mouse_picking/GlutWindow.hh b/examples/mouse_picking/GlutWindow.hh index 51ee13205..5cb582744 100644 --- a/examples/mouse_picking/GlutWindow.hh +++ b/examples/mouse_picking/GlutWindow.hh @@ -18,7 +18,7 @@ #define GZ_RENDERING_EXAMPLES_MOUSE_PICKING_GLUTWINDOW_HH_ #include -#include "ignition/rendering/RenderTypes.hh" +#include "gz/rendering/RenderTypes.hh" namespace ir = gz::rendering; diff --git a/examples/mouse_picking/Main.cc b/examples/mouse_picking/Main.cc index 4eacdab1e..b9168a651 100644 --- a/examples/mouse_picking/Main.cc +++ b/examples/mouse_picking/Main.cc @@ -27,8 +27,8 @@ #include #include -#include -#include +#include +#include #include "GlutWindow.hh" diff --git a/examples/ogre2_demo/GlutWindow.cc b/examples/ogre2_demo/GlutWindow.cc index e4488dfab..5906e839f 100644 --- a/examples/ogre2_demo/GlutWindow.cc +++ b/examples/ogre2_demo/GlutWindow.cc @@ -31,13 +31,13 @@ #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include "GlutWindow.hh" diff --git a/examples/ogre2_demo/GlutWindow.hh b/examples/ogre2_demo/GlutWindow.hh index fc0095d9b..55f47a778 100644 --- a/examples/ogre2_demo/GlutWindow.hh +++ b/examples/ogre2_demo/GlutWindow.hh @@ -18,7 +18,7 @@ #define GZ_RENDERING_EXAMPLES_OGRE2_DEMO_GLUTWINDOW_HH_ #include -#include "ignition/rendering/RenderTypes.hh" +#include "gz/rendering/RenderTypes.hh" namespace ir = gz::rendering; diff --git a/examples/ogre2_demo/Main.cc b/examples/ogre2_demo/Main.cc index ee5a25a8c..6f9dda6bb 100644 --- a/examples/ogre2_demo/Main.cc +++ b/examples/ogre2_demo/Main.cc @@ -27,9 +27,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "example_config.hh" #include "GlutWindow.hh" diff --git a/examples/render_pass/GlutWindow.cc b/examples/render_pass/GlutWindow.cc index 9887c8c92..c39c183d9 100644 --- a/examples/render_pass/GlutWindow.cc +++ b/examples/render_pass/GlutWindow.cc @@ -31,11 +31,11 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "GlutWindow.hh" diff --git a/examples/render_pass/GlutWindow.hh b/examples/render_pass/GlutWindow.hh index 7463724c9..ef9893513 100644 --- a/examples/render_pass/GlutWindow.hh +++ b/examples/render_pass/GlutWindow.hh @@ -18,7 +18,7 @@ #define GZ_RENDERING_EXAMPLES_SIMPLE_DEMO_GLUTWINDOW_HH_ #include -#include "ignition/rendering/RenderTypes.hh" +#include "gz/rendering/RenderTypes.hh" namespace ir = gz::rendering; diff --git a/examples/render_pass/Main.cc b/examples/render_pass/Main.cc index d344451ef..5ef88c2d7 100644 --- a/examples/render_pass/Main.cc +++ b/examples/render_pass/Main.cc @@ -27,8 +27,8 @@ #include #include -#include -#include +#include +#include #include "GlutWindow.hh" diff --git a/examples/simple_demo/GlutWindow.cc b/examples/simple_demo/GlutWindow.cc index 50dd96ade..0542b5e79 100644 --- a/examples/simple_demo/GlutWindow.cc +++ b/examples/simple_demo/GlutWindow.cc @@ -31,10 +31,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include "GlutWindow.hh" diff --git a/examples/simple_demo/GlutWindow.hh b/examples/simple_demo/GlutWindow.hh index 9cd7b4758..3b757b280 100644 --- a/examples/simple_demo/GlutWindow.hh +++ b/examples/simple_demo/GlutWindow.hh @@ -18,7 +18,7 @@ #define GZ_RENDERING_EXAMPLES_SIMPLE_DEMO_GLUTWINDOW_HH_ #include -#include "ignition/rendering/RenderTypes.hh" +#include "gz/rendering/RenderTypes.hh" namespace ir = gz::rendering; diff --git a/examples/simple_demo/Main.cc b/examples/simple_demo/Main.cc index d9996ef01..b1f1dd9ad 100644 --- a/examples/simple_demo/Main.cc +++ b/examples/simple_demo/Main.cc @@ -27,8 +27,8 @@ #include #include -#include -#include +#include +#include #include "GlutWindow.hh" diff --git a/examples/text_geom/GlutWindow.cc b/examples/text_geom/GlutWindow.cc index 9dc6648ef..df485dc9b 100644 --- a/examples/text_geom/GlutWindow.cc +++ b/examples/text_geom/GlutWindow.cc @@ -31,10 +31,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include "GlutWindow.hh" diff --git a/examples/text_geom/GlutWindow.hh b/examples/text_geom/GlutWindow.hh index a8598e5b8..2aaf4f11e 100644 --- a/examples/text_geom/GlutWindow.hh +++ b/examples/text_geom/GlutWindow.hh @@ -18,7 +18,7 @@ #define GZ_RENDERING_EXAMPLES_SIMPLE_DEMO_GLUTWINDOW_HH_ #include -#include "ignition/rendering/RenderTypes.hh" +#include "gz/rendering/RenderTypes.hh" namespace ir = gz::rendering; diff --git a/examples/text_geom/Main.cc b/examples/text_geom/Main.cc index 68b572038..1b208a64b 100644 --- a/examples/text_geom/Main.cc +++ b/examples/text_geom/Main.cc @@ -27,8 +27,8 @@ #include #include -#include -#include +#include +#include #include "GlutWindow.hh" diff --git a/examples/thermal_camera/GlutWindow.cc b/examples/thermal_camera/GlutWindow.cc index 92333c441..51b547ef5 100644 --- a/examples/thermal_camera/GlutWindow.cc +++ b/examples/thermal_camera/GlutWindow.cc @@ -31,11 +31,11 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "GlutWindow.hh" diff --git a/examples/thermal_camera/GlutWindow.hh b/examples/thermal_camera/GlutWindow.hh index cb173329e..d16b9b537 100644 --- a/examples/thermal_camera/GlutWindow.hh +++ b/examples/thermal_camera/GlutWindow.hh @@ -18,7 +18,7 @@ #define GZ_RENDERING_EXAMPLES_THERMAL_CAMERA_GLUTWINDOW_HH_ #include -#include "ignition/rendering/RenderTypes.hh" +#include "gz/rendering/RenderTypes.hh" namespace ir = gz::rendering; diff --git a/examples/thermal_camera/Main.cc b/examples/thermal_camera/Main.cc index b6a63397c..2e4f7da91 100644 --- a/examples/thermal_camera/Main.cc +++ b/examples/thermal_camera/Main.cc @@ -27,9 +27,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "example_config.hh" #include "GlutWindow.hh" diff --git a/examples/transform_control/GlutWindow.cc b/examples/transform_control/GlutWindow.cc index 5b431b6cc..23466b249 100644 --- a/examples/transform_control/GlutWindow.cc +++ b/examples/transform_control/GlutWindow.cc @@ -31,13 +31,13 @@ #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include "GlutWindow.hh" diff --git a/examples/transform_control/GlutWindow.hh b/examples/transform_control/GlutWindow.hh index 932463d4b..f162a70e6 100644 --- a/examples/transform_control/GlutWindow.hh +++ b/examples/transform_control/GlutWindow.hh @@ -18,7 +18,7 @@ #define GZ_RENDERING_EXAMPLES_TRANSFORMCONTROL_GLUTWINDOW_HH_ #include -#include "ignition/rendering/RenderTypes.hh" +#include "gz/rendering/RenderTypes.hh" namespace ir = gz::rendering; diff --git a/examples/transform_control/Main.cc b/examples/transform_control/Main.cc index 3db1542fb..ccde86e62 100644 --- a/examples/transform_control/Main.cc +++ b/examples/transform_control/Main.cc @@ -27,8 +27,8 @@ #include #include -#include -#include +#include +#include #include "GlutWindow.hh" diff --git a/examples/view_control/GlutWindow.cc b/examples/view_control/GlutWindow.cc index ab03f03df..a33a45ab1 100644 --- a/examples/view_control/GlutWindow.cc +++ b/examples/view_control/GlutWindow.cc @@ -31,12 +31,12 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "GlutWindow.hh" diff --git a/examples/view_control/GlutWindow.hh b/examples/view_control/GlutWindow.hh index 8798c0568..8451263aa 100644 --- a/examples/view_control/GlutWindow.hh +++ b/examples/view_control/GlutWindow.hh @@ -18,7 +18,7 @@ #define GZ_RENDERING_EXAMPLES_VIEW_CONTROL_GLUTWINDOW_HH_ #include -#include "ignition/rendering/RenderTypes.hh" +#include "gz/rendering/RenderTypes.hh" namespace ir = gz::rendering; diff --git a/examples/view_control/Main.cc b/examples/view_control/Main.cc index dc39bc0b6..0eedbe5f3 100644 --- a/examples/view_control/Main.cc +++ b/examples/view_control/Main.cc @@ -27,8 +27,8 @@ #include #include -#include -#include +#include +#include #include "GlutWindow.hh" using namespace gz; diff --git a/include/gz/rendering/ArrowVisual.hh b/include/gz/rendering/ArrowVisual.hh index b6ee07c1d..cff3743b8 100644 --- a/include/gz/rendering/ArrowVisual.hh +++ b/include/gz/rendering/ArrowVisual.hh @@ -17,8 +17,8 @@ #ifndef GZ_RENDERING_ARROWVISUAL_HH_ #define GZ_RENDERING_ARROWVISUAL_HH_ -#include "ignition/rendering/config.hh" -#include "ignition/rendering/CompositeVisual.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/CompositeVisual.hh" namespace gz { diff --git a/include/gz/rendering/AxisVisual.hh b/include/gz/rendering/AxisVisual.hh index 1626c3879..873fc5ef9 100644 --- a/include/gz/rendering/AxisVisual.hh +++ b/include/gz/rendering/AxisVisual.hh @@ -17,8 +17,8 @@ #ifndef GZ_RENDERING_AXISVISUAL_HH_ #define GZ_RENDERING_AXISVISUAL_HH_ -#include "ignition/rendering/config.hh" -#include "ignition/rendering/CompositeVisual.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/CompositeVisual.hh" namespace gz { diff --git a/include/gz/rendering/Camera.hh b/include/gz/rendering/Camera.hh index 876a66307..3859e84db 100644 --- a/include/gz/rendering/Camera.hh +++ b/include/gz/rendering/Camera.hh @@ -19,14 +19,14 @@ #include -#include -#include - -#include "ignition/rendering/config.hh" -#include "ignition/rendering/Image.hh" -#include "ignition/rendering/PixelFormat.hh" -#include "ignition/rendering/Sensor.hh" -#include "ignition/rendering/Scene.hh" +#include +#include + +#include "gz/rendering/config.hh" +#include "gz/rendering/Image.hh" +#include "gz/rendering/PixelFormat.hh" +#include "gz/rendering/Sensor.hh" +#include "gz/rendering/Scene.hh" namespace gz diff --git a/include/gz/rendering/CompositeVisual.hh b/include/gz/rendering/CompositeVisual.hh index 78db8d54c..af4e4627e 100644 --- a/include/gz/rendering/CompositeVisual.hh +++ b/include/gz/rendering/CompositeVisual.hh @@ -17,8 +17,8 @@ #ifndef GZ_RENDERING_COMPOSITEVISUAL_HH_ #define GZ_RENDERING_COMPOSITEVISUAL_HH_ -#include "ignition/rendering/config.hh" -#include "ignition/rendering/Visual.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/Visual.hh" namespace gz { diff --git a/include/gz/rendering/DepthCamera.hh b/include/gz/rendering/DepthCamera.hh index 2c14851b9..9c447362f 100644 --- a/include/gz/rendering/DepthCamera.hh +++ b/include/gz/rendering/DepthCamera.hh @@ -19,8 +19,8 @@ #include -#include -#include "ignition/rendering/Camera.hh" +#include +#include "gz/rendering/Camera.hh" namespace gz { diff --git a/include/gz/rendering/GaussianNoisePass.hh b/include/gz/rendering/GaussianNoisePass.hh index 7e8f54944..97e91246f 100644 --- a/include/gz/rendering/GaussianNoisePass.hh +++ b/include/gz/rendering/GaussianNoisePass.hh @@ -18,9 +18,9 @@ #define GZ_RENDERING_GAUSSIANNOISEPASS_HH_ #include -#include "ignition/rendering/config.hh" -#include "ignition/rendering/Export.hh" -#include "ignition/rendering/RenderPass.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/Export.hh" +#include "gz/rendering/RenderPass.hh" namespace gz { diff --git a/include/gz/rendering/Geometry.hh b/include/gz/rendering/Geometry.hh index bc92fbbd3..97a010a2c 100644 --- a/include/gz/rendering/Geometry.hh +++ b/include/gz/rendering/Geometry.hh @@ -18,10 +18,10 @@ #define GZ_RENDERING_GEOMETRY_HH_ #include -#include "ignition/rendering/config.hh" -#include "ignition/rendering/RenderTypes.hh" -#include "ignition/rendering/Object.hh" -#include "ignition/rendering/Export.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/RenderTypes.hh" +#include "gz/rendering/Object.hh" +#include "gz/rendering/Export.hh" namespace gz { diff --git a/include/gz/rendering/GizmoVisual.hh b/include/gz/rendering/GizmoVisual.hh index c401241ee..63361a0e0 100644 --- a/include/gz/rendering/GizmoVisual.hh +++ b/include/gz/rendering/GizmoVisual.hh @@ -17,11 +17,11 @@ #ifndef GZ_RENDERING_GIZMOVISUAL_HH_ #define GZ_RENDERING_GIZMOVISUAL_HH_ -#include "ignition/rendering/config.hh" -#include "ignition/rendering/CompositeVisual.hh" -#include "ignition/rendering/RenderTypes.hh" -#include "ignition/rendering/Export.hh" -#include "ignition/rendering/TransformType.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/CompositeVisual.hh" +#include "gz/rendering/RenderTypes.hh" +#include "gz/rendering/Export.hh" +#include "gz/rendering/TransformType.hh" namespace gz { diff --git a/include/gz/rendering/GpuRays.hh b/include/gz/rendering/GpuRays.hh index 546cdf528..9552064f7 100644 --- a/include/gz/rendering/GpuRays.hh +++ b/include/gz/rendering/GpuRays.hh @@ -19,12 +19,12 @@ #include -#include +#include -#include "ignition/rendering/Image.hh" -#include "ignition/rendering/Sensor.hh" -#include "ignition/rendering/Scene.hh" -#include "ignition/rendering/Camera.hh" +#include "gz/rendering/Image.hh" +#include "gz/rendering/Sensor.hh" +#include "gz/rendering/Scene.hh" +#include "gz/rendering/Camera.hh" namespace gz { diff --git a/include/gz/rendering/Grid.hh b/include/gz/rendering/Grid.hh index fa8177961..e1d57b205 100644 --- a/include/gz/rendering/Grid.hh +++ b/include/gz/rendering/Grid.hh @@ -18,9 +18,9 @@ #define GZ_RENDERING_GRID_HH_ #include -#include "ignition/rendering/config.hh" -#include "ignition/rendering/Geometry.hh" -#include "ignition/rendering/Object.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/Geometry.hh" +#include "gz/rendering/Object.hh" namespace gz { diff --git a/include/gz/rendering/Image.hh b/include/gz/rendering/Image.hh index 26c3ffe71..ba7155e7f 100644 --- a/include/gz/rendering/Image.hh +++ b/include/gz/rendering/Image.hh @@ -19,11 +19,11 @@ #include -#include +#include -#include "ignition/rendering/config.hh" -#include "ignition/rendering/PixelFormat.hh" -#include "ignition/rendering/Export.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/PixelFormat.hh" +#include "gz/rendering/Export.hh" namespace gz { diff --git a/include/gz/rendering/Light.hh b/include/gz/rendering/Light.hh index 7864ec850..cc10a8180 100644 --- a/include/gz/rendering/Light.hh +++ b/include/gz/rendering/Light.hh @@ -17,9 +17,9 @@ #ifndef GZ_RENDERING_LIGHT_HH_ #define GZ_RENDERING_LIGHT_HH_ -#include "ignition/math/Color.hh" -#include "ignition/rendering/config.hh" -#include "ignition/rendering/Node.hh" +#include "gz/math/Color.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/Node.hh" namespace gz { diff --git a/include/gz/rendering/Marker.hh b/include/gz/rendering/Marker.hh index 46275698d..cf08efdc6 100644 --- a/include/gz/rendering/Marker.hh +++ b/include/gz/rendering/Marker.hh @@ -17,13 +17,13 @@ #ifndef GZ_RENDERING_MARKER_HH_ #define GZ_RENDERING_MARKER_HH_ -#include -#include -#include -#include "ignition/rendering/config.hh" -#include "ignition/rendering/Geometry.hh" -#include "ignition/rendering/Object.hh" -#include "ignition/rendering/RenderTypes.hh" +#include +#include +#include +#include "gz/rendering/config.hh" +#include "gz/rendering/Geometry.hh" +#include "gz/rendering/Object.hh" +#include "gz/rendering/RenderTypes.hh" namespace gz { diff --git a/include/gz/rendering/Material.hh b/include/gz/rendering/Material.hh index 8d9ebec6e..c26d8b7d3 100644 --- a/include/gz/rendering/Material.hh +++ b/include/gz/rendering/Material.hh @@ -18,13 +18,13 @@ #define GZ_RENDERING_MATERIAL_HH_ #include -#include -#include -#include "ignition/rendering/config.hh" -#include "ignition/rendering/RenderTypes.hh" -#include "ignition/rendering/Object.hh" -#include "ignition/rendering/ShaderType.hh" -#include "ignition/rendering/Export.hh" +#include +#include +#include "gz/rendering/config.hh" +#include "gz/rendering/RenderTypes.hh" +#include "gz/rendering/Object.hh" +#include "gz/rendering/ShaderType.hh" +#include "gz/rendering/Export.hh" namespace gz { diff --git a/include/gz/rendering/Mesh.hh b/include/gz/rendering/Mesh.hh index d5e5cf054..6f22d785f 100644 --- a/include/gz/rendering/Mesh.hh +++ b/include/gz/rendering/Mesh.hh @@ -19,10 +19,10 @@ #include #include -#include -#include "ignition/rendering/config.hh" -#include "ignition/rendering/Geometry.hh" -#include "ignition/rendering/Object.hh" +#include +#include "gz/rendering/config.hh" +#include "gz/rendering/Geometry.hh" +#include "gz/rendering/Object.hh" namespace gz { diff --git a/include/gz/rendering/MeshDescriptor.hh b/include/gz/rendering/MeshDescriptor.hh index cbdfec95b..a3455a91e 100644 --- a/include/gz/rendering/MeshDescriptor.hh +++ b/include/gz/rendering/MeshDescriptor.hh @@ -19,10 +19,10 @@ #include -#include +#include -#include "ignition/rendering/config.hh" -#include "ignition/rendering/Export.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/Export.hh" namespace gz { diff --git a/include/gz/rendering/MoveToHelper.hh b/include/gz/rendering/MoveToHelper.hh index 59254fead..3b6d015b4 100644 --- a/include/gz/rendering/MoveToHelper.hh +++ b/include/gz/rendering/MoveToHelper.hh @@ -19,13 +19,13 @@ #include -#include -#include +#include +#include -#include -#include +#include +#include -#include "ignition/rendering/Camera.hh" +#include "gz/rendering/Camera.hh" namespace gz { diff --git a/include/gz/rendering/Node.hh b/include/gz/rendering/Node.hh index fdadb96f1..01b8189e7 100644 --- a/include/gz/rendering/Node.hh +++ b/include/gz/rendering/Node.hh @@ -18,13 +18,13 @@ #define GZ_RENDERING_NODE_HH_ #include -#include -#include +#include +#include -#include "ignition/rendering/config.hh" -#include "ignition/rendering/RenderTypes.hh" -#include "ignition/rendering/Object.hh" -#include "ignition/rendering/Export.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/RenderTypes.hh" +#include "gz/rendering/Object.hh" +#include "gz/rendering/Export.hh" namespace gz { diff --git a/include/gz/rendering/Object.hh b/include/gz/rendering/Object.hh index 5a6c1753b..ef9c31063 100644 --- a/include/gz/rendering/Object.hh +++ b/include/gz/rendering/Object.hh @@ -18,9 +18,9 @@ #define GZ_RENDERING_OBJECT_HH_ #include -#include "ignition/rendering/config.hh" -#include "ignition/rendering/RenderTypes.hh" -#include "ignition/rendering/Export.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/RenderTypes.hh" +#include "gz/rendering/Export.hh" namespace gz { diff --git a/include/gz/rendering/OrbitViewController.hh b/include/gz/rendering/OrbitViewController.hh index 1a9ac34b3..2b2a9497a 100644 --- a/include/gz/rendering/OrbitViewController.hh +++ b/include/gz/rendering/OrbitViewController.hh @@ -19,13 +19,13 @@ #include -#include +#include -#include +#include -#include "ignition/rendering/config.hh" -#include "ignition/rendering/Camera.hh" -#include "ignition/rendering/ViewController.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/Camera.hh" +#include "gz/rendering/ViewController.hh" namespace gz { diff --git a/include/gz/rendering/PixelFormat.hh b/include/gz/rendering/PixelFormat.hh index 5bde4d9fd..465070776 100644 --- a/include/gz/rendering/PixelFormat.hh +++ b/include/gz/rendering/PixelFormat.hh @@ -18,8 +18,8 @@ #define GZ_RENDERING_PIXELFORMAT_HH_ #include -#include "ignition/rendering/config.hh" -#include "ignition/rendering/Export.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/Export.hh" namespace gz { diff --git a/include/gz/rendering/RayQuery.hh b/include/gz/rendering/RayQuery.hh index 8fc96172c..91050f081 100644 --- a/include/gz/rendering/RayQuery.hh +++ b/include/gz/rendering/RayQuery.hh @@ -17,13 +17,13 @@ #ifndef GZ_RENDERING_RAYQUERY_HH_ #define GZ_RENDERING_RAYQUERY_HH_ -#include -#include +#include +#include -#include "ignition/rendering/config.hh" -#include "ignition/rendering/Camera.hh" -#include "ignition/rendering/Scene.hh" -#include "ignition/rendering/Visual.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/Camera.hh" +#include "gz/rendering/Scene.hh" +#include "gz/rendering/Visual.hh" namespace gz { diff --git a/include/gz/rendering/RenderEngine.hh b/include/gz/rendering/RenderEngine.hh index 8832197f2..fa3249387 100644 --- a/include/gz/rendering/RenderEngine.hh +++ b/include/gz/rendering/RenderEngine.hh @@ -19,9 +19,9 @@ #include #include -#include "ignition/rendering/config.hh" -#include "ignition/rendering/RenderTypes.hh" -#include "ignition/rendering/Export.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/RenderTypes.hh" +#include "gz/rendering/Export.hh" namespace gz { diff --git a/include/gz/rendering/RenderEngineManager.hh b/include/gz/rendering/RenderEngineManager.hh index aecd08441..5c1eac4e3 100644 --- a/include/gz/rendering/RenderEngineManager.hh +++ b/include/gz/rendering/RenderEngineManager.hh @@ -22,10 +22,10 @@ #include #include #include -#include -#include -#include "ignition/rendering/config.hh" -#include "ignition/rendering/Export.hh" +#include +#include +#include "gz/rendering/config.hh" +#include "gz/rendering/Export.hh" namespace gz { diff --git a/include/gz/rendering/RenderEnginePlugin.hh b/include/gz/rendering/RenderEnginePlugin.hh index bc3a76e86..5aff6a044 100644 --- a/include/gz/rendering/RenderEnginePlugin.hh +++ b/include/gz/rendering/RenderEnginePlugin.hh @@ -21,10 +21,10 @@ #include #include -#include +#include -#include "ignition/rendering/config.hh" -#include "ignition/rendering/Export.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/Export.hh" namespace gz { diff --git a/include/gz/rendering/RenderPass.hh b/include/gz/rendering/RenderPass.hh index 7b71c2146..7d9b907bd 100644 --- a/include/gz/rendering/RenderPass.hh +++ b/include/gz/rendering/RenderPass.hh @@ -17,9 +17,9 @@ #ifndef GZ_RENDERING_RENDERPASS_HH_ #define GZ_RENDERING_RENDERPASS_HH_ -#include "ignition/rendering/config.hh" -#include "ignition/rendering/Object.hh" -#include "ignition/rendering/Export.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/Object.hh" +#include "gz/rendering/Export.hh" namespace gz { diff --git a/include/gz/rendering/RenderPassSystem.hh b/include/gz/rendering/RenderPassSystem.hh index b7c157604..6b34c8962 100644 --- a/include/gz/rendering/RenderPassSystem.hh +++ b/include/gz/rendering/RenderPassSystem.hh @@ -22,12 +22,12 @@ #include #include -#include +#include -#include "ignition/rendering/config.hh" -#include "ignition/rendering/Export.hh" -#include "ignition/rendering/RenderPass.hh" -#include "ignition/rendering/RenderTypes.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/Export.hh" +#include "gz/rendering/RenderPass.hh" +#include "gz/rendering/RenderTypes.hh" namespace gz { diff --git a/include/gz/rendering/RenderTarget.hh b/include/gz/rendering/RenderTarget.hh index 4d52c6aa9..d8e0f7233 100644 --- a/include/gz/rendering/RenderTarget.hh +++ b/include/gz/rendering/RenderTarget.hh @@ -19,12 +19,12 @@ #include -#include +#include -#include "ignition/rendering/config.hh" -#include "ignition/rendering/RenderTypes.hh" -#include "ignition/rendering/Image.hh" -#include "ignition/rendering/Object.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/RenderTypes.hh" +#include "gz/rendering/Image.hh" +#include "gz/rendering/Object.hh" namespace gz { diff --git a/include/gz/rendering/RenderTypes.hh b/include/gz/rendering/RenderTypes.hh index 65523a7e3..f74131613 100644 --- a/include/gz/rendering/RenderTypes.hh +++ b/include/gz/rendering/RenderTypes.hh @@ -18,7 +18,7 @@ #define GZ_RENDERING_RENDERTYPES_HH_ #include -#include +#include /// \typedef IGN_VISIBILITY_ALL diff --git a/include/gz/rendering/RenderingIface.hh b/include/gz/rendering/RenderingIface.hh index c42219d11..0bfe0194b 100644 --- a/include/gz/rendering/RenderingIface.hh +++ b/include/gz/rendering/RenderingIface.hh @@ -22,9 +22,9 @@ #include #include -#include "ignition/rendering/config.hh" -#include "ignition/rendering/Export.hh" -#include "ignition/rendering/RenderTypes.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/Export.hh" +#include "gz/rendering/RenderTypes.hh" namespace gz { diff --git a/include/gz/rendering/Scene.hh b/include/gz/rendering/Scene.hh index 3aeb44cfe..68de5832f 100644 --- a/include/gz/rendering/Scene.hh +++ b/include/gz/rendering/Scene.hh @@ -21,17 +21,17 @@ #include #include -#include -#include -#include +#include +#include +#include -#include +#include -#include "ignition/rendering/config.hh" -#include "ignition/rendering/MeshDescriptor.hh" -#include "ignition/rendering/RenderTypes.hh" -#include "ignition/rendering/Storage.hh" -#include "ignition/rendering/Export.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/MeshDescriptor.hh" +#include "gz/rendering/RenderTypes.hh" +#include "gz/rendering/Storage.hh" +#include "gz/rendering/Export.hh" namespace gz { diff --git a/include/gz/rendering/Sensor.hh b/include/gz/rendering/Sensor.hh index f985a89a2..db5be49fc 100644 --- a/include/gz/rendering/Sensor.hh +++ b/include/gz/rendering/Sensor.hh @@ -17,8 +17,8 @@ #ifndef GZ_RENDERING_SENSOR_HH_ #define GZ_RENDERING_SENSOR_HH_ -#include "ignition/rendering/config.hh" -#include "ignition/rendering/Node.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/Node.hh" namespace gz { diff --git a/include/gz/rendering/ShaderParam.hh b/include/gz/rendering/ShaderParam.hh index 658e0eb77..94a52c504 100644 --- a/include/gz/rendering/ShaderParam.hh +++ b/include/gz/rendering/ShaderParam.hh @@ -21,10 +21,10 @@ #include #include -#include +#include -#include "ignition/rendering/config.hh" -#include "ignition/rendering/Export.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/Export.hh" namespace gz { diff --git a/include/gz/rendering/ShaderParams.hh b/include/gz/rendering/ShaderParams.hh index 9b9ad9bc8..a188a591c 100644 --- a/include/gz/rendering/ShaderParams.hh +++ b/include/gz/rendering/ShaderParams.hh @@ -22,8 +22,8 @@ #include #include -#include "ignition/rendering/Export.hh" -#include "ignition/rendering/ShaderParam.hh" +#include "gz/rendering/Export.hh" +#include "gz/rendering/ShaderParam.hh" namespace gz { diff --git a/include/gz/rendering/ShaderType.hh b/include/gz/rendering/ShaderType.hh index 82c595cbb..e5b66c861 100644 --- a/include/gz/rendering/ShaderType.hh +++ b/include/gz/rendering/ShaderType.hh @@ -18,8 +18,8 @@ #define GZ_RENDERING_SHADERTYPE_HH_ #include -#include "ignition/rendering/config.hh" -#include "ignition/rendering/Export.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/Export.hh" namespace gz { diff --git a/include/gz/rendering/Storage.hh b/include/gz/rendering/Storage.hh index 31cdb5bc9..0fa0102b5 100644 --- a/include/gz/rendering/Storage.hh +++ b/include/gz/rendering/Storage.hh @@ -19,16 +19,16 @@ #include #include -#include "ignition/rendering/config.hh" -#include "ignition/rendering/Scene.hh" -#include "ignition/rendering/Node.hh" -#include "ignition/rendering/Light.hh" -#include "ignition/rendering/Sensor.hh" -#include "ignition/rendering/Visual.hh" -#include "ignition/rendering/Geometry.hh" -#include "ignition/rendering/Material.hh" -#include "ignition/rendering/Mesh.hh" -#include "ignition/rendering/Export.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/Scene.hh" +#include "gz/rendering/Node.hh" +#include "gz/rendering/Light.hh" +#include "gz/rendering/Sensor.hh" +#include "gz/rendering/Visual.hh" +#include "gz/rendering/Geometry.hh" +#include "gz/rendering/Material.hh" +#include "gz/rendering/Mesh.hh" +#include "gz/rendering/Export.hh" // An X11 header file defines a macro that conflicts with our function name, // so undefine it here diff --git a/include/gz/rendering/Text.hh b/include/gz/rendering/Text.hh index cf6c468a4..2d19617b4 100644 --- a/include/gz/rendering/Text.hh +++ b/include/gz/rendering/Text.hh @@ -19,12 +19,12 @@ #include -#include -#include +#include +#include -#include "ignition/rendering/config.hh" -#include "ignition/rendering/Geometry.hh" -#include "ignition/rendering/Object.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/Geometry.hh" +#include "gz/rendering/Object.hh" namespace gz { diff --git a/include/gz/rendering/ThermalCamera.hh b/include/gz/rendering/ThermalCamera.hh index b058de3bb..1e399693c 100644 --- a/include/gz/rendering/ThermalCamera.hh +++ b/include/gz/rendering/ThermalCamera.hh @@ -18,7 +18,7 @@ #define GZ_RENDERING_THERMALCAMERA_HH_ #include -#include "ignition/rendering/Camera.hh" +#include "gz/rendering/Camera.hh" namespace gz { diff --git a/include/gz/rendering/TransformController.hh b/include/gz/rendering/TransformController.hh index 93ce9ba19..8b039c19d 100644 --- a/include/gz/rendering/TransformController.hh +++ b/include/gz/rendering/TransformController.hh @@ -19,16 +19,16 @@ #include -#include +#include -#include -#include -#include +#include +#include +#include -#include "ignition/rendering/config.hh" -#include "ignition/rendering/Camera.hh" -#include "ignition/rendering/GizmoVisual.hh" -#include "ignition/rendering/TransformType.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/Camera.hh" +#include "gz/rendering/GizmoVisual.hh" +#include "gz/rendering/TransformType.hh" namespace gz { diff --git a/include/gz/rendering/TransformType.hh b/include/gz/rendering/TransformType.hh index d25dbf76f..5e6cf99ea 100644 --- a/include/gz/rendering/TransformType.hh +++ b/include/gz/rendering/TransformType.hh @@ -18,10 +18,10 @@ #ifndef GZ_RENDERING_TRANSFORMTYPE_HH_ #define GZ_RENDERING_TRANSFORMTYPE_HH_ -#include +#include -#include "ignition/rendering/config.hh" -#include "ignition/rendering/Export.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/Export.hh" namespace gz { diff --git a/include/gz/rendering/Utils.hh b/include/gz/rendering/Utils.hh index ec1439370..83dbc8e18 100644 --- a/include/gz/rendering/Utils.hh +++ b/include/gz/rendering/Utils.hh @@ -17,14 +17,14 @@ #ifndef GZ_RENDERING_UTILS_HH_ #define GZ_RENDERING_UTILS_HH_ -#include -#include -#include +#include +#include +#include -#include "ignition/rendering/Camera.hh" -#include "ignition/rendering/config.hh" -#include "ignition/rendering/Export.hh" -#include "ignition/rendering/RayQuery.hh" +#include "gz/rendering/Camera.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/Export.hh" +#include "gz/rendering/RayQuery.hh" namespace gz diff --git a/include/gz/rendering/ViewController.hh b/include/gz/rendering/ViewController.hh index fe4dff405..462640e07 100644 --- a/include/gz/rendering/ViewController.hh +++ b/include/gz/rendering/ViewController.hh @@ -17,11 +17,11 @@ #ifndef GZ_RENDERING_VIEWCONTROLLER_HH_ #define GZ_RENDERING_VIEWCONTROLLER_HH_ -#include -#include +#include +#include -#include "ignition/rendering/config.hh" -#include "ignition/rendering/Camera.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/Camera.hh" namespace gz { diff --git a/include/gz/rendering/Visual.hh b/include/gz/rendering/Visual.hh index 45f3f9c32..331d189be 100644 --- a/include/gz/rendering/Visual.hh +++ b/include/gz/rendering/Visual.hh @@ -19,8 +19,8 @@ #include #include -#include "ignition/rendering/config.hh" -#include "ignition/rendering/Node.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/Node.hh" namespace gz { diff --git a/include/gz/rendering/base/BaseArrowVisual.hh b/include/gz/rendering/base/BaseArrowVisual.hh index 104d1d0e6..b3804e732 100644 --- a/include/gz/rendering/base/BaseArrowVisual.hh +++ b/include/gz/rendering/base/BaseArrowVisual.hh @@ -17,8 +17,8 @@ #ifndef GZ_RENDERING_BASE_BASEARROWVISUAL_HH_ #define GZ_RENDERING_BASE_BASEARROWVISUAL_HH_ -#include "ignition/rendering/ArrowVisual.hh" -#include "ignition/rendering/Scene.hh" +#include "gz/rendering/ArrowVisual.hh" +#include "gz/rendering/Scene.hh" namespace gz { diff --git a/include/gz/rendering/base/BaseAxisVisual.hh b/include/gz/rendering/base/BaseAxisVisual.hh index 9534e52f3..60500a235 100644 --- a/include/gz/rendering/base/BaseAxisVisual.hh +++ b/include/gz/rendering/base/BaseAxisVisual.hh @@ -17,9 +17,9 @@ #ifndef GZ_RENDERING_BASE_BASEAXISVISUAL_HH_ #define GZ_RENDERING_BASE_BASEAXISVISUAL_HH_ -#include "ignition/rendering/AxisVisual.hh" -#include "ignition/rendering/ArrowVisual.hh" -#include "ignition/rendering/Scene.hh" +#include "gz/rendering/AxisVisual.hh" +#include "gz/rendering/ArrowVisual.hh" +#include "gz/rendering/Scene.hh" namespace gz { diff --git a/include/gz/rendering/base/BaseCamera.hh b/include/gz/rendering/base/BaseCamera.hh index 824a3ef17..36bb10bc5 100644 --- a/include/gz/rendering/base/BaseCamera.hh +++ b/include/gz/rendering/base/BaseCamera.hh @@ -19,18 +19,18 @@ #include -#include -#include - -#include -#include -#include - -#include "ignition/rendering/Camera.hh" -#include "ignition/rendering/Image.hh" -#include "ignition/rendering/RenderEngine.hh" -#include "ignition/rendering/Scene.hh" -#include "ignition/rendering/base/BaseRenderTarget.hh" +#include +#include + +#include +#include +#include + +#include "gz/rendering/Camera.hh" +#include "gz/rendering/Image.hh" +#include "gz/rendering/RenderEngine.hh" +#include "gz/rendering/Scene.hh" +#include "gz/rendering/base/BaseRenderTarget.hh" namespace gz { diff --git a/include/gz/rendering/base/BaseDepthCamera.hh b/include/gz/rendering/base/BaseDepthCamera.hh index 3f1d29b95..9db70453b 100644 --- a/include/gz/rendering/base/BaseDepthCamera.hh +++ b/include/gz/rendering/base/BaseDepthCamera.hh @@ -19,10 +19,10 @@ #include -#include +#include -#include "ignition/rendering/base/BaseCamera.hh" -#include "ignition/rendering/DepthCamera.hh" +#include "gz/rendering/base/BaseCamera.hh" +#include "gz/rendering/DepthCamera.hh" namespace gz { diff --git a/include/gz/rendering/base/BaseGaussianNoisePass.hh b/include/gz/rendering/base/BaseGaussianNoisePass.hh index cb0bcc549..8642db159 100644 --- a/include/gz/rendering/base/BaseGaussianNoisePass.hh +++ b/include/gz/rendering/base/BaseGaussianNoisePass.hh @@ -18,9 +18,9 @@ #define GZ_RENDERING_BASE_BASEGAUSSIANNOISEPASS_HH_ #include -#include +#include -#include "ignition/rendering/GaussianNoisePass.hh" +#include "gz/rendering/GaussianNoisePass.hh" namespace gz { diff --git a/include/gz/rendering/base/BaseGeometry.hh b/include/gz/rendering/base/BaseGeometry.hh index 4a8dd8831..2594a18ba 100644 --- a/include/gz/rendering/base/BaseGeometry.hh +++ b/include/gz/rendering/base/BaseGeometry.hh @@ -18,8 +18,8 @@ #define GZ_RENDERING_BASE_BASEGEOMETRY_HH_ #include -#include "ignition/rendering/Geometry.hh" -#include "ignition/rendering/Scene.hh" +#include "gz/rendering/Geometry.hh" +#include "gz/rendering/Scene.hh" namespace gz { diff --git a/include/gz/rendering/base/BaseGizmoVisual.hh b/include/gz/rendering/base/BaseGizmoVisual.hh index 0f10a04a4..7e789925b 100644 --- a/include/gz/rendering/base/BaseGizmoVisual.hh +++ b/include/gz/rendering/base/BaseGizmoVisual.hh @@ -20,14 +20,14 @@ #include #include -#include -#include - -#include "ignition/rendering/base/BaseScene.hh" -#include "ignition/rendering/base/BaseNode.hh" -#include "ignition/rendering/ArrowVisual.hh" -#include "ignition/rendering/Camera.hh" -#include "ignition/rendering/GizmoVisual.hh" +#include +#include + +#include "gz/rendering/base/BaseScene.hh" +#include "gz/rendering/base/BaseNode.hh" +#include "gz/rendering/ArrowVisual.hh" +#include "gz/rendering/Camera.hh" +#include "gz/rendering/GizmoVisual.hh" namespace gz { diff --git a/include/gz/rendering/base/BaseGpuRays.hh b/include/gz/rendering/base/BaseGpuRays.hh index d83cfe132..333f9ab8c 100644 --- a/include/gz/rendering/base/BaseGpuRays.hh +++ b/include/gz/rendering/base/BaseGpuRays.hh @@ -19,17 +19,17 @@ #include -#include -#include - -#include "ignition/rendering/GpuRays.hh" -#include "ignition/rendering/Image.hh" -#include "ignition/rendering/RenderEngine.hh" -#include "ignition/rendering/Scene.hh" -#include "ignition/rendering/base/BaseRenderTarget.hh" -#include "ignition/rendering/base/BaseCamera.hh" -#include "ignition/rendering/Visual.hh" -#include "ignition/rendering/RenderTypes.hh" +#include +#include + +#include "gz/rendering/GpuRays.hh" +#include "gz/rendering/Image.hh" +#include "gz/rendering/RenderEngine.hh" +#include "gz/rendering/Scene.hh" +#include "gz/rendering/base/BaseRenderTarget.hh" +#include "gz/rendering/base/BaseCamera.hh" +#include "gz/rendering/Visual.hh" +#include "gz/rendering/RenderTypes.hh" namespace gz diff --git a/include/gz/rendering/base/BaseGrid.hh b/include/gz/rendering/base/BaseGrid.hh index 5557c683b..c1370e21b 100644 --- a/include/gz/rendering/base/BaseGrid.hh +++ b/include/gz/rendering/base/BaseGrid.hh @@ -18,8 +18,8 @@ #define GZ_RENDERING_BASE_BASEGRID_HH_ #include -#include "ignition/rendering/Grid.hh" -#include "ignition/rendering/base/BaseObject.hh" +#include "gz/rendering/Grid.hh" +#include "gz/rendering/base/BaseObject.hh" namespace gz { diff --git a/include/gz/rendering/base/BaseLight.hh b/include/gz/rendering/base/BaseLight.hh index d69c6deb4..572f31555 100644 --- a/include/gz/rendering/base/BaseLight.hh +++ b/include/gz/rendering/base/BaseLight.hh @@ -17,7 +17,7 @@ #ifndef GZ_RENDERING_BASE_BASELIGHT_HH_ #define GZ_RENDERING_BASE_BASELIGHT_HH_ -#include "ignition/rendering/Light.hh" +#include "gz/rendering/Light.hh" namespace gz { diff --git a/include/gz/rendering/base/BaseMarker.hh b/include/gz/rendering/base/BaseMarker.hh index ceccef017..6ec32943d 100644 --- a/include/gz/rendering/base/BaseMarker.hh +++ b/include/gz/rendering/base/BaseMarker.hh @@ -17,11 +17,11 @@ #ifndef GZ_RENDERING_BASEMARKER_HH_ #define GZ_RENDERING_BASEMARKER_HH_ -#include +#include -#include "ignition/rendering/Marker.hh" -#include "ignition/rendering/base/BaseObject.hh" -#include "ignition/rendering/base/BaseRenderTypes.hh" +#include "gz/rendering/Marker.hh" +#include "gz/rendering/base/BaseObject.hh" +#include "gz/rendering/base/BaseRenderTypes.hh" namespace gz { diff --git a/include/gz/rendering/base/BaseMaterial.hh b/include/gz/rendering/base/BaseMaterial.hh index 07aaa0659..6a654ad8b 100644 --- a/include/gz/rendering/base/BaseMaterial.hh +++ b/include/gz/rendering/base/BaseMaterial.hh @@ -19,11 +19,11 @@ #include -#include "ignition/common/Console.hh" +#include "gz/common/Console.hh" -#include "ignition/rendering/Material.hh" -#include "ignition/rendering/Scene.hh" -#include "ignition/rendering/ShaderType.hh" +#include "gz/rendering/Material.hh" +#include "gz/rendering/Scene.hh" +#include "gz/rendering/ShaderType.hh" namespace gz { diff --git a/include/gz/rendering/base/BaseMesh.hh b/include/gz/rendering/base/BaseMesh.hh index 37a00173c..2e3f371cc 100644 --- a/include/gz/rendering/base/BaseMesh.hh +++ b/include/gz/rendering/base/BaseMesh.hh @@ -19,9 +19,9 @@ #include #include -#include "ignition/rendering/Mesh.hh" -#include "ignition/rendering/Storage.hh" -#include "ignition/rendering/base/BaseObject.hh" +#include "gz/rendering/Mesh.hh" +#include "gz/rendering/Storage.hh" +#include "gz/rendering/base/BaseObject.hh" namespace gz { diff --git a/include/gz/rendering/base/BaseNode.hh b/include/gz/rendering/base/BaseNode.hh index a4a4de12b..0739f7954 100644 --- a/include/gz/rendering/base/BaseNode.hh +++ b/include/gz/rendering/base/BaseNode.hh @@ -18,9 +18,9 @@ #define GZ_RENDERING_BASE_BASENODE_HH_ #include -#include "ignition/rendering/Node.hh" -#include "ignition/rendering/Storage.hh" -#include "ignition/rendering/base/BaseStorage.hh" +#include "gz/rendering/Node.hh" +#include "gz/rendering/Storage.hh" +#include "gz/rendering/base/BaseStorage.hh" namespace gz { diff --git a/include/gz/rendering/base/BaseObject.hh b/include/gz/rendering/base/BaseObject.hh index fdfd6bd5d..4e57496c7 100644 --- a/include/gz/rendering/base/BaseObject.hh +++ b/include/gz/rendering/base/BaseObject.hh @@ -19,8 +19,8 @@ #include #include -#include -#include "ignition/rendering/Object.hh" +#include +#include "gz/rendering/Object.hh" namespace gz { diff --git a/include/gz/rendering/base/BaseRayQuery.hh b/include/gz/rendering/base/BaseRayQuery.hh index 9ac5a9ced..8f36b0eb4 100644 --- a/include/gz/rendering/base/BaseRayQuery.hh +++ b/include/gz/rendering/base/BaseRayQuery.hh @@ -17,11 +17,11 @@ #ifndef GZ_RENDERING_BASE_BASERAYQUERY_HH_ #define GZ_RENDERING_BASE_BASERAYQUERY_HH_ -#include -#include +#include +#include -#include "ignition/rendering/RayQuery.hh" -#include "ignition/rendering/Scene.hh" +#include "gz/rendering/RayQuery.hh" +#include "gz/rendering/Scene.hh" namespace gz { diff --git a/include/gz/rendering/base/BaseRenderEngine.hh b/include/gz/rendering/base/BaseRenderEngine.hh index 713b6d8fa..5b8292f04 100644 --- a/include/gz/rendering/base/BaseRenderEngine.hh +++ b/include/gz/rendering/base/BaseRenderEngine.hh @@ -20,9 +20,9 @@ #include #include #include -#include -#include "ignition/rendering/RenderEngine.hh" -#include "ignition/rendering/Storage.hh" +#include +#include "gz/rendering/RenderEngine.hh" +#include "gz/rendering/Storage.hh" namespace gz { diff --git a/include/gz/rendering/base/BaseRenderPass.hh b/include/gz/rendering/base/BaseRenderPass.hh index 9ace46114..9e2d54c93 100644 --- a/include/gz/rendering/base/BaseRenderPass.hh +++ b/include/gz/rendering/base/BaseRenderPass.hh @@ -18,7 +18,7 @@ #define GZ_RENDERING_BASE_BASERENDERPASS_HH_ #include -#include "ignition/rendering/RenderPass.hh" +#include "gz/rendering/RenderPass.hh" namespace gz { diff --git a/include/gz/rendering/base/BaseRenderTarget.hh b/include/gz/rendering/base/BaseRenderTarget.hh index b853bbc3e..d73d22d6c 100644 --- a/include/gz/rendering/base/BaseRenderTarget.hh +++ b/include/gz/rendering/base/BaseRenderTarget.hh @@ -20,10 +20,10 @@ #include #include -#include "ignition/rendering/RenderPass.hh" -#include "ignition/rendering/RenderTarget.hh" -#include "ignition/rendering/Scene.hh" -#include "ignition/rendering/base/BaseRenderTypes.hh" +#include "gz/rendering/RenderPass.hh" +#include "gz/rendering/RenderTarget.hh" +#include "gz/rendering/Scene.hh" +#include "gz/rendering/base/BaseRenderTypes.hh" namespace gz { diff --git a/include/gz/rendering/base/BaseRenderTypes.hh b/include/gz/rendering/base/BaseRenderTypes.hh index 7c863aaad..f5343e1dc 100644 --- a/include/gz/rendering/base/BaseRenderTypes.hh +++ b/include/gz/rendering/base/BaseRenderTypes.hh @@ -19,7 +19,7 @@ #include -#include "ignition/rendering/RenderTypes.hh" +#include "gz/rendering/RenderTypes.hh" namespace gz { diff --git a/include/gz/rendering/base/BaseScene.hh b/include/gz/rendering/base/BaseScene.hh index eaaca02b7..1f4cbef63 100644 --- a/include/gz/rendering/base/BaseScene.hh +++ b/include/gz/rendering/base/BaseScene.hh @@ -21,12 +21,12 @@ #include #include -#include -#include +#include +#include -#include "ignition/rendering/RenderEngine.hh" -#include "ignition/rendering/Scene.hh" -#include "ignition/rendering/base/BaseRenderTypes.hh" +#include "gz/rendering/RenderEngine.hh" +#include "gz/rendering/Scene.hh" +#include "gz/rendering/base/BaseRenderTypes.hh" namespace gz { diff --git a/include/gz/rendering/base/BaseSensor.hh b/include/gz/rendering/base/BaseSensor.hh index 8acc45944..a0f30a167 100644 --- a/include/gz/rendering/base/BaseSensor.hh +++ b/include/gz/rendering/base/BaseSensor.hh @@ -17,7 +17,7 @@ #ifndef GZ_RENDERING_BASE_BASESENSOR_HH_ #define GZ_RENDERING_BASE_BASESENSOR_HH_ -#include "ignition/rendering/Sensor.hh" +#include "gz/rendering/Sensor.hh" namespace gz { diff --git a/include/gz/rendering/base/BaseStorage.hh b/include/gz/rendering/base/BaseStorage.hh index 90f63a7cb..b4906d8c8 100644 --- a/include/gz/rendering/base/BaseStorage.hh +++ b/include/gz/rendering/base/BaseStorage.hh @@ -22,10 +22,10 @@ #include #include -#include -#include +#include +#include -#include "ignition/rendering/Storage.hh" +#include "gz/rendering/Storage.hh" namespace gz { diff --git a/include/gz/rendering/base/BaseText.hh b/include/gz/rendering/base/BaseText.hh index ab7f81a61..3a15de8b9 100644 --- a/include/gz/rendering/base/BaseText.hh +++ b/include/gz/rendering/base/BaseText.hh @@ -18,8 +18,8 @@ #define GZ_RENDERING_BASE_BASETEXT_HH_ #include -#include "ignition/rendering/Text.hh" -#include "ignition/rendering/base/BaseObject.hh" +#include "gz/rendering/Text.hh" +#include "gz/rendering/base/BaseObject.hh" namespace gz { diff --git a/include/gz/rendering/base/BaseThermalCamera.hh b/include/gz/rendering/base/BaseThermalCamera.hh index 8b9526b4b..40c138cbd 100644 --- a/include/gz/rendering/base/BaseThermalCamera.hh +++ b/include/gz/rendering/base/BaseThermalCamera.hh @@ -19,8 +19,8 @@ #include -#include "ignition/rendering/base/BaseCamera.hh" -#include "ignition/rendering/ThermalCamera.hh" +#include "gz/rendering/base/BaseCamera.hh" +#include "gz/rendering/ThermalCamera.hh" namespace gz { diff --git a/include/gz/rendering/base/BaseVisual.hh b/include/gz/rendering/base/BaseVisual.hh index c1f6b7265..7288e5253 100644 --- a/include/gz/rendering/base/BaseVisual.hh +++ b/include/gz/rendering/base/BaseVisual.hh @@ -19,11 +19,11 @@ #include #include -#include "ignition/rendering/Visual.hh" -#include "ignition/rendering/Storage.hh" +#include "gz/rendering/Visual.hh" +#include "gz/rendering/Storage.hh" -#include "ignition/rendering/RenderEngine.hh" -#include "ignition/rendering/base/BaseStorage.hh" +#include "gz/rendering/RenderEngine.hh" +#include "gz/rendering/base/BaseStorage.hh" namespace gz { diff --git a/include/gz/rendering/base/base.hh.in b/include/gz/rendering/base/base.hh.in index acfd26ae7..c4092f0cd 100644 --- a/include/gz/rendering/base/base.hh.in +++ b/include/gz/rendering/base/base.hh.in @@ -1,3 +1,3 @@ // Automatically generated -#include +#include ${ign_headers} diff --git a/include/gz/rendering/rendering.hh.in b/include/gz/rendering/rendering.hh.in index 13484ca76..2602ad19b 100644 --- a/include/gz/rendering/rendering.hh.in +++ b/include/gz/rendering/rendering.hh.in @@ -1,3 +1,3 @@ // Automatically generated -//#include +//#include ${ign_headers} diff --git a/ogre/include/gz/rendering/ogre/OgreArrowVisual.hh b/ogre/include/gz/rendering/ogre/OgreArrowVisual.hh index 4d7287fa2..3a9f9b565 100644 --- a/ogre/include/gz/rendering/ogre/OgreArrowVisual.hh +++ b/ogre/include/gz/rendering/ogre/OgreArrowVisual.hh @@ -17,8 +17,8 @@ #ifndef GZ_RENDERING_OGRE_OGREARROWVISUAL_HH_ #define GZ_RENDERING_OGRE_OGREARROWVISUAL_HH_ -#include "ignition/rendering/base/BaseArrowVisual.hh" -#include "ignition/rendering/ogre/OgreVisual.hh" +#include "gz/rendering/base/BaseArrowVisual.hh" +#include "gz/rendering/ogre/OgreVisual.hh" namespace gz { diff --git a/ogre/include/gz/rendering/ogre/OgreAxisVisual.hh b/ogre/include/gz/rendering/ogre/OgreAxisVisual.hh index ad8b5b1fd..7ee7979cd 100644 --- a/ogre/include/gz/rendering/ogre/OgreAxisVisual.hh +++ b/ogre/include/gz/rendering/ogre/OgreAxisVisual.hh @@ -17,8 +17,8 @@ #ifndef GZ_RENDERING_OGRE_OGREAXISVISUAL_HH_ #define GZ_RENDERING_OGRE_OGREAXISVISUAL_HH_ -#include "ignition/rendering/base/BaseAxisVisual.hh" -#include "ignition/rendering/ogre/OgreVisual.hh" +#include "gz/rendering/base/BaseAxisVisual.hh" +#include "gz/rendering/ogre/OgreVisual.hh" namespace gz { diff --git a/ogre/include/gz/rendering/ogre/OgreCamera.hh b/ogre/include/gz/rendering/ogre/OgreCamera.hh index 4f22c9342..a35630e43 100644 --- a/ogre/include/gz/rendering/ogre/OgreCamera.hh +++ b/ogre/include/gz/rendering/ogre/OgreCamera.hh @@ -19,10 +19,10 @@ #include -#include "ignition/rendering/base/BaseCamera.hh" -#include "ignition/rendering/ogre/OgreRenderTypes.hh" -#include "ignition/rendering/ogre/OgreSensor.hh" -#include "ignition/rendering/ogre/OgreSelectionBuffer.hh" +#include "gz/rendering/base/BaseCamera.hh" +#include "gz/rendering/ogre/OgreRenderTypes.hh" +#include "gz/rendering/ogre/OgreSensor.hh" +#include "gz/rendering/ogre/OgreSelectionBuffer.hh" namespace Ogre { diff --git a/ogre/include/gz/rendering/ogre/OgreConversions.hh b/ogre/include/gz/rendering/ogre/OgreConversions.hh index 99657fafd..522f650b3 100644 --- a/ogre/include/gz/rendering/ogre/OgreConversions.hh +++ b/ogre/include/gz/rendering/ogre/OgreConversions.hh @@ -17,14 +17,14 @@ #ifndef GZ_RENDERING_OGRE_OGRECONVERSIONS_HH_ #define GZ_RENDERING_OGRE_OGRECONVERSIONS_HH_ -#include -#include -#include -#include +#include +#include +#include +#include -#include "ignition/rendering/PixelFormat.hh" -#include "ignition/rendering/ogre/OgreIncludes.hh" -#include "ignition/rendering/ogre/Export.hh" +#include "gz/rendering/PixelFormat.hh" +#include "gz/rendering/ogre/OgreIncludes.hh" +#include "gz/rendering/ogre/Export.hh" namespace gz { diff --git a/ogre/include/gz/rendering/ogre/OgreDepthCamera.hh b/ogre/include/gz/rendering/ogre/OgreDepthCamera.hh index d73ff4a3e..e7fd26e9c 100644 --- a/ogre/include/gz/rendering/ogre/OgreDepthCamera.hh +++ b/ogre/include/gz/rendering/ogre/OgreDepthCamera.hh @@ -27,18 +27,18 @@ #include #include -#include "ignition/rendering/RenderTypes.hh" -#include "ignition/rendering/base/BaseDepthCamera.hh" -#include "ignition/rendering/ogre/OgreConversions.hh" -#include "ignition/rendering/ogre/OgreIncludes.hh" -#include "ignition/rendering/ogre/OgreRenderTarget.hh" -#include "ignition/rendering/ogre/OgreRenderTypes.hh" -#include "ignition/rendering/ogre/OgreScene.hh" -#include "ignition/rendering/ogre/OgreSensor.hh" -#include "ignition/rendering/ogre/OgreSelectionBuffer.hh" - -#include "ignition/common/Event.hh" -#include "ignition/common/Console.hh" +#include "gz/rendering/RenderTypes.hh" +#include "gz/rendering/base/BaseDepthCamera.hh" +#include "gz/rendering/ogre/OgreConversions.hh" +#include "gz/rendering/ogre/OgreIncludes.hh" +#include "gz/rendering/ogre/OgreRenderTarget.hh" +#include "gz/rendering/ogre/OgreRenderTypes.hh" +#include "gz/rendering/ogre/OgreScene.hh" +#include "gz/rendering/ogre/OgreSensor.hh" +#include "gz/rendering/ogre/OgreSelectionBuffer.hh" + +#include "gz/common/Event.hh" +#include "gz/common/Console.hh" namespace Ogre diff --git a/ogre/include/gz/rendering/ogre/OgreDynamicLines.hh b/ogre/include/gz/rendering/ogre/OgreDynamicLines.hh index c23c610d7..6ccc70433 100644 --- a/ogre/include/gz/rendering/ogre/OgreDynamicLines.hh +++ b/ogre/include/gz/rendering/ogre/OgreDynamicLines.hh @@ -20,11 +20,11 @@ #include #include #include -#include +#include -#include "ignition/rendering/ogre/Export.hh" -#include "ignition/rendering/ogre/OgreConversions.hh" -#include "ignition/rendering/ogre/OgreDynamicRenderable.hh" +#include "gz/rendering/ogre/Export.hh" +#include "gz/rendering/ogre/OgreConversions.hh" +#include "gz/rendering/ogre/OgreDynamicRenderable.hh" namespace gz { diff --git a/ogre/include/gz/rendering/ogre/OgreDynamicRenderable.hh b/ogre/include/gz/rendering/ogre/OgreDynamicRenderable.hh index 6f5efc53a..878c2c31c 100644 --- a/ogre/include/gz/rendering/ogre/OgreDynamicRenderable.hh +++ b/ogre/include/gz/rendering/ogre/OgreDynamicRenderable.hh @@ -18,10 +18,10 @@ #define GZ_RENDERING_OGRE_OGREDYNAMICRENDERABLE_HH_ #include -#include "ignition/rendering/ogre/Export.hh" -#include "ignition/rendering/ogre/OgreIncludes.hh" -#include "ignition/rendering/ogre/OgreRenderTypes.hh" -#include "ignition/rendering/Marker.hh" +#include "gz/rendering/ogre/Export.hh" +#include "gz/rendering/ogre/OgreIncludes.hh" +#include "gz/rendering/ogre/OgreRenderTypes.hh" +#include "gz/rendering/Marker.hh" namespace gz { diff --git a/ogre/include/gz/rendering/ogre/OgreGaussianNoisePass.hh b/ogre/include/gz/rendering/ogre/OgreGaussianNoisePass.hh index fb1fc2f0a..857e8d268 100644 --- a/ogre/include/gz/rendering/ogre/OgreGaussianNoisePass.hh +++ b/ogre/include/gz/rendering/ogre/OgreGaussianNoisePass.hh @@ -19,12 +19,12 @@ #include -#include +#include -#include "ignition/rendering/base/BaseGaussianNoisePass.hh" -#include "ignition/rendering/ogre/OgreIncludes.hh" -#include "ignition/rendering/ogre/OgreRenderPass.hh" -#include "ignition/rendering/ogre/Export.hh" +#include "gz/rendering/base/BaseGaussianNoisePass.hh" +#include "gz/rendering/ogre/OgreIncludes.hh" +#include "gz/rendering/ogre/OgreRenderPass.hh" +#include "gz/rendering/ogre/Export.hh" namespace gz { diff --git a/ogre/include/gz/rendering/ogre/OgreGeometry.hh b/ogre/include/gz/rendering/ogre/OgreGeometry.hh index 616d4d5e6..4f8f4a796 100644 --- a/ogre/include/gz/rendering/ogre/OgreGeometry.hh +++ b/ogre/include/gz/rendering/ogre/OgreGeometry.hh @@ -17,10 +17,10 @@ #ifndef GZ_RENDERING_OGRE_OGREGEOMETRY_HH_ #define GZ_RENDERING_OGRE_OGREGEOMETRY_HH_ -#include +#include -#include "ignition/rendering/base/BaseGeometry.hh" -#include "ignition/rendering/ogre/OgreObject.hh" +#include "gz/rendering/base/BaseGeometry.hh" +#include "gz/rendering/ogre/OgreObject.hh" namespace Ogre { diff --git a/ogre/include/gz/rendering/ogre/OgreGizmoVisual.hh b/ogre/include/gz/rendering/ogre/OgreGizmoVisual.hh index c7b8c3afb..177ba587d 100644 --- a/ogre/include/gz/rendering/ogre/OgreGizmoVisual.hh +++ b/ogre/include/gz/rendering/ogre/OgreGizmoVisual.hh @@ -17,8 +17,8 @@ #ifndef GZ_RENDERING_OGRE_OGREGIZMOVISUAL_HH_ #define GZ_RENDERING_OGRE_OGREGIZMOVISUAL_HH_ -#include "ignition/rendering/base/BaseGizmoVisual.hh" -#include "ignition/rendering/ogre/OgreVisual.hh" +#include "gz/rendering/base/BaseGizmoVisual.hh" +#include "gz/rendering/ogre/OgreVisual.hh" namespace gz { diff --git a/ogre/include/gz/rendering/ogre/OgreGpuRays.hh b/ogre/include/gz/rendering/ogre/OgreGpuRays.hh index 7ca231de0..dd99fee34 100644 --- a/ogre/include/gz/rendering/ogre/OgreGpuRays.hh +++ b/ogre/include/gz/rendering/ogre/OgreGpuRays.hh @@ -23,17 +23,17 @@ #include #include -#include - -#include "ignition/rendering/RenderTypes.hh" -#include "ignition/rendering/base/BaseGpuRays.hh" -#include "ignition/rendering/ogre/OgreConversions.hh" -#include "ignition/rendering/ogre/OgreIncludes.hh" -#include "ignition/rendering/ogre/OgreRenderTarget.hh" -#include "ignition/rendering/ogre/OgreRenderTypes.hh" -#include "ignition/rendering/ogre/OgreMaterial.hh" -#include "ignition/rendering/ogre/OgreScene.hh" -#include "ignition/rendering/ogre/OgreSensor.hh" +#include + +#include "gz/rendering/RenderTypes.hh" +#include "gz/rendering/base/BaseGpuRays.hh" +#include "gz/rendering/ogre/OgreConversions.hh" +#include "gz/rendering/ogre/OgreIncludes.hh" +#include "gz/rendering/ogre/OgreRenderTarget.hh" +#include "gz/rendering/ogre/OgreRenderTypes.hh" +#include "gz/rendering/ogre/OgreMaterial.hh" +#include "gz/rendering/ogre/OgreScene.hh" +#include "gz/rendering/ogre/OgreSensor.hh" #ifdef _WIN32 // Ensure that Winsock2.h is included before Windows.h, which can get diff --git a/ogre/include/gz/rendering/ogre/OgreGrid.hh b/ogre/include/gz/rendering/ogre/OgreGrid.hh index ae52285c5..9faa27ae9 100644 --- a/ogre/include/gz/rendering/ogre/OgreGrid.hh +++ b/ogre/include/gz/rendering/ogre/OgreGrid.hh @@ -19,9 +19,9 @@ #define GZ_RENDERING_OGRE_OGREGRID_HH_ #include -#include "ignition/rendering/base/BaseGrid.hh" -#include "ignition/rendering/ogre/OgreGeometry.hh" -#include "ignition/rendering/ogre/OgreIncludes.hh" +#include "gz/rendering/base/BaseGrid.hh" +#include "gz/rendering/ogre/OgreGeometry.hh" +#include "gz/rendering/ogre/OgreIncludes.hh" namespace Ogre { diff --git a/ogre/include/gz/rendering/ogre/OgreLight.hh b/ogre/include/gz/rendering/ogre/OgreLight.hh index 35ce9bd26..431c804e2 100644 --- a/ogre/include/gz/rendering/ogre/OgreLight.hh +++ b/ogre/include/gz/rendering/ogre/OgreLight.hh @@ -17,9 +17,9 @@ #ifndef GZ_RENDERING_OGRE_OGRELIGHT_HH_ #define GZ_RENDERING_OGRE_OGRELIGHT_HH_ -#include "ignition/rendering/base/BaseLight.hh" -#include "ignition/rendering/ogre/OgreNode.hh" -#include "ignition/rendering/ogre/OgreIncludes.hh" +#include "gz/rendering/base/BaseLight.hh" +#include "gz/rendering/ogre/OgreNode.hh" +#include "gz/rendering/ogre/OgreIncludes.hh" namespace Ogre { diff --git a/ogre/include/gz/rendering/ogre/OgreMarker.hh b/ogre/include/gz/rendering/ogre/OgreMarker.hh index fed13cf1c..e787fe037 100644 --- a/ogre/include/gz/rendering/ogre/OgreMarker.hh +++ b/ogre/include/gz/rendering/ogre/OgreMarker.hh @@ -19,9 +19,9 @@ #define GZ_RENDERING_OGRE_OGREMARKER_HH_ #include -#include "ignition/rendering/base/BaseMarker.hh" -#include "ignition/rendering/ogre/OgreGeometry.hh" -#include "ignition/rendering/ogre/OgreIncludes.hh" +#include "gz/rendering/base/BaseMarker.hh" +#include "gz/rendering/ogre/OgreGeometry.hh" +#include "gz/rendering/ogre/OgreIncludes.hh" namespace gz { diff --git a/ogre/include/gz/rendering/ogre/OgreMaterial.hh b/ogre/include/gz/rendering/ogre/OgreMaterial.hh index c63c33883..5a4524c39 100644 --- a/ogre/include/gz/rendering/ogre/OgreMaterial.hh +++ b/ogre/include/gz/rendering/ogre/OgreMaterial.hh @@ -19,11 +19,11 @@ #include -#include +#include -#include "ignition/rendering/base/BaseMaterial.hh" -#include "ignition/rendering/ogre/OgreObject.hh" -#include "ignition/rendering/ogre/OgreIncludes.hh" +#include "gz/rendering/base/BaseMaterial.hh" +#include "gz/rendering/ogre/OgreObject.hh" +#include "gz/rendering/ogre/OgreIncludes.hh" namespace gz { diff --git a/ogre/include/gz/rendering/ogre/OgreMaterialSwitcher.hh b/ogre/include/gz/rendering/ogre/OgreMaterialSwitcher.hh index c9aa6210b..3f7636b39 100644 --- a/ogre/include/gz/rendering/ogre/OgreMaterialSwitcher.hh +++ b/ogre/include/gz/rendering/ogre/OgreMaterialSwitcher.hh @@ -21,12 +21,12 @@ #include #include -#include -#include -#include "ignition/rendering/config.hh" -#include "ignition/rendering/ogre/Export.hh" -#include "ignition/rendering/ogre/OgreIncludes.hh" -#include "ignition/rendering/ogre/OgreRenderTypes.hh" +#include +#include +#include "gz/rendering/config.hh" +#include "gz/rendering/ogre/Export.hh" +#include "gz/rendering/ogre/OgreIncludes.hh" +#include "gz/rendering/ogre/OgreRenderTypes.hh" namespace gz { diff --git a/ogre/include/gz/rendering/ogre/OgreMesh.hh b/ogre/include/gz/rendering/ogre/OgreMesh.hh index e537a4bd1..76b327e9a 100644 --- a/ogre/include/gz/rendering/ogre/OgreMesh.hh +++ b/ogre/include/gz/rendering/ogre/OgreMesh.hh @@ -20,10 +20,10 @@ #include #include #include -#include "ignition/rendering/base/BaseMesh.hh" -#include "ignition/rendering/ogre/OgreGeometry.hh" -#include "ignition/rendering/ogre/OgreObject.hh" -#include "ignition/rendering/ogre/OgreRenderTypes.hh" +#include "gz/rendering/base/BaseMesh.hh" +#include "gz/rendering/ogre/OgreGeometry.hh" +#include "gz/rendering/ogre/OgreObject.hh" +#include "gz/rendering/ogre/OgreRenderTypes.hh" namespace Ogre { diff --git a/ogre/include/gz/rendering/ogre/OgreMeshFactory.hh b/ogre/include/gz/rendering/ogre/OgreMeshFactory.hh index 2b3a3aaf3..fa7286ac3 100644 --- a/ogre/include/gz/rendering/ogre/OgreMeshFactory.hh +++ b/ogre/include/gz/rendering/ogre/OgreMeshFactory.hh @@ -20,9 +20,9 @@ #include #include -#include "ignition/rendering/MeshDescriptor.hh" -#include "ignition/rendering/ogre/OgreRenderTypes.hh" -#include "ignition/rendering/ogre/Export.hh" +#include "gz/rendering/MeshDescriptor.hh" +#include "gz/rendering/ogre/OgreRenderTypes.hh" +#include "gz/rendering/ogre/Export.hh" namespace Ogre { diff --git a/ogre/include/gz/rendering/ogre/OgreNode.hh b/ogre/include/gz/rendering/ogre/OgreNode.hh index c1d409d4d..e2570b485 100644 --- a/ogre/include/gz/rendering/ogre/OgreNode.hh +++ b/ogre/include/gz/rendering/ogre/OgreNode.hh @@ -17,11 +17,11 @@ #ifndef GZ_RENDERING_OGRE_OGRENODE_HH_ #define GZ_RENDERING_OGRE_OGRENODE_HH_ -#include +#include -#include "ignition/rendering/base/BaseNode.hh" -#include "ignition/rendering/ogre/OgreRenderTypes.hh" -#include "ignition/rendering/ogre/OgreObject.hh" +#include "gz/rendering/base/BaseNode.hh" +#include "gz/rendering/ogre/OgreRenderTypes.hh" +#include "gz/rendering/ogre/OgreObject.hh" namespace Ogre { diff --git a/ogre/include/gz/rendering/ogre/OgreObject.hh b/ogre/include/gz/rendering/ogre/OgreObject.hh index 4495ae2f2..95da99ed4 100644 --- a/ogre/include/gz/rendering/ogre/OgreObject.hh +++ b/ogre/include/gz/rendering/ogre/OgreObject.hh @@ -17,11 +17,11 @@ #ifndef GZ_RENDERING_OGRE_OGREOBJECT_HH_ #define GZ_RENDERING_OGRE_OGREOBJECT_HH_ -#include +#include -#include "ignition/rendering/base/BaseObject.hh" -#include "ignition/rendering/ogre/OgreRenderTypes.hh" -#include "ignition/rendering/ogre/Export.hh" +#include "gz/rendering/base/BaseObject.hh" +#include "gz/rendering/ogre/OgreRenderTypes.hh" +#include "gz/rendering/ogre/Export.hh" namespace gz { diff --git a/ogre/include/gz/rendering/ogre/OgreRTShaderSystem.hh b/ogre/include/gz/rendering/ogre/OgreRTShaderSystem.hh index f04d5b01f..a2827e9c1 100644 --- a/ogre/include/gz/rendering/ogre/OgreRTShaderSystem.hh +++ b/ogre/include/gz/rendering/ogre/OgreRTShaderSystem.hh @@ -20,10 +20,10 @@ #include #include -#include -#include "ignition/rendering/ogre/OgreIncludes.hh" -#include "ignition/rendering/ogre/OgreRenderTypes.hh" -#include "ignition/rendering/ogre/Export.hh" +#include +#include "gz/rendering/ogre/OgreIncludes.hh" +#include "gz/rendering/ogre/OgreRenderTypes.hh" +#include "gz/rendering/ogre/Export.hh" namespace gz { diff --git a/ogre/include/gz/rendering/ogre/OgreRayQuery.hh b/ogre/include/gz/rendering/ogre/OgreRayQuery.hh index 66675f598..feceab193 100644 --- a/ogre/include/gz/rendering/ogre/OgreRayQuery.hh +++ b/ogre/include/gz/rendering/ogre/OgreRayQuery.hh @@ -19,10 +19,10 @@ #include -#include "ignition/rendering/base/BaseRayQuery.hh" -#include "ignition/rendering/ogre/OgreIncludes.hh" -#include "ignition/rendering/ogre/OgreObject.hh" -#include "ignition/rendering/ogre/OgreRenderTypes.hh" +#include "gz/rendering/base/BaseRayQuery.hh" +#include "gz/rendering/ogre/OgreIncludes.hh" +#include "gz/rendering/ogre/OgreObject.hh" +#include "gz/rendering/ogre/OgreRenderTypes.hh" namespace gz { diff --git a/ogre/include/gz/rendering/ogre/OgreRenderEngine.hh b/ogre/include/gz/rendering/ogre/OgreRenderEngine.hh index bba6b23cd..98aa1947b 100644 --- a/ogre/include/gz/rendering/ogre/OgreRenderEngine.hh +++ b/ogre/include/gz/rendering/ogre/OgreRenderEngine.hh @@ -22,14 +22,14 @@ #include #include -#include - -#include "ignition/rendering/RenderEnginePlugin.hh" -#include "ignition/rendering/base/BaseRenderEngine.hh" -#include "ignition/rendering/base/BaseRenderTypes.hh" -#include "ignition/rendering/ogre/OgreIncludes.hh" -#include "ignition/rendering/ogre/OgreRenderTypes.hh" -#include "ignition/rendering/ogre/Export.hh" +#include + +#include "gz/rendering/RenderEnginePlugin.hh" +#include "gz/rendering/base/BaseRenderEngine.hh" +#include "gz/rendering/base/BaseRenderTypes.hh" +#include "gz/rendering/ogre/OgreIncludes.hh" +#include "gz/rendering/ogre/OgreRenderTypes.hh" +#include "gz/rendering/ogre/Export.hh" namespace Ogre { diff --git a/ogre/include/gz/rendering/ogre/OgreRenderPass.hh b/ogre/include/gz/rendering/ogre/OgreRenderPass.hh index 4c1412a0f..b66386898 100644 --- a/ogre/include/gz/rendering/ogre/OgreRenderPass.hh +++ b/ogre/include/gz/rendering/ogre/OgreRenderPass.hh @@ -17,10 +17,10 @@ #ifndef GZ_RENDERING_OGRE_OGRERENDERPASS_HH_ #define GZ_RENDERING_OGRE_OGRERENDERPASS_HH_ -#include "ignition/rendering/base/BaseRenderPass.hh" -#include "ignition/rendering/ogre/Export.hh" -#include "ignition/rendering/ogre/OgreIncludes.hh" -#include "ignition/rendering/ogre/OgreObject.hh" +#include "gz/rendering/base/BaseRenderPass.hh" +#include "gz/rendering/ogre/Export.hh" +#include "gz/rendering/ogre/OgreIncludes.hh" +#include "gz/rendering/ogre/OgreObject.hh" namespace gz { diff --git a/ogre/include/gz/rendering/ogre/OgreRenderTarget.hh b/ogre/include/gz/rendering/ogre/OgreRenderTarget.hh index bf53e618b..9b9f15146 100644 --- a/ogre/include/gz/rendering/ogre/OgreRenderTarget.hh +++ b/ogre/include/gz/rendering/ogre/OgreRenderTarget.hh @@ -17,14 +17,14 @@ #ifndef GZ_RENDERING_OGRE_OGRERENDERTARGET_HH_ #define GZ_RENDERING_OGRE_OGRERENDERTARGET_HH_ -#include - -#include "ignition/rendering/base/BaseRenderTypes.hh" -#include "ignition/rendering/base/BaseRenderTarget.hh" -#include "ignition/rendering/ogre/OgreRenderTypes.hh" -#include "ignition/rendering/ogre/OgreIncludes.hh" -#include "ignition/rendering/ogre/OgreObject.hh" -#include "ignition/rendering/ogre/OgreRenderTargetMaterial.hh" +#include + +#include "gz/rendering/base/BaseRenderTypes.hh" +#include "gz/rendering/base/BaseRenderTarget.hh" +#include "gz/rendering/ogre/OgreRenderTypes.hh" +#include "gz/rendering/ogre/OgreIncludes.hh" +#include "gz/rendering/ogre/OgreObject.hh" +#include "gz/rendering/ogre/OgreRenderTargetMaterial.hh" namespace Ogre { diff --git a/ogre/include/gz/rendering/ogre/OgreRenderTargetMaterial.hh b/ogre/include/gz/rendering/ogre/OgreRenderTargetMaterial.hh index eabf3d951..900444908 100644 --- a/ogre/include/gz/rendering/ogre/OgreRenderTargetMaterial.hh +++ b/ogre/include/gz/rendering/ogre/OgreRenderTargetMaterial.hh @@ -19,10 +19,10 @@ #include -#include "ignition/rendering/config.hh" -#include "ignition/rendering/ogre/OgreIncludes.hh" -#include "ignition/rendering/ogre/OgreRenderTypes.hh" -#include "ignition/rendering/ogre/Export.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/ogre/OgreIncludes.hh" +#include "gz/rendering/ogre/OgreRenderTypes.hh" +#include "gz/rendering/ogre/Export.hh" // Ogre::MaterialManager::Listener isn't a dll-interface class, this may cause // issues diff --git a/ogre/include/gz/rendering/ogre/OgreRenderTypes.hh b/ogre/include/gz/rendering/ogre/OgreRenderTypes.hh index cdd44e988..533c504bd 100644 --- a/ogre/include/gz/rendering/ogre/OgreRenderTypes.hh +++ b/ogre/include/gz/rendering/ogre/OgreRenderTypes.hh @@ -18,7 +18,7 @@ #define GZ_RENDERING_OGRE_OGRERENDERTYPES_HH_ #include -#include "ignition/rendering/base/BaseRenderTypes.hh" +#include "gz/rendering/base/BaseRenderTypes.hh" namespace gz { diff --git a/ogre/include/gz/rendering/ogre/OgreScene.hh b/ogre/include/gz/rendering/ogre/OgreScene.hh index 11d94e405..cdfe3b8f9 100644 --- a/ogre/include/gz/rendering/ogre/OgreScene.hh +++ b/ogre/include/gz/rendering/ogre/OgreScene.hh @@ -19,9 +19,9 @@ #include #include -#include "ignition/rendering/base/BaseScene.hh" -#include "ignition/rendering/ogre/Export.hh" -#include "ignition/rendering/ogre/OgreRenderTypes.hh" +#include "gz/rendering/base/BaseScene.hh" +#include "gz/rendering/ogre/Export.hh" +#include "gz/rendering/ogre/OgreRenderTypes.hh" namespace Ogre diff --git a/ogre/include/gz/rendering/ogre/OgreSelectionBuffer.hh b/ogre/include/gz/rendering/ogre/OgreSelectionBuffer.hh index 88ca27e85..f88a68fec 100644 --- a/ogre/include/gz/rendering/ogre/OgreSelectionBuffer.hh +++ b/ogre/include/gz/rendering/ogre/OgreSelectionBuffer.hh @@ -20,8 +20,8 @@ #include #include -#include "ignition/rendering/config.hh" -#include "ignition/rendering/ogre/Export.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/ogre/Export.hh" namespace Ogre { diff --git a/ogre/include/gz/rendering/ogre/OgreSensor.hh b/ogre/include/gz/rendering/ogre/OgreSensor.hh index 96ccbbee9..20e509611 100644 --- a/ogre/include/gz/rendering/ogre/OgreSensor.hh +++ b/ogre/include/gz/rendering/ogre/OgreSensor.hh @@ -17,8 +17,8 @@ #ifndef GZ_RENDERING_OGRE_OGRESENSOR_HH_ #define GZ_RENDERING_OGRE_OGRESENSOR_HH_ -#include "ignition/rendering/base/BaseSensor.hh" -#include "ignition/rendering/ogre/OgreNode.hh" +#include "gz/rendering/base/BaseSensor.hh" +#include "gz/rendering/ogre/OgreNode.hh" namespace gz { diff --git a/ogre/include/gz/rendering/ogre/OgreStorage.hh b/ogre/include/gz/rendering/ogre/OgreStorage.hh index 577ea0128..1e8df4884 100644 --- a/ogre/include/gz/rendering/ogre/OgreStorage.hh +++ b/ogre/include/gz/rendering/ogre/OgreStorage.hh @@ -18,16 +18,16 @@ #define GZ_RENDERING_OGRE_OGRESTORAGE_HH_ #include -#include "ignition/rendering/base/BaseStorage.hh" +#include "gz/rendering/base/BaseStorage.hh" -#include "ignition/rendering/ogre/OgreGeometry.hh" -#include "ignition/rendering/ogre/OgreLight.hh" -#include "ignition/rendering/ogre/OgreMaterial.hh" -#include "ignition/rendering/ogre/OgreMesh.hh" -#include "ignition/rendering/ogre/OgreNode.hh" -#include "ignition/rendering/ogre/OgreScene.hh" -#include "ignition/rendering/ogre/OgreSensor.hh" -#include "ignition/rendering/ogre/OgreVisual.hh" +#include "gz/rendering/ogre/OgreGeometry.hh" +#include "gz/rendering/ogre/OgreLight.hh" +#include "gz/rendering/ogre/OgreMaterial.hh" +#include "gz/rendering/ogre/OgreMesh.hh" +#include "gz/rendering/ogre/OgreNode.hh" +#include "gz/rendering/ogre/OgreScene.hh" +#include "gz/rendering/ogre/OgreSensor.hh" +#include "gz/rendering/ogre/OgreVisual.hh" namespace gz { diff --git a/ogre/include/gz/rendering/ogre/OgreText.hh b/ogre/include/gz/rendering/ogre/OgreText.hh index b73cc31e1..25f5bc0df 100644 --- a/ogre/include/gz/rendering/ogre/OgreText.hh +++ b/ogre/include/gz/rendering/ogre/OgreText.hh @@ -21,13 +21,13 @@ #include #include -#include -#include +#include +#include -#include "ignition/rendering/base/BaseText.hh" -#include "ignition/rendering/ogre/OgreGeometry.hh" -#include "ignition/rendering/ogre/OgreIncludes.hh" -#include "ignition/rendering/ogre/Export.hh" +#include "gz/rendering/base/BaseText.hh" +#include "gz/rendering/ogre/OgreGeometry.hh" +#include "gz/rendering/ogre/OgreIncludes.hh" +#include "gz/rendering/ogre/Export.hh" namespace gz { diff --git a/ogre/include/gz/rendering/ogre/OgreThermalCamera.hh b/ogre/include/gz/rendering/ogre/OgreThermalCamera.hh index f89a402ce..eed59aefd 100644 --- a/ogre/include/gz/rendering/ogre/OgreThermalCamera.hh +++ b/ogre/include/gz/rendering/ogre/OgreThermalCamera.hh @@ -27,18 +27,18 @@ #include #include -#include "ignition/rendering/RenderTypes.hh" -#include "ignition/rendering/base/BaseThermalCamera.hh" -#include "ignition/rendering/ogre/Export.hh" -#include "ignition/rendering/ogre/OgreConversions.hh" -#include "ignition/rendering/ogre/OgreIncludes.hh" -#include "ignition/rendering/ogre/OgreRenderTarget.hh" -#include "ignition/rendering/ogre/OgreRenderTypes.hh" -#include "ignition/rendering/ogre/OgreScene.hh" -#include "ignition/rendering/ogre/OgreSensor.hh" - -#include "ignition/common/Event.hh" -#include "ignition/common/Console.hh" +#include "gz/rendering/RenderTypes.hh" +#include "gz/rendering/base/BaseThermalCamera.hh" +#include "gz/rendering/ogre/Export.hh" +#include "gz/rendering/ogre/OgreConversions.hh" +#include "gz/rendering/ogre/OgreIncludes.hh" +#include "gz/rendering/ogre/OgreRenderTarget.hh" +#include "gz/rendering/ogre/OgreRenderTypes.hh" +#include "gz/rendering/ogre/OgreScene.hh" +#include "gz/rendering/ogre/OgreSensor.hh" + +#include "gz/common/Event.hh" +#include "gz/common/Console.hh" namespace Ogre diff --git a/ogre/include/gz/rendering/ogre/OgreVisual.hh b/ogre/include/gz/rendering/ogre/OgreVisual.hh index 71757d9d3..93a11f2d8 100644 --- a/ogre/include/gz/rendering/ogre/OgreVisual.hh +++ b/ogre/include/gz/rendering/ogre/OgreVisual.hh @@ -17,9 +17,9 @@ #ifndef GZ_RENDERING_OGRE_OGREVISUAL_HH_ #define GZ_RENDERING_OGRE_OGREVISUAL_HH_ -#include "ignition/rendering/base/BaseVisual.hh" -#include "ignition/rendering/ogre/OgreNode.hh" -#include "ignition/rendering/ogre/OgreRenderTypes.hh" +#include "gz/rendering/base/BaseVisual.hh" +#include "gz/rendering/ogre/OgreNode.hh" +#include "gz/rendering/ogre/OgreRenderTypes.hh" namespace gz { diff --git a/ogre/include/gz/rendering/ogre/ogre.hh.in b/ogre/include/gz/rendering/ogre/ogre.hh.in index acfd26ae7..c4092f0cd 100644 --- a/ogre/include/gz/rendering/ogre/ogre.hh.in +++ b/ogre/include/gz/rendering/ogre/ogre.hh.in @@ -1,3 +1,3 @@ // Automatically generated -#include +#include ${ign_headers} diff --git a/ogre/src/OgreArrowVisual.cc b/ogre/src/OgreArrowVisual.cc index 51f83e9f8..809ec73ae 100644 --- a/ogre/src/OgreArrowVisual.cc +++ b/ogre/src/OgreArrowVisual.cc @@ -14,7 +14,7 @@ * limitations under the License. * */ -#include "ignition/rendering/ogre/OgreArrowVisual.hh" +#include "gz/rendering/ogre/OgreArrowVisual.hh" using namespace gz; using namespace rendering; diff --git a/ogre/src/OgreAxisVisual.cc b/ogre/src/OgreAxisVisual.cc index 3bf4f12fc..e612276cd 100644 --- a/ogre/src/OgreAxisVisual.cc +++ b/ogre/src/OgreAxisVisual.cc @@ -14,7 +14,7 @@ * limitations under the License. * */ -#include "ignition/rendering/ogre/OgreAxisVisual.hh" +#include "gz/rendering/ogre/OgreAxisVisual.hh" using namespace gz; using namespace rendering; diff --git a/ogre/src/OgreCamera.cc b/ogre/src/OgreCamera.cc index 818503664..9e8fa830a 100644 --- a/ogre/src/OgreCamera.cc +++ b/ogre/src/OgreCamera.cc @@ -15,14 +15,14 @@ * */ -#include "ignition/rendering/ogre/OgreCamera.hh" -#include "ignition/rendering/ogre/OgreConversions.hh" -#include "ignition/rendering/ogre/OgreIncludes.hh" -#include "ignition/rendering/ogre/OgreMaterial.hh" -#include "ignition/rendering/ogre/OgreRenderTarget.hh" -#include "ignition/rendering/ogre/OgreScene.hh" -#include "ignition/rendering/ogre/OgreSelectionBuffer.hh" -#include "ignition/rendering/Utils.hh" +#include "gz/rendering/ogre/OgreCamera.hh" +#include "gz/rendering/ogre/OgreConversions.hh" +#include "gz/rendering/ogre/OgreIncludes.hh" +#include "gz/rendering/ogre/OgreMaterial.hh" +#include "gz/rendering/ogre/OgreRenderTarget.hh" +#include "gz/rendering/ogre/OgreScene.hh" +#include "gz/rendering/ogre/OgreSelectionBuffer.hh" +#include "gz/rendering/Utils.hh" using namespace gz; using namespace rendering; diff --git a/ogre/src/OgreConversions.cc b/ogre/src/OgreConversions.cc index 710459834..1362cfe38 100644 --- a/ogre/src/OgreConversions.cc +++ b/ogre/src/OgreConversions.cc @@ -14,7 +14,7 @@ * limitations under the License. * */ -#include "ignition/rendering/ogre/OgreConversions.hh" +#include "gz/rendering/ogre/OgreConversions.hh" using namespace gz; using namespace rendering; diff --git a/ogre/src/OgreDepthCamera.cc b/ogre/src/OgreDepthCamera.cc index e2cc77fc1..12658d8ad 100644 --- a/ogre/src/OgreDepthCamera.cc +++ b/ogre/src/OgreDepthCamera.cc @@ -22,9 +22,9 @@ #endif #include #endif -#include -#include "ignition/rendering/ogre/OgreDepthCamera.hh" -#include "ignition/rendering/ogre/OgreMaterial.hh" +#include +#include "gz/rendering/ogre/OgreDepthCamera.hh" +#include "gz/rendering/ogre/OgreMaterial.hh" /// \internal /// \brief Private data for the OgreDepthCamera class diff --git a/ogre/src/OgreDynamicLines.cc b/ogre/src/OgreDynamicLines.cc index 3284eb388..a9a11ec88 100644 --- a/ogre/src/OgreDynamicLines.cc +++ b/ogre/src/OgreDynamicLines.cc @@ -18,10 +18,10 @@ #include #include -#include +#include -#include "ignition/common/Console.hh" -#include "ignition/rendering/ogre/OgreDynamicLines.hh" +#include "gz/common/Console.hh" +#include "gz/rendering/ogre/OgreDynamicLines.hh" using namespace gz; using namespace rendering; diff --git a/ogre/src/OgreDynamicRenderable.cc b/ogre/src/OgreDynamicRenderable.cc index 727913050..c0e8be934 100644 --- a/ogre/src/OgreDynamicRenderable.cc +++ b/ogre/src/OgreDynamicRenderable.cc @@ -15,8 +15,8 @@ * */ -#include "ignition/common/Console.hh" -#include "ignition/rendering/ogre/OgreDynamicRenderable.hh" +#include "gz/common/Console.hh" +#include "gz/rendering/ogre/OgreDynamicRenderable.hh" using namespace gz; using namespace rendering; diff --git a/ogre/src/OgreGaussianNoisePass.cc b/ogre/src/OgreGaussianNoisePass.cc index 55017aaa8..e40375b74 100644 --- a/ogre/src/OgreGaussianNoisePass.cc +++ b/ogre/src/OgreGaussianNoisePass.cc @@ -16,11 +16,11 @@ */ -#include +#include -#include "ignition/rendering/RenderPassSystem.hh" -#include "ignition/rendering/ogre/OgreIncludes.hh" -#include "ignition/rendering/ogre/OgreGaussianNoisePass.hh" +#include "gz/rendering/RenderPassSystem.hh" +#include "gz/rendering/ogre/OgreIncludes.hh" +#include "gz/rendering/ogre/OgreGaussianNoisePass.hh" namespace gz { diff --git a/ogre/src/OgreGeometry.cc b/ogre/src/OgreGeometry.cc index 7c57aa2ca..787dff754 100644 --- a/ogre/src/OgreGeometry.cc +++ b/ogre/src/OgreGeometry.cc @@ -14,10 +14,10 @@ * limitations under the License. * */ -#include "ignition/rendering/ogre/OgreGeometry.hh" +#include "gz/rendering/ogre/OgreGeometry.hh" -#include "ignition/rendering/ogre/OgreScene.hh" -#include "ignition/rendering/ogre/OgreVisual.hh" +#include "gz/rendering/ogre/OgreScene.hh" +#include "gz/rendering/ogre/OgreVisual.hh" using namespace gz; using namespace rendering; diff --git a/ogre/src/OgreGizmoVisual.cc b/ogre/src/OgreGizmoVisual.cc index 8d42bb7ab..6e3310acf 100644 --- a/ogre/src/OgreGizmoVisual.cc +++ b/ogre/src/OgreGizmoVisual.cc @@ -14,7 +14,7 @@ * limitations under the License. * */ -#include "ignition/rendering/ogre/OgreGizmoVisual.hh" +#include "gz/rendering/ogre/OgreGizmoVisual.hh" using namespace gz; using namespace rendering; diff --git a/ogre/src/OgreGpuRays.cc b/ogre/src/OgreGpuRays.cc index 17bfaedaa..e15fd870d 100644 --- a/ogre/src/OgreGpuRays.cc +++ b/ogre/src/OgreGpuRays.cc @@ -15,17 +15,17 @@ * */ -#include -#include -#include +#include +#include +#include -#include -#include -#include +#include +#include +#include -#include "ignition/rendering/RenderTypes.hh" -#include "ignition/rendering/ogre/OgreCamera.hh" -#include "ignition/rendering/ogre/OgreGpuRays.hh" +#include "gz/rendering/RenderTypes.hh" +#include "gz/rendering/ogre/OgreCamera.hh" +#include "gz/rendering/ogre/OgreGpuRays.hh" /// \internal /// \brief Private data for the OgreGpuRays class diff --git a/ogre/src/OgreGrid.cc b/ogre/src/OgreGrid.cc index d4b01b8fe..bf80ebea1 100644 --- a/ogre/src/OgreGrid.cc +++ b/ogre/src/OgreGrid.cc @@ -15,11 +15,11 @@ * */ -#include +#include -#include "ignition/rendering/ogre/OgreGrid.hh" -#include "ignition/rendering/ogre/OgreMaterial.hh" -#include "ignition/rendering/ogre/OgreScene.hh" +#include "gz/rendering/ogre/OgreGrid.hh" +#include "gz/rendering/ogre/OgreMaterial.hh" +#include "gz/rendering/ogre/OgreScene.hh" class gz::rendering::OgreGridPrivate { diff --git a/ogre/src/OgreLight.cc b/ogre/src/OgreLight.cc index 3c9953d66..960d4586f 100644 --- a/ogre/src/OgreLight.cc +++ b/ogre/src/OgreLight.cc @@ -15,13 +15,13 @@ * */ -#include +#include -#include "ignition/rendering/ogre/OgreLight.hh" +#include "gz/rendering/ogre/OgreLight.hh" -#include "ignition/rendering/ogre/OgreConversions.hh" -#include "ignition/rendering/ogre/OgreIncludes.hh" -#include "ignition/rendering/ogre/OgreScene.hh" +#include "gz/rendering/ogre/OgreConversions.hh" +#include "gz/rendering/ogre/OgreIncludes.hh" +#include "gz/rendering/ogre/OgreScene.hh" using namespace gz; using namespace rendering; diff --git a/ogre/src/OgreMarker.cc b/ogre/src/OgreMarker.cc index 340f0024d..539adc065 100644 --- a/ogre/src/OgreMarker.cc +++ b/ogre/src/OgreMarker.cc @@ -15,13 +15,13 @@ * */ -#include +#include -#include "ignition/rendering/ogre/OgreDynamicLines.hh" -#include "ignition/rendering/ogre/OgreMarker.hh" -#include "ignition/rendering/ogre/OgreMaterial.hh" -#include "ignition/rendering/ogre/OgreMesh.hh" -#include "ignition/rendering/ogre/OgreScene.hh" +#include "gz/rendering/ogre/OgreDynamicLines.hh" +#include "gz/rendering/ogre/OgreMarker.hh" +#include "gz/rendering/ogre/OgreMaterial.hh" +#include "gz/rendering/ogre/OgreMesh.hh" +#include "gz/rendering/ogre/OgreScene.hh" class gz::rendering::OgreMarkerPrivate { diff --git a/ogre/src/OgreMaterial.cc b/ogre/src/OgreMaterial.cc index 881d0052d..5dec1934a 100644 --- a/ogre/src/OgreMaterial.cc +++ b/ogre/src/OgreMaterial.cc @@ -15,15 +15,15 @@ * */ -#include -#include - -#include "ignition/rendering/ShaderParams.hh" -#include "ignition/rendering/ogre/OgreMaterial.hh" -#include "ignition/rendering/ogre/OgreConversions.hh" -#include "ignition/rendering/ogre/OgreRenderEngine.hh" -#include "ignition/rendering/ogre/OgreRTShaderSystem.hh" -#include "ignition/rendering/ogre/OgreScene.hh" +#include +#include + +#include "gz/rendering/ShaderParams.hh" +#include "gz/rendering/ogre/OgreMaterial.hh" +#include "gz/rendering/ogre/OgreConversions.hh" +#include "gz/rendering/ogre/OgreRenderEngine.hh" +#include "gz/rendering/ogre/OgreRTShaderSystem.hh" +#include "gz/rendering/ogre/OgreScene.hh" using namespace gz; using namespace rendering; diff --git a/ogre/src/OgreMaterialSwitcher.cc b/ogre/src/OgreMaterialSwitcher.cc index 1b2f903c9..2814146cf 100644 --- a/ogre/src/OgreMaterialSwitcher.cc +++ b/ogre/src/OgreMaterialSwitcher.cc @@ -15,10 +15,10 @@ * */ -#include "ignition/common/Console.hh" -#include "ignition/rendering/ogre/OgreIncludes.hh" -#include "ignition/rendering/ogre/OgreMaterialSwitcher.hh" -#include "ignition/rendering/RenderTypes.hh" +#include "gz/common/Console.hh" +#include "gz/rendering/ogre/OgreIncludes.hh" +#include "gz/rendering/ogre/OgreMaterialSwitcher.hh" +#include "gz/rendering/RenderTypes.hh" using namespace gz; using namespace rendering; diff --git a/ogre/src/OgreMesh.cc b/ogre/src/OgreMesh.cc index 741fca8fd..b408181da 100644 --- a/ogre/src/OgreMesh.cc +++ b/ogre/src/OgreMesh.cc @@ -15,13 +15,13 @@ * */ -#include +#include -#include "ignition/rendering/ogre/OgreMesh.hh" -#include "ignition/rendering/ogre/OgreIncludes.hh" -#include "ignition/rendering/ogre/OgreMaterial.hh" -#include "ignition/rendering/ogre/OgreStorage.hh" -#include "ignition/rendering/ogre/OgreRTShaderSystem.hh" +#include "gz/rendering/ogre/OgreMesh.hh" +#include "gz/rendering/ogre/OgreIncludes.hh" +#include "gz/rendering/ogre/OgreMaterial.hh" +#include "gz/rendering/ogre/OgreStorage.hh" +#include "gz/rendering/ogre/OgreRTShaderSystem.hh" using namespace gz; using namespace rendering; diff --git a/ogre/src/OgreMeshFactory.cc b/ogre/src/OgreMeshFactory.cc index 0fa331b77..faf18ef08 100644 --- a/ogre/src/OgreMeshFactory.cc +++ b/ogre/src/OgreMeshFactory.cc @@ -18,20 +18,20 @@ #include -#include -#include -#include -#include -#include - -#include - -#include "ignition/rendering/ogre/OgreMeshFactory.hh" -#include "ignition/rendering/ogre/OgreRenderEngine.hh" -#include "ignition/rendering/ogre/OgreMesh.hh" -#include "ignition/rendering/ogre/OgreScene.hh" -#include "ignition/rendering/ogre/OgreStorage.hh" -#include "ignition/rendering/ogre/OgreIncludes.hh" +#include +#include +#include +#include +#include + +#include + +#include "gz/rendering/ogre/OgreMeshFactory.hh" +#include "gz/rendering/ogre/OgreRenderEngine.hh" +#include "gz/rendering/ogre/OgreMesh.hh" +#include "gz/rendering/ogre/OgreScene.hh" +#include "gz/rendering/ogre/OgreStorage.hh" +#include "gz/rendering/ogre/OgreIncludes.hh" using namespace gz; using namespace rendering; diff --git a/ogre/src/OgreNode.cc b/ogre/src/OgreNode.cc index 9b1c40651..36ed82c4a 100644 --- a/ogre/src/OgreNode.cc +++ b/ogre/src/OgreNode.cc @@ -15,13 +15,13 @@ * */ -#include +#include -#include "ignition/rendering/ogre/OgreNode.hh" -#include "ignition/rendering/ogre/OgreConversions.hh" -#include "ignition/rendering/ogre/OgreIncludes.hh" -#include "ignition/rendering/ogre/OgreScene.hh" -#include "ignition/rendering/ogre/OgreStorage.hh" +#include "gz/rendering/ogre/OgreNode.hh" +#include "gz/rendering/ogre/OgreConversions.hh" +#include "gz/rendering/ogre/OgreIncludes.hh" +#include "gz/rendering/ogre/OgreScene.hh" +#include "gz/rendering/ogre/OgreStorage.hh" using namespace gz; using namespace rendering; diff --git a/ogre/src/OgreObject.cc b/ogre/src/OgreObject.cc index cea595082..c543ea6cf 100644 --- a/ogre/src/OgreObject.cc +++ b/ogre/src/OgreObject.cc @@ -14,9 +14,9 @@ * limitations under the License. * */ -#include "ignition/rendering/ogre/OgreObject.hh" +#include "gz/rendering/ogre/OgreObject.hh" -#include "ignition/rendering/ogre/OgreScene.hh" +#include "gz/rendering/ogre/OgreScene.hh" using namespace gz; using namespace rendering; diff --git a/ogre/src/OgreRTShaderSystem.cc b/ogre/src/OgreRTShaderSystem.cc index 6cfd11d20..286edf0b0 100644 --- a/ogre/src/OgreRTShaderSystem.cc +++ b/ogre/src/OgreRTShaderSystem.cc @@ -24,16 +24,16 @@ #include #include -#include -#include -#include - -#include "ignition/rendering/config.hh" -#include "ignition/rendering/ogre/OgreRenderEngine.hh" -#include "ignition/rendering/ogre/OgreScene.hh" -#include "ignition/rendering/ogre/OgreMaterial.hh" -#include "ignition/rendering/ogre/OgreMesh.hh" -#include "ignition/rendering/ogre/OgreRTShaderSystem.hh" +#include +#include +#include + +#include "gz/rendering/config.hh" +#include "gz/rendering/ogre/OgreRenderEngine.hh" +#include "gz/rendering/ogre/OgreScene.hh" +#include "gz/rendering/ogre/OgreMaterial.hh" +#include "gz/rendering/ogre/OgreMesh.hh" +#include "gz/rendering/ogre/OgreRTShaderSystem.hh" class gz::rendering::OgreRTShaderSystemPrivate { diff --git a/ogre/src/OgreRayQuery.cc b/ogre/src/OgreRayQuery.cc index 171f99af9..50bd66354 100644 --- a/ogre/src/OgreRayQuery.cc +++ b/ogre/src/OgreRayQuery.cc @@ -17,13 +17,13 @@ #include -#include +#include -#include "ignition/rendering/ogre/OgreIncludes.hh" -#include "ignition/rendering/ogre/OgreCamera.hh" -#include "ignition/rendering/ogre/OgreConversions.hh" -#include "ignition/rendering/ogre/OgreRayQuery.hh" -#include "ignition/rendering/ogre/OgreScene.hh" +#include "gz/rendering/ogre/OgreIncludes.hh" +#include "gz/rendering/ogre/OgreCamera.hh" +#include "gz/rendering/ogre/OgreConversions.hh" +#include "gz/rendering/ogre/OgreRayQuery.hh" +#include "gz/rendering/ogre/OgreScene.hh" class gz::rendering::OgreRayQueryPrivate { diff --git a/ogre/src/OgreRenderEngine.cc b/ogre/src/OgreRenderEngine.cc index 319a29a93..543748ddb 100644 --- a/ogre/src/OgreRenderEngine.cc +++ b/ogre/src/OgreRenderEngine.cc @@ -30,19 +30,19 @@ # include -#include - -#include -#include -#include - -#include "ignition/rendering/RenderEngineManager.hh" -#include "ignition/rendering/ogre/OgreIncludes.hh" -#include "ignition/rendering/ogre/OgreRenderEngine.hh" -#include "ignition/rendering/ogre/OgreRenderTypes.hh" -#include "ignition/rendering/ogre/OgreRTShaderSystem.hh" -#include "ignition/rendering/ogre/OgreScene.hh" -#include "ignition/rendering/ogre/OgreStorage.hh" +#include + +#include +#include +#include + +#include "gz/rendering/RenderEngineManager.hh" +#include "gz/rendering/ogre/OgreIncludes.hh" +#include "gz/rendering/ogre/OgreRenderEngine.hh" +#include "gz/rendering/ogre/OgreRenderTypes.hh" +#include "gz/rendering/ogre/OgreRTShaderSystem.hh" +#include "gz/rendering/ogre/OgreScene.hh" +#include "gz/rendering/ogre/OgreStorage.hh" class gz::rendering::OgreRenderEnginePrivate { diff --git a/ogre/src/OgreRenderPass.cc b/ogre/src/OgreRenderPass.cc index 81608df6b..0146a499d 100644 --- a/ogre/src/OgreRenderPass.cc +++ b/ogre/src/OgreRenderPass.cc @@ -14,7 +14,7 @@ * limitations under the License. * */ -#include "ignition/rendering/ogre/OgreRenderPass.hh" +#include "gz/rendering/ogre/OgreRenderPass.hh" using namespace gz; diff --git a/ogre/src/OgreRenderTarget.cc b/ogre/src/OgreRenderTarget.cc index fc1c98043..fa98e3cff 100644 --- a/ogre/src/OgreRenderTarget.cc +++ b/ogre/src/OgreRenderTarget.cc @@ -33,19 +33,19 @@ #endif -#include - -#include "ignition/rendering/Material.hh" - -#include "ignition/rendering/ogre/OgreRenderEngine.hh" -#include "ignition/rendering/ogre/OgreRenderPass.hh" -#include "ignition/rendering/ogre/OgreConversions.hh" -#include "ignition/rendering/ogre/OgreMaterial.hh" -#include "ignition/rendering/ogre/OgreRenderTarget.hh" -#include "ignition/rendering/ogre/OgreRTShaderSystem.hh" -#include "ignition/rendering/ogre/OgreScene.hh" -#include "ignition/rendering/ogre/OgreCamera.hh" -#include "ignition/rendering/ogre/OgreIncludes.hh" +#include + +#include "gz/rendering/Material.hh" + +#include "gz/rendering/ogre/OgreRenderEngine.hh" +#include "gz/rendering/ogre/OgreRenderPass.hh" +#include "gz/rendering/ogre/OgreConversions.hh" +#include "gz/rendering/ogre/OgreMaterial.hh" +#include "gz/rendering/ogre/OgreRenderTarget.hh" +#include "gz/rendering/ogre/OgreRTShaderSystem.hh" +#include "gz/rendering/ogre/OgreScene.hh" +#include "gz/rendering/ogre/OgreCamera.hh" +#include "gz/rendering/ogre/OgreIncludes.hh" using namespace gz; using namespace rendering; diff --git a/ogre/src/OgreRenderTargetMaterial.cc b/ogre/src/OgreRenderTargetMaterial.cc index 509ae2fda..9215ea996 100644 --- a/ogre/src/OgreRenderTargetMaterial.cc +++ b/ogre/src/OgreRenderTargetMaterial.cc @@ -15,8 +15,8 @@ * */ -#include "ignition/rendering/ogre/OgreScene.hh" -#include "ignition/rendering/ogre/OgreRenderTargetMaterial.hh" +#include "gz/rendering/ogre/OgreScene.hh" +#include "gz/rendering/ogre/OgreRenderTargetMaterial.hh" using namespace gz::rendering; diff --git a/ogre/src/OgreScene.cc b/ogre/src/OgreScene.cc index b557312d6..8b3c6c046 100644 --- a/ogre/src/OgreScene.cc +++ b/ogre/src/OgreScene.cc @@ -15,30 +15,30 @@ * */ -#include - -#include "ignition/rendering/ogre/OgreArrowVisual.hh" -#include "ignition/rendering/ogre/OgreAxisVisual.hh" -#include "ignition/rendering/ogre/OgreCamera.hh" -#include "ignition/rendering/ogre/OgreDepthCamera.hh" -#include "ignition/rendering/ogre/OgreConversions.hh" -#include "ignition/rendering/ogre/OgreGeometry.hh" -#include "ignition/rendering/ogre/OgreGizmoVisual.hh" -#include "ignition/rendering/ogre/OgreGpuRays.hh" -#include "ignition/rendering/ogre/OgreGrid.hh" -#include "ignition/rendering/ogre/OgreIncludes.hh" -#include "ignition/rendering/ogre/OgreText.hh" -#include "ignition/rendering/ogre/OgreMaterial.hh" -#include "ignition/rendering/ogre/OgreMarker.hh" -#include "ignition/rendering/ogre/OgreMeshFactory.hh" -#include "ignition/rendering/ogre/OgreRayQuery.hh" -#include "ignition/rendering/ogre/OgreRenderEngine.hh" -#include "ignition/rendering/ogre/OgreRenderTarget.hh" -#include "ignition/rendering/ogre/OgreRTShaderSystem.hh" -#include "ignition/rendering/ogre/OgreScene.hh" -#include "ignition/rendering/ogre/OgreStorage.hh" -#include "ignition/rendering/ogre/OgreThermalCamera.hh" -#include "ignition/rendering/ogre/OgreVisual.hh" +#include + +#include "gz/rendering/ogre/OgreArrowVisual.hh" +#include "gz/rendering/ogre/OgreAxisVisual.hh" +#include "gz/rendering/ogre/OgreCamera.hh" +#include "gz/rendering/ogre/OgreDepthCamera.hh" +#include "gz/rendering/ogre/OgreConversions.hh" +#include "gz/rendering/ogre/OgreGeometry.hh" +#include "gz/rendering/ogre/OgreGizmoVisual.hh" +#include "gz/rendering/ogre/OgreGpuRays.hh" +#include "gz/rendering/ogre/OgreGrid.hh" +#include "gz/rendering/ogre/OgreIncludes.hh" +#include "gz/rendering/ogre/OgreText.hh" +#include "gz/rendering/ogre/OgreMaterial.hh" +#include "gz/rendering/ogre/OgreMarker.hh" +#include "gz/rendering/ogre/OgreMeshFactory.hh" +#include "gz/rendering/ogre/OgreRayQuery.hh" +#include "gz/rendering/ogre/OgreRenderEngine.hh" +#include "gz/rendering/ogre/OgreRenderTarget.hh" +#include "gz/rendering/ogre/OgreRTShaderSystem.hh" +#include "gz/rendering/ogre/OgreScene.hh" +#include "gz/rendering/ogre/OgreStorage.hh" +#include "gz/rendering/ogre/OgreThermalCamera.hh" +#include "gz/rendering/ogre/OgreVisual.hh" namespace gz { diff --git a/ogre/src/OgreSelectionBuffer.cc b/ogre/src/OgreSelectionBuffer.cc index ded4b4d2e..49815dd0e 100644 --- a/ogre/src/OgreSelectionBuffer.cc +++ b/ogre/src/OgreSelectionBuffer.cc @@ -16,13 +16,13 @@ */ #include -#include +#include -#include "ignition/common/Console.hh" -#include "ignition/rendering/RenderTypes.hh" -#include "ignition/rendering/ogre/OgreIncludes.hh" -#include "ignition/rendering/ogre/OgreMaterialSwitcher.hh" -#include "ignition/rendering/ogre/OgreSelectionBuffer.hh" +#include "gz/common/Console.hh" +#include "gz/rendering/RenderTypes.hh" +#include "gz/rendering/ogre/OgreIncludes.hh" +#include "gz/rendering/ogre/OgreMaterialSwitcher.hh" +#include "gz/rendering/ogre/OgreSelectionBuffer.hh" using namespace gz; using namespace rendering; diff --git a/ogre/src/OgreSensor.cc b/ogre/src/OgreSensor.cc index 27e342334..b45f5978a 100644 --- a/ogre/src/OgreSensor.cc +++ b/ogre/src/OgreSensor.cc @@ -14,7 +14,7 @@ * limitations under the License. * */ -#include "ignition/rendering/ogre/OgreSensor.hh" +#include "gz/rendering/ogre/OgreSensor.hh" using namespace gz; using namespace rendering; diff --git a/ogre/src/OgreText.cc b/ogre/src/OgreText.cc index 0fe8da5f3..d2edd4c3f 100644 --- a/ogre/src/OgreText.cc +++ b/ogre/src/OgreText.cc @@ -20,12 +20,12 @@ #include #endif -#include -#include +#include +#include -#include "ignition/rendering/ogre/OgreMaterial.hh" -#include "ignition/rendering/ogre/OgreScene.hh" -#include "ignition/rendering/ogre/OgreText.hh" +#include "gz/rendering/ogre/OgreMaterial.hh" +#include "gz/rendering/ogre/OgreScene.hh" +#include "gz/rendering/ogre/OgreText.hh" #define POS_TEX_BINDING 0 #define COLOUR_BINDING 1 diff --git a/ogre/src/OgreThermalCamera.cc b/ogre/src/OgreThermalCamera.cc index 52ba8d338..1b9e1ecdf 100644 --- a/ogre/src/OgreThermalCamera.cc +++ b/ogre/src/OgreThermalCamera.cc @@ -25,11 +25,11 @@ #include -#include -#include "ignition/rendering/ShaderParams.hh" -#include "ignition/rendering/ogre/OgreThermalCamera.hh" -#include "ignition/rendering/ogre/OgreMaterial.hh" -#include "ignition/rendering/ogre/OgreVisual.hh" +#include +#include "gz/rendering/ShaderParams.hh" +#include "gz/rendering/ogre/OgreThermalCamera.hh" +#include "gz/rendering/ogre/OgreMaterial.hh" +#include "gz/rendering/ogre/OgreVisual.hh" namespace gz { diff --git a/ogre/src/OgreVisual.cc b/ogre/src/OgreVisual.cc index e9f6308a1..a40c922b8 100644 --- a/ogre/src/OgreVisual.cc +++ b/ogre/src/OgreVisual.cc @@ -15,11 +15,11 @@ * */ -#include +#include -#include "ignition/rendering/ogre/OgreVisual.hh" -#include "ignition/rendering/ogre/OgreConversions.hh" -#include "ignition/rendering/ogre/OgreStorage.hh" +#include "gz/rendering/ogre/OgreVisual.hh" +#include "gz/rendering/ogre/OgreConversions.hh" +#include "gz/rendering/ogre/OgreStorage.hh" using namespace gz; using namespace rendering; diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2Camera.hh b/ogre2/include/gz/rendering/ogre2/Ogre2Camera.hh index 44534d6d1..e9d9bc133 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2Camera.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2Camera.hh @@ -17,9 +17,9 @@ #ifndef GZ_RENDERING_OGRE2_OGRE2CAMERA_HH_ #define GZ_RENDERING_OGRE2_OGRE2CAMERA_HH_ -#include "ignition/rendering/base/BaseCamera.hh" -#include "ignition/rendering/ogre2/Ogre2RenderTypes.hh" -#include "ignition/rendering/ogre2/Ogre2Sensor.hh" +#include "gz/rendering/base/BaseCamera.hh" +#include "gz/rendering/ogre2/Ogre2RenderTypes.hh" +#include "gz/rendering/ogre2/Ogre2Sensor.hh" namespace Ogre { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2Conversions.hh b/ogre2/include/gz/rendering/ogre2/Ogre2Conversions.hh index d2a620255..d71a9dcc0 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2Conversions.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2Conversions.hh @@ -17,15 +17,15 @@ #ifndef GZ_RENDERING_OGRE2_OGRE2CONVERSIONS_HH_ #define GZ_RENDERING_OGRE2_OGRE2CONVERSIONS_HH_ -#include -#include -#include -#include +#include +#include +#include +#include -#include "ignition/rendering/config.hh" -#include "ignition/rendering/PixelFormat.hh" -#include "ignition/rendering/ogre2/Ogre2Includes.hh" -#include "ignition/rendering/ogre2/Export.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/PixelFormat.hh" +#include "gz/rendering/ogre2/Ogre2Includes.hh" +#include "gz/rendering/ogre2/Export.hh" namespace gz { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2DepthCamera.hh b/ogre2/include/gz/rendering/ogre2/Ogre2DepthCamera.hh index 379c97c5f..5481024fb 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2DepthCamera.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2DepthCamera.hh @@ -27,12 +27,12 @@ #include #include -#include "ignition/rendering/base/BaseDepthCamera.hh" -#include "ignition/rendering/ogre2/Ogre2Includes.hh" -#include "ignition/rendering/ogre2/Ogre2Sensor.hh" +#include "gz/rendering/base/BaseDepthCamera.hh" +#include "gz/rendering/ogre2/Ogre2Includes.hh" +#include "gz/rendering/ogre2/Ogre2Sensor.hh" -#include "ignition/common/Event.hh" -#include "ignition/common/Console.hh" +#include "gz/common/Event.hh" +#include "gz/common/Console.hh" namespace Ogre { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2DynamicRenderable.hh b/ogre2/include/gz/rendering/ogre2/Ogre2DynamicRenderable.hh index 8229e9f89..168c6c8a0 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2DynamicRenderable.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2DynamicRenderable.hh @@ -21,10 +21,10 @@ #include #include -#include "ignition/rendering/ogre2/Export.hh" -#include "ignition/rendering/ogre2/Ogre2Includes.hh" -#include "ignition/rendering/ogre2/Ogre2RenderTypes.hh" -#include "ignition/rendering/Marker.hh" +#include "gz/rendering/ogre2/Export.hh" +#include "gz/rendering/ogre2/Ogre2Includes.hh" +#include "gz/rendering/ogre2/Ogre2RenderTypes.hh" +#include "gz/rendering/Marker.hh" namespace gz { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2GaussianNoisePass.hh b/ogre2/include/gz/rendering/ogre2/Ogre2GaussianNoisePass.hh index 3de6971a2..1fc33b6a4 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2GaussianNoisePass.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2GaussianNoisePass.hh @@ -17,10 +17,10 @@ #ifndef GZ_RENDERING_OGRE2_OGRE2GAUSSIANNOISEPASS_HH_ #define GZ_RENDERING_OGRE2_OGRE2GAUSSIANNOISEPASS_HH_ -#include "ignition/rendering/base/BaseGaussianNoisePass.hh" -#include "ignition/rendering/ogre2/Ogre2Includes.hh" -#include "ignition/rendering/ogre2/Ogre2RenderPass.hh" -#include "ignition/rendering/ogre2/Export.hh" +#include "gz/rendering/base/BaseGaussianNoisePass.hh" +#include "gz/rendering/ogre2/Ogre2Includes.hh" +#include "gz/rendering/ogre2/Ogre2RenderPass.hh" +#include "gz/rendering/ogre2/Export.hh" namespace gz { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2Geometry.hh b/ogre2/include/gz/rendering/ogre2/Ogre2Geometry.hh index c503b1f5c..be8730b54 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2Geometry.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2Geometry.hh @@ -17,8 +17,8 @@ #ifndef GZ_RENDERING_OGRE2_OGRE2GEOMETRY_HH_ #define GZ_RENDERING_OGRE2_OGRE2GEOMETRY_HH_ -#include "ignition/rendering/base/BaseGeometry.hh" -#include "ignition/rendering/ogre2/Ogre2Object.hh" +#include "gz/rendering/base/BaseGeometry.hh" +#include "gz/rendering/ogre2/Ogre2Object.hh" namespace Ogre { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2GizmoVisual.hh b/ogre2/include/gz/rendering/ogre2/Ogre2GizmoVisual.hh index 944f1214f..9681d2afc 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2GizmoVisual.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2GizmoVisual.hh @@ -17,8 +17,8 @@ #ifndef GZ_RENDERING_OGRE2_OGRE2GIZMOVISUAL_HH_ #define GZ_RENDERING_OGRE2_OGRE2GIZMOVISUAL_HH_ -#include "ignition/rendering/base/BaseGizmoVisual.hh" -#include "ignition/rendering/ogre2/Ogre2Visual.hh" +#include "gz/rendering/base/BaseGizmoVisual.hh" +#include "gz/rendering/ogre2/Ogre2Visual.hh" namespace gz { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2GpuRays.hh b/ogre2/include/gz/rendering/ogre2/Ogre2GpuRays.hh index 61613e03f..5bccb331b 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2GpuRays.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2GpuRays.hh @@ -21,17 +21,17 @@ #include #include -#include "ignition/rendering/RenderTypes.hh" -#include "ignition/rendering/base/BaseGpuRays.hh" -#include "ignition/rendering/ogre2/Export.hh" -#include "ignition/rendering/ogre2/Ogre2Includes.hh" -#include "ignition/rendering/ogre2/Ogre2RenderTarget.hh" -#include "ignition/rendering/ogre2/Ogre2RenderTypes.hh" -#include "ignition/rendering/ogre2/Ogre2Scene.hh" -#include "ignition/rendering/ogre2/Ogre2Sensor.hh" - -#include "ignition/common/Event.hh" -#include "ignition/common/Console.hh" +#include "gz/rendering/RenderTypes.hh" +#include "gz/rendering/base/BaseGpuRays.hh" +#include "gz/rendering/ogre2/Export.hh" +#include "gz/rendering/ogre2/Ogre2Includes.hh" +#include "gz/rendering/ogre2/Ogre2RenderTarget.hh" +#include "gz/rendering/ogre2/Ogre2RenderTypes.hh" +#include "gz/rendering/ogre2/Ogre2Scene.hh" +#include "gz/rendering/ogre2/Ogre2Sensor.hh" + +#include "gz/common/Event.hh" +#include "gz/common/Console.hh" namespace Ogre { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2Grid.hh b/ogre2/include/gz/rendering/ogre2/Ogre2Grid.hh index 4c474cf0b..414856b51 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2Grid.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2Grid.hh @@ -19,9 +19,9 @@ #define GZ_RENDERING_OGRE2_OGRE2GRID_HH_ #include -#include "ignition/rendering/base/BaseGrid.hh" -#include "ignition/rendering/ogre2/Ogre2Geometry.hh" -#include "ignition/rendering/ogre2/Ogre2Includes.hh" +#include "gz/rendering/base/BaseGrid.hh" +#include "gz/rendering/ogre2/Ogre2Geometry.hh" +#include "gz/rendering/ogre2/Ogre2Includes.hh" namespace Ogre { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2Light.hh b/ogre2/include/gz/rendering/ogre2/Ogre2Light.hh index 3c24f68b7..183fad17a 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2Light.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2Light.hh @@ -17,9 +17,9 @@ #ifndef GZ_RENDERING_OGRE2_OGRE2LIGHT_HH_ #define GZ_RENDERING_OGRE2_OGRE2LIGHT_HH_ -#include "ignition/rendering/base/BaseLight.hh" -#include "ignition/rendering/ogre2/Ogre2Node.hh" -#include "ignition/rendering/ogre2/Ogre2Includes.hh" +#include "gz/rendering/base/BaseLight.hh" +#include "gz/rendering/ogre2/Ogre2Node.hh" +#include "gz/rendering/ogre2/Ogre2Includes.hh" namespace Ogre { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2Marker.hh b/ogre2/include/gz/rendering/ogre2/Ogre2Marker.hh index bea5cf0da..bab534fa7 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2Marker.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2Marker.hh @@ -19,9 +19,9 @@ #define GZ_RENDERING_OGRE2_OGREMARKER_HH_ #include -#include "ignition/rendering/base/BaseMarker.hh" -#include "ignition/rendering/ogre2/Ogre2Geometry.hh" -#include "ignition/rendering/ogre2/Ogre2Includes.hh" +#include "gz/rendering/base/BaseMarker.hh" +#include "gz/rendering/ogre2/Ogre2Geometry.hh" +#include "gz/rendering/ogre2/Ogre2Includes.hh" namespace gz { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2Material.hh b/ogre2/include/gz/rendering/ogre2/Ogre2Material.hh index 8366944e4..ce8eef513 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2Material.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2Material.hh @@ -19,9 +19,9 @@ #include -#include "ignition/rendering/base/BaseMaterial.hh" -#include "ignition/rendering/ogre2/Ogre2Object.hh" -#include "ignition/rendering/ogre2/Ogre2Includes.hh" +#include "gz/rendering/base/BaseMaterial.hh" +#include "gz/rendering/ogre2/Ogre2Object.hh" +#include "gz/rendering/ogre2/Ogre2Includes.hh" namespace gz { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2MaterialSwitcher.hh b/ogre2/include/gz/rendering/ogre2/Ogre2MaterialSwitcher.hh index 6881026e6..0cf5137c3 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2MaterialSwitcher.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2MaterialSwitcher.hh @@ -21,11 +21,11 @@ #include #include -#include -#include "ignition/rendering/config.hh" -#include "ignition/rendering/ogre2/Export.hh" -#include "ignition/rendering/ogre2/Ogre2Includes.hh" -#include "ignition/rendering/ogre2/Ogre2RenderTypes.hh" +#include +#include "gz/rendering/config.hh" +#include "gz/rendering/ogre2/Export.hh" +#include "gz/rendering/ogre2/Ogre2Includes.hh" +#include "gz/rendering/ogre2/Ogre2RenderTypes.hh" namespace gz { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2Mesh.hh b/ogre2/include/gz/rendering/ogre2/Ogre2Mesh.hh index fac4adde4..42bb4d4b2 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2Mesh.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2Mesh.hh @@ -20,10 +20,10 @@ #include #include #include -#include "ignition/rendering/base/BaseMesh.hh" -#include "ignition/rendering/ogre2/Ogre2Geometry.hh" -#include "ignition/rendering/ogre2/Ogre2Object.hh" -#include "ignition/rendering/ogre2/Ogre2RenderTypes.hh" +#include "gz/rendering/base/BaseMesh.hh" +#include "gz/rendering/ogre2/Ogre2Geometry.hh" +#include "gz/rendering/ogre2/Ogre2Object.hh" +#include "gz/rendering/ogre2/Ogre2RenderTypes.hh" namespace Ogre { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2MeshFactory.hh b/ogre2/include/gz/rendering/ogre2/Ogre2MeshFactory.hh index 19b19fbe2..77a09bf3e 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2MeshFactory.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2MeshFactory.hh @@ -20,11 +20,11 @@ #include #include -#include "ignition/rendering/config.hh" -#include "ignition/rendering/MeshDescriptor.hh" -#include "ignition/rendering/ogre2/Ogre2Mesh.hh" -#include "ignition/rendering/ogre2/Ogre2RenderTypes.hh" -#include "ignition/rendering/ogre2/Export.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/MeshDescriptor.hh" +#include "gz/rendering/ogre2/Ogre2Mesh.hh" +#include "gz/rendering/ogre2/Ogre2RenderTypes.hh" +#include "gz/rendering/ogre2/Export.hh" namespace Ogre { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2Node.hh b/ogre2/include/gz/rendering/ogre2/Ogre2Node.hh index ff48fe18c..5290e0bd4 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2Node.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2Node.hh @@ -17,9 +17,9 @@ #ifndef GZ_RENDERING_OGRE2_OGRE2NODE_HH_ #define GZ_RENDERING_OGRE2_OGRE2NODE_HH_ -#include "ignition/rendering/base/BaseNode.hh" -#include "ignition/rendering/ogre2/Ogre2RenderTypes.hh" -#include "ignition/rendering/ogre2/Ogre2Object.hh" +#include "gz/rendering/base/BaseNode.hh" +#include "gz/rendering/ogre2/Ogre2RenderTypes.hh" +#include "gz/rendering/ogre2/Ogre2Object.hh" namespace Ogre { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2Object.hh b/ogre2/include/gz/rendering/ogre2/Ogre2Object.hh index d33afe2e8..8d20a2b0e 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2Object.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2Object.hh @@ -17,10 +17,10 @@ #ifndef GZ_RENDERING_OGRE2_OGRE2OBJECT_HH_ #define GZ_RENDERING_OGRE2_OGRE2OBJECT_HH_ -#include "ignition/rendering/config.hh" -#include "ignition/rendering/base/BaseObject.hh" -#include "ignition/rendering/ogre2/Ogre2RenderTypes.hh" -#include "ignition/rendering/ogre2/Export.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/base/BaseObject.hh" +#include "gz/rendering/ogre2/Ogre2RenderTypes.hh" +#include "gz/rendering/ogre2/Export.hh" namespace gz { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2RayQuery.hh b/ogre2/include/gz/rendering/ogre2/Ogre2RayQuery.hh index c122df283..9a2f58a62 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2RayQuery.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2RayQuery.hh @@ -19,10 +19,10 @@ #include -#include "ignition/rendering/base/BaseRayQuery.hh" -#include "ignition/rendering/ogre2/Ogre2Includes.hh" -#include "ignition/rendering/ogre2/Ogre2Object.hh" -#include "ignition/rendering/ogre2/Ogre2RenderTypes.hh" +#include "gz/rendering/base/BaseRayQuery.hh" +#include "gz/rendering/ogre2/Ogre2Includes.hh" +#include "gz/rendering/ogre2/Ogre2Object.hh" +#include "gz/rendering/ogre2/Ogre2RenderTypes.hh" namespace gz { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2RenderEngine.hh b/ogre2/include/gz/rendering/ogre2/Ogre2RenderEngine.hh index f7a888706..8809e054f 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2RenderEngine.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2RenderEngine.hh @@ -22,13 +22,13 @@ #include #include -#include +#include -#include "ignition/rendering/RenderEnginePlugin.hh" -#include "ignition/rendering/base/BaseRenderEngine.hh" -#include "ignition/rendering/base/BaseRenderTypes.hh" -#include "ignition/rendering/ogre2/Ogre2RenderTypes.hh" -#include "ignition/rendering/ogre2/Export.hh" +#include "gz/rendering/RenderEnginePlugin.hh" +#include "gz/rendering/base/BaseRenderEngine.hh" +#include "gz/rendering/base/BaseRenderTypes.hh" +#include "gz/rendering/ogre2/Ogre2RenderTypes.hh" +#include "gz/rendering/ogre2/Export.hh" namespace Ogre { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2RenderPass.hh b/ogre2/include/gz/rendering/ogre2/Ogre2RenderPass.hh index 409ae4870..8b74ec5db 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2RenderPass.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2RenderPass.hh @@ -19,10 +19,10 @@ #include -#include "ignition/rendering/base/BaseRenderPass.hh" -#include "ignition/rendering/ogre2/Export.hh" -#include "ignition/rendering/ogre2/Ogre2Includes.hh" -#include "ignition/rendering/ogre2/Ogre2Object.hh" +#include "gz/rendering/base/BaseRenderPass.hh" +#include "gz/rendering/ogre2/Export.hh" +#include "gz/rendering/ogre2/Ogre2Includes.hh" +#include "gz/rendering/ogre2/Ogre2Object.hh" namespace gz { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2RenderTarget.hh b/ogre2/include/gz/rendering/ogre2/Ogre2RenderTarget.hh index ff3fc36fe..48bdc1da8 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2RenderTarget.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2RenderTarget.hh @@ -19,13 +19,13 @@ #include #include -#include +#include -#include "ignition/rendering/base/BaseRenderTypes.hh" -#include "ignition/rendering/base/BaseRenderTarget.hh" -#include "ignition/rendering/ogre2/Ogre2Includes.hh" -#include "ignition/rendering/ogre2/Ogre2Object.hh" -#include "ignition/rendering/ogre2/Ogre2RenderTargetMaterial.hh" +#include "gz/rendering/base/BaseRenderTypes.hh" +#include "gz/rendering/base/BaseRenderTarget.hh" +#include "gz/rendering/ogre2/Ogre2Includes.hh" +#include "gz/rendering/ogre2/Ogre2Object.hh" +#include "gz/rendering/ogre2/Ogre2RenderTargetMaterial.hh" namespace Ogre { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2RenderTargetMaterial.hh b/ogre2/include/gz/rendering/ogre2/Ogre2RenderTargetMaterial.hh index 8b389879e..34643df4a 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2RenderTargetMaterial.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2RenderTargetMaterial.hh @@ -19,9 +19,9 @@ #include -#include "ignition/rendering/config.hh" -#include "ignition/rendering/ogre2/Ogre2Includes.hh" -#include "ignition/rendering/ogre2/Export.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/ogre2/Ogre2Includes.hh" +#include "gz/rendering/ogre2/Export.hh" namespace gz { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2RenderTypes.hh b/ogre2/include/gz/rendering/ogre2/Ogre2RenderTypes.hh index 7fa15f6b9..b54a10999 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2RenderTypes.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2RenderTypes.hh @@ -19,8 +19,8 @@ #include -#include "ignition/rendering/config.hh" -#include "ignition/rendering/base/BaseRenderTypes.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/base/BaseRenderTypes.hh" namespace gz { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2Scene.hh b/ogre2/include/gz/rendering/ogre2/Ogre2Scene.hh index a6cd407b6..f8a72d36f 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2Scene.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2Scene.hh @@ -19,11 +19,11 @@ #include -#include "ignition/rendering/Storage.hh" -#include "ignition/rendering/base/BaseScene.hh" -#include "ignition/rendering/ogre2/Ogre2RenderTypes.hh" +#include "gz/rendering/Storage.hh" +#include "gz/rendering/base/BaseScene.hh" +#include "gz/rendering/ogre2/Ogre2RenderTypes.hh" -#include "ignition/rendering/ogre2/Export.hh" +#include "gz/rendering/ogre2/Export.hh" namespace Ogre { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2SelectionBuffer.hh b/ogre2/include/gz/rendering/ogre2/Ogre2SelectionBuffer.hh index 03d6ce564..8c82ceeb4 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2SelectionBuffer.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2SelectionBuffer.hh @@ -20,8 +20,8 @@ #include #include -#include "ignition/rendering/config.hh" -#include "ignition/rendering/ogre2/Export.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/ogre2/Export.hh" namespace Ogre { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2Sensor.hh b/ogre2/include/gz/rendering/ogre2/Ogre2Sensor.hh index a0f457198..f09062209 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2Sensor.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2Sensor.hh @@ -17,8 +17,8 @@ #ifndef GZ_RENDERING_OGRE2_OGRE2SENSOR_HH_ #define GZ_RENDERING_OGRE2_OGRE2SENSOR_HH_ -#include "ignition/rendering/base/BaseSensor.hh" -#include "ignition/rendering/ogre2/Ogre2Node.hh" +#include "gz/rendering/base/BaseSensor.hh" +#include "gz/rendering/ogre2/Ogre2Node.hh" namespace gz { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2Storage.hh b/ogre2/include/gz/rendering/ogre2/Ogre2Storage.hh index 34a8e6150..649c73fe1 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2Storage.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2Storage.hh @@ -19,14 +19,14 @@ #include -#include "ignition/rendering/base/BaseStorage.hh" +#include "gz/rendering/base/BaseStorage.hh" -#include "ignition/rendering/ogre2/Ogre2Light.hh" -#include "ignition/rendering/ogre2/Ogre2Mesh.hh" -#include "ignition/rendering/ogre2/Ogre2Node.hh" -#include "ignition/rendering/ogre2/Ogre2Sensor.hh" -#include "ignition/rendering/ogre2/Ogre2Scene.hh" -#include "ignition/rendering/ogre2/Ogre2Visual.hh" +#include "gz/rendering/ogre2/Ogre2Light.hh" +#include "gz/rendering/ogre2/Ogre2Mesh.hh" +#include "gz/rendering/ogre2/Ogre2Node.hh" +#include "gz/rendering/ogre2/Ogre2Sensor.hh" +#include "gz/rendering/ogre2/Ogre2Scene.hh" +#include "gz/rendering/ogre2/Ogre2Visual.hh" namespace gz { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2ThermalCamera.hh b/ogre2/include/gz/rendering/ogre2/Ogre2ThermalCamera.hh index 4f87e7f05..47f2c03c7 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2ThermalCamera.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2ThermalCamera.hh @@ -27,13 +27,13 @@ #include #include -#include "ignition/rendering/base/BaseThermalCamera.hh" -#include "ignition/rendering/ogre2/Export.hh" -#include "ignition/rendering/ogre2/Ogre2Includes.hh" -#include "ignition/rendering/ogre2/Ogre2Sensor.hh" +#include "gz/rendering/base/BaseThermalCamera.hh" +#include "gz/rendering/ogre2/Export.hh" +#include "gz/rendering/ogre2/Ogre2Includes.hh" +#include "gz/rendering/ogre2/Ogre2Sensor.hh" -#include "ignition/common/Event.hh" -#include "ignition/common/Console.hh" +#include "gz/common/Event.hh" +#include "gz/common/Console.hh" namespace Ogre { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2Visual.hh b/ogre2/include/gz/rendering/ogre2/Ogre2Visual.hh index d527e7650..4822d7bec 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2Visual.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2Visual.hh @@ -17,9 +17,9 @@ #ifndef GZ_RENDERING_OGRE2_OGRE2VISUAL_HH_ #define GZ_RENDERING_OGRE2_OGRE2VISUAL_HH_ -#include "ignition/rendering/base/BaseVisual.hh" -#include "ignition/rendering/ogre2/Ogre2Node.hh" -#include "ignition/rendering/ogre2/Ogre2RenderTypes.hh" +#include "gz/rendering/base/BaseVisual.hh" +#include "gz/rendering/ogre2/Ogre2Node.hh" +#include "gz/rendering/ogre2/Ogre2RenderTypes.hh" namespace gz { diff --git a/ogre2/include/gz/rendering/ogre2/ogre2.hh.in b/ogre2/include/gz/rendering/ogre2/ogre2.hh.in index acfd26ae7..c4092f0cd 100644 --- a/ogre2/include/gz/rendering/ogre2/ogre2.hh.in +++ b/ogre2/include/gz/rendering/ogre2/ogre2.hh.in @@ -1,3 +1,3 @@ // Automatically generated -#include +#include ${ign_headers} diff --git a/ogre2/src/Ogre2Camera.cc b/ogre2/src/Ogre2Camera.cc index cc82ccd9e..2822b31a5 100644 --- a/ogre2/src/Ogre2Camera.cc +++ b/ogre2/src/Ogre2Camera.cc @@ -15,14 +15,14 @@ * */ -#include "ignition/rendering/ogre2/Ogre2Camera.hh" -#include "ignition/rendering/ogre2/Ogre2Conversions.hh" -#include "ignition/rendering/ogre2/Ogre2Includes.hh" -// #include "ignition/rendering/ogre2/Ogre2Material.hh" -#include "ignition/rendering/ogre2/Ogre2RenderTarget.hh" -#include "ignition/rendering/ogre2/Ogre2Scene.hh" -#include "ignition/rendering/ogre2/Ogre2SelectionBuffer.hh" -#include "ignition/rendering/Utils.hh" +#include "gz/rendering/ogre2/Ogre2Camera.hh" +#include "gz/rendering/ogre2/Ogre2Conversions.hh" +#include "gz/rendering/ogre2/Ogre2Includes.hh" +// #include "gz/rendering/ogre2/Ogre2Material.hh" +#include "gz/rendering/ogre2/Ogre2RenderTarget.hh" +#include "gz/rendering/ogre2/Ogre2Scene.hh" +#include "gz/rendering/ogre2/Ogre2SelectionBuffer.hh" +#include "gz/rendering/Utils.hh" using namespace gz; using namespace rendering; diff --git a/ogre2/src/Ogre2Conversions.cc b/ogre2/src/Ogre2Conversions.cc index 401bd9189..eb79d70db 100644 --- a/ogre2/src/Ogre2Conversions.cc +++ b/ogre2/src/Ogre2Conversions.cc @@ -14,7 +14,7 @@ * limitations under the License. * */ -#include "ignition/rendering/ogre2/Ogre2Conversions.hh" +#include "gz/rendering/ogre2/Ogre2Conversions.hh" using namespace gz; using namespace rendering; diff --git a/ogre2/src/Ogre2DepthCamera.cc b/ogre2/src/Ogre2DepthCamera.cc index 96db35575..8fbbe2ef7 100644 --- a/ogre2/src/Ogre2DepthCamera.cc +++ b/ogre2/src/Ogre2DepthCamera.cc @@ -24,18 +24,18 @@ #endif #include -#include - -#include "ignition/rendering/RenderTypes.hh" -#include "ignition/rendering/ogre2/Ogre2Conversions.hh" -#include "ignition/rendering/ogre2/Ogre2DepthCamera.hh" -#include "ignition/rendering/ogre2/Ogre2GaussianNoisePass.hh" -#include "ignition/rendering/ogre2/Ogre2Includes.hh" -#include "ignition/rendering/ogre2/Ogre2RenderEngine.hh" -#include "ignition/rendering/ogre2/Ogre2RenderTarget.hh" -#include "ignition/rendering/ogre2/Ogre2RenderTypes.hh" -#include "ignition/rendering/ogre2/Ogre2Scene.hh" -#include "ignition/rendering/ogre2/Ogre2Sensor.hh" +#include + +#include "gz/rendering/RenderTypes.hh" +#include "gz/rendering/ogre2/Ogre2Conversions.hh" +#include "gz/rendering/ogre2/Ogre2DepthCamera.hh" +#include "gz/rendering/ogre2/Ogre2GaussianNoisePass.hh" +#include "gz/rendering/ogre2/Ogre2Includes.hh" +#include "gz/rendering/ogre2/Ogre2RenderEngine.hh" +#include "gz/rendering/ogre2/Ogre2RenderTarget.hh" +#include "gz/rendering/ogre2/Ogre2RenderTypes.hh" +#include "gz/rendering/ogre2/Ogre2Scene.hh" +#include "gz/rendering/ogre2/Ogre2Sensor.hh" namespace gz diff --git a/ogre2/src/Ogre2DynamicRenderable.cc b/ogre2/src/Ogre2DynamicRenderable.cc index 30a6c6c54..a4a17eeed 100644 --- a/ogre2/src/Ogre2DynamicRenderable.cc +++ b/ogre2/src/Ogre2DynamicRenderable.cc @@ -25,12 +25,12 @@ #pragma warning(pop) #endif -#include "ignition/common/Console.hh" -#include "ignition/rendering/ogre2/Ogre2Conversions.hh" -#include "ignition/rendering/ogre2/Ogre2DynamicRenderable.hh" -#include "ignition/rendering/ogre2/Ogre2Material.hh" -#include "ignition/rendering/ogre2/Ogre2RenderEngine.hh" -#include "ignition/rendering/ogre2/Ogre2Scene.hh" +#include "gz/common/Console.hh" +#include "gz/rendering/ogre2/Ogre2Conversions.hh" +#include "gz/rendering/ogre2/Ogre2DynamicRenderable.hh" +#include "gz/rendering/ogre2/Ogre2Material.hh" +#include "gz/rendering/ogre2/Ogre2RenderEngine.hh" +#include "gz/rendering/ogre2/Ogre2Scene.hh" /// \brief Private implementation class gz::rendering::Ogre2DynamicRenderablePrivate diff --git a/ogre2/src/Ogre2GaussianNoisePass.cc b/ogre2/src/Ogre2GaussianNoisePass.cc index 09ef2ce52..878ec2ebc 100644 --- a/ogre2/src/Ogre2GaussianNoisePass.cc +++ b/ogre2/src/Ogre2GaussianNoisePass.cc @@ -16,12 +16,12 @@ */ -#include +#include -#include "ignition/rendering/RenderPassSystem.hh" -#include "ignition/rendering/ogre2/Ogre2Includes.hh" -#include "ignition/rendering/ogre2/Ogre2GaussianNoisePass.hh" -#include "ignition/rendering/ogre2/Ogre2RenderEngine.hh" +#include "gz/rendering/RenderPassSystem.hh" +#include "gz/rendering/ogre2/Ogre2Includes.hh" +#include "gz/rendering/ogre2/Ogre2GaussianNoisePass.hh" +#include "gz/rendering/ogre2/Ogre2RenderEngine.hh" using namespace gz; using namespace rendering; diff --git a/ogre2/src/Ogre2Geometry.cc b/ogre2/src/Ogre2Geometry.cc index 513147977..24f309d94 100644 --- a/ogre2/src/Ogre2Geometry.cc +++ b/ogre2/src/Ogre2Geometry.cc @@ -14,10 +14,10 @@ * limitations under the License. * */ -#include "ignition/rendering/ogre2/Ogre2Geometry.hh" +#include "gz/rendering/ogre2/Ogre2Geometry.hh" -#include "ignition/rendering/ogre2/Ogre2Scene.hh" -#include "ignition/rendering/ogre2/Ogre2Visual.hh" +#include "gz/rendering/ogre2/Ogre2Scene.hh" +#include "gz/rendering/ogre2/Ogre2Visual.hh" using namespace gz; using namespace rendering; diff --git a/ogre2/src/Ogre2GizmoVisual.cc b/ogre2/src/Ogre2GizmoVisual.cc index 22f04c825..f5d3be24a 100644 --- a/ogre2/src/Ogre2GizmoVisual.cc +++ b/ogre2/src/Ogre2GizmoVisual.cc @@ -14,7 +14,7 @@ * limitations under the License. * */ -#include "ignition/rendering/ogre2/Ogre2GizmoVisual.hh" +#include "gz/rendering/ogre2/Ogre2GizmoVisual.hh" using namespace gz; using namespace rendering; diff --git a/ogre2/src/Ogre2GpuRays.cc b/ogre2/src/Ogre2GpuRays.cc index e99fc4675..53df0e68f 100644 --- a/ogre2/src/Ogre2GpuRays.cc +++ b/ogre2/src/Ogre2GpuRays.cc @@ -15,23 +15,23 @@ * */ -#include -#include - -#include -#include - -#include "ignition/rendering/ogre2/Ogre2Camera.hh" -#include "ignition/rendering/ogre2/Ogre2GpuRays.hh" -#include "ignition/rendering/ogre2/Ogre2RenderEngine.hh" -#include "ignition/rendering/RenderTypes.hh" -#include "ignition/rendering/ogre2/Ogre2Conversions.hh" -#include "ignition/rendering/ogre2/Ogre2Includes.hh" -#include "ignition/rendering/ogre2/Ogre2RenderTarget.hh" -#include "ignition/rendering/ogre2/Ogre2RenderTypes.hh" -#include "ignition/rendering/ogre2/Ogre2Scene.hh" -#include "ignition/rendering/ogre2/Ogre2Sensor.hh" -#include "ignition/rendering/ogre2/Ogre2Visual.hh" +#include +#include + +#include +#include + +#include "gz/rendering/ogre2/Ogre2Camera.hh" +#include "gz/rendering/ogre2/Ogre2GpuRays.hh" +#include "gz/rendering/ogre2/Ogre2RenderEngine.hh" +#include "gz/rendering/RenderTypes.hh" +#include "gz/rendering/ogre2/Ogre2Conversions.hh" +#include "gz/rendering/ogre2/Ogre2Includes.hh" +#include "gz/rendering/ogre2/Ogre2RenderTarget.hh" +#include "gz/rendering/ogre2/Ogre2RenderTypes.hh" +#include "gz/rendering/ogre2/Ogre2Scene.hh" +#include "gz/rendering/ogre2/Ogre2Sensor.hh" +#include "gz/rendering/ogre2/Ogre2Visual.hh" namespace gz { diff --git a/ogre2/src/Ogre2Grid.cc b/ogre2/src/Ogre2Grid.cc index 4ee54d3d1..79ea4484a 100644 --- a/ogre2/src/Ogre2Grid.cc +++ b/ogre2/src/Ogre2Grid.cc @@ -15,12 +15,12 @@ * */ -#include +#include -#include "ignition/rendering/ogre2/Ogre2Grid.hh" -#include "ignition/rendering/ogre2/Ogre2Material.hh" -#include "ignition/rendering/ogre2/Ogre2Scene.hh" -#include "ignition/rendering/ogre2/Ogre2DynamicRenderable.hh" +#include "gz/rendering/ogre2/Ogre2Grid.hh" +#include "gz/rendering/ogre2/Ogre2Material.hh" +#include "gz/rendering/ogre2/Ogre2Scene.hh" +#include "gz/rendering/ogre2/Ogre2DynamicRenderable.hh" using namespace gz; using namespace rendering; diff --git a/ogre2/src/Ogre2Light.cc b/ogre2/src/Ogre2Light.cc index d323563fb..461fb6251 100644 --- a/ogre2/src/Ogre2Light.cc +++ b/ogre2/src/Ogre2Light.cc @@ -15,13 +15,13 @@ * */ -#include +#include -#include "ignition/rendering/ogre2/Ogre2Light.hh" +#include "gz/rendering/ogre2/Ogre2Light.hh" -#include "ignition/rendering/ogre2/Ogre2Conversions.hh" -#include "ignition/rendering/ogre2/Ogre2Includes.hh" -#include "ignition/rendering/ogre2/Ogre2Scene.hh" +#include "gz/rendering/ogre2/Ogre2Conversions.hh" +#include "gz/rendering/ogre2/Ogre2Includes.hh" +#include "gz/rendering/ogre2/Ogre2Scene.hh" using namespace gz; using namespace rendering; diff --git a/ogre2/src/Ogre2Marker.cc b/ogre2/src/Ogre2Marker.cc index 77f86dbd7..4434d3c76 100644 --- a/ogre2/src/Ogre2Marker.cc +++ b/ogre2/src/Ogre2Marker.cc @@ -15,14 +15,14 @@ * */ -#include - -#include "ignition/rendering/ogre2/Ogre2DynamicRenderable.hh" -#include "ignition/rendering/ogre2/Ogre2Marker.hh" -#include "ignition/rendering/ogre2/Ogre2Material.hh" -#include "ignition/rendering/ogre2/Ogre2Mesh.hh" -#include "ignition/rendering/ogre2/Ogre2Scene.hh" -#include "ignition/rendering/ogre2/Ogre2Visual.hh" +#include + +#include "gz/rendering/ogre2/Ogre2DynamicRenderable.hh" +#include "gz/rendering/ogre2/Ogre2Marker.hh" +#include "gz/rendering/ogre2/Ogre2Material.hh" +#include "gz/rendering/ogre2/Ogre2Mesh.hh" +#include "gz/rendering/ogre2/Ogre2Scene.hh" +#include "gz/rendering/ogre2/Ogre2Visual.hh" class gz::rendering::Ogre2MarkerPrivate { diff --git a/ogre2/src/Ogre2Material.cc b/ogre2/src/Ogre2Material.cc index 9f6884f52..8cd66c8c2 100644 --- a/ogre2/src/Ogre2Material.cc +++ b/ogre2/src/Ogre2Material.cc @@ -25,15 +25,15 @@ #pragma warning(pop) #endif -#include -#include - -#include "ignition/rendering/ShaderParams.hh" -#include "ignition/rendering/ShaderType.hh" -#include "ignition/rendering/ogre2/Ogre2Material.hh" -#include "ignition/rendering/ogre2/Ogre2Conversions.hh" -#include "ignition/rendering/ogre2/Ogre2RenderEngine.hh" -#include "ignition/rendering/ogre2/Ogre2Scene.hh" +#include +#include + +#include "gz/rendering/ShaderParams.hh" +#include "gz/rendering/ShaderType.hh" +#include "gz/rendering/ogre2/Ogre2Material.hh" +#include "gz/rendering/ogre2/Ogre2Conversions.hh" +#include "gz/rendering/ogre2/Ogre2RenderEngine.hh" +#include "gz/rendering/ogre2/Ogre2Scene.hh" using namespace gz; using namespace rendering; diff --git a/ogre2/src/Ogre2MaterialSwitcher.cc b/ogre2/src/Ogre2MaterialSwitcher.cc index 3daa0c24a..4ce93fef3 100644 --- a/ogre2/src/Ogre2MaterialSwitcher.cc +++ b/ogre2/src/Ogre2MaterialSwitcher.cc @@ -15,11 +15,11 @@ * */ -#include "ignition/common/Console.hh" -#include "ignition/rendering/ogre2/Ogre2Includes.hh" -#include "ignition/rendering/ogre2/Ogre2MaterialSwitcher.hh" -#include "ignition/rendering/ogre2/Ogre2Scene.hh" -#include "ignition/rendering/RenderTypes.hh" +#include "gz/common/Console.hh" +#include "gz/rendering/ogre2/Ogre2Includes.hh" +#include "gz/rendering/ogre2/Ogre2MaterialSwitcher.hh" +#include "gz/rendering/ogre2/Ogre2Scene.hh" +#include "gz/rendering/RenderTypes.hh" using namespace gz; using namespace rendering; diff --git a/ogre2/src/Ogre2Mesh.cc b/ogre2/src/Ogre2Mesh.cc index f57595514..ee7f0cd63 100644 --- a/ogre2/src/Ogre2Mesh.cc +++ b/ogre2/src/Ogre2Mesh.cc @@ -25,13 +25,13 @@ #pragma warning(pop) #endif -#include +#include -#include "ignition/rendering/ogre2/Ogre2Conversions.hh" -#include "ignition/rendering/ogre2/Ogre2Mesh.hh" -#include "ignition/rendering/ogre2/Ogre2Includes.hh" -#include "ignition/rendering/ogre2/Ogre2Material.hh" -#include "ignition/rendering/ogre2/Ogre2Storage.hh" +#include "gz/rendering/ogre2/Ogre2Conversions.hh" +#include "gz/rendering/ogre2/Ogre2Mesh.hh" +#include "gz/rendering/ogre2/Ogre2Includes.hh" +#include "gz/rendering/ogre2/Ogre2Material.hh" +#include "gz/rendering/ogre2/Ogre2Storage.hh" using namespace gz; using namespace rendering; diff --git a/ogre2/src/Ogre2MeshFactory.cc b/ogre2/src/Ogre2MeshFactory.cc index 31ded5b8e..4b5943d05 100644 --- a/ogre2/src/Ogre2MeshFactory.cc +++ b/ogre2/src/Ogre2MeshFactory.cc @@ -18,21 +18,21 @@ #include -#include -#include -#include -#include -#include - -#include - -#include "ignition/rendering/ogre2/Ogre2Includes.hh" -#include "ignition/rendering/ogre2/Ogre2Mesh.hh" -#include "ignition/rendering/ogre2/Ogre2MeshFactory.hh" -#include "ignition/rendering/ogre2/Ogre2RenderEngine.hh" -#include "ignition/rendering/ogre2/Ogre2RenderTypes.hh" -#include "ignition/rendering/ogre2/Ogre2Scene.hh" -#include "ignition/rendering/ogre2/Ogre2Storage.hh" +#include +#include +#include +#include +#include + +#include + +#include "gz/rendering/ogre2/Ogre2Includes.hh" +#include "gz/rendering/ogre2/Ogre2Mesh.hh" +#include "gz/rendering/ogre2/Ogre2MeshFactory.hh" +#include "gz/rendering/ogre2/Ogre2RenderEngine.hh" +#include "gz/rendering/ogre2/Ogre2RenderTypes.hh" +#include "gz/rendering/ogre2/Ogre2Scene.hh" +#include "gz/rendering/ogre2/Ogre2Storage.hh" using namespace gz; using namespace rendering; diff --git a/ogre2/src/Ogre2Node.cc b/ogre2/src/Ogre2Node.cc index 1c711869c..d1c08080c 100644 --- a/ogre2/src/Ogre2Node.cc +++ b/ogre2/src/Ogre2Node.cc @@ -15,13 +15,13 @@ * */ -#include +#include -#include "ignition/rendering/ogre2/Ogre2Node.hh" -#include "ignition/rendering/ogre2/Ogre2Conversions.hh" -#include "ignition/rendering/ogre2/Ogre2Includes.hh" -#include "ignition/rendering/ogre2/Ogre2Scene.hh" -#include "ignition/rendering/ogre2/Ogre2Storage.hh" +#include "gz/rendering/ogre2/Ogre2Node.hh" +#include "gz/rendering/ogre2/Ogre2Conversions.hh" +#include "gz/rendering/ogre2/Ogre2Includes.hh" +#include "gz/rendering/ogre2/Ogre2Scene.hh" +#include "gz/rendering/ogre2/Ogre2Storage.hh" using namespace gz; using namespace rendering; diff --git a/ogre2/src/Ogre2Object.cc b/ogre2/src/Ogre2Object.cc index 9db4fc91c..1c4d2890d 100644 --- a/ogre2/src/Ogre2Object.cc +++ b/ogre2/src/Ogre2Object.cc @@ -15,9 +15,9 @@ * */ -#include "ignition/rendering/RenderTypes.hh" -#include "ignition/rendering/ogre2/Ogre2Object.hh" -#include "ignition/rendering/ogre2/Ogre2Scene.hh" +#include "gz/rendering/RenderTypes.hh" +#include "gz/rendering/ogre2/Ogre2Object.hh" +#include "gz/rendering/ogre2/Ogre2Scene.hh" using namespace gz; using namespace rendering; diff --git a/ogre2/src/Ogre2RayQuery.cc b/ogre2/src/Ogre2RayQuery.cc index 7ef9a4cd9..cbeb4a85f 100644 --- a/ogre2/src/Ogre2RayQuery.cc +++ b/ogre2/src/Ogre2RayQuery.cc @@ -15,16 +15,16 @@ * */ -#include -#include -#include -#include - -#include "ignition/rendering/ogre2/Ogre2Includes.hh" -#include "ignition/rendering/ogre2/Ogre2Camera.hh" -#include "ignition/rendering/ogre2/Ogre2Conversions.hh" -#include "ignition/rendering/ogre2/Ogre2RayQuery.hh" -#include "ignition/rendering/ogre2/Ogre2Scene.hh" +#include +#include +#include +#include + +#include "gz/rendering/ogre2/Ogre2Includes.hh" +#include "gz/rendering/ogre2/Ogre2Camera.hh" +#include "gz/rendering/ogre2/Ogre2Conversions.hh" +#include "gz/rendering/ogre2/Ogre2RayQuery.hh" +#include "gz/rendering/ogre2/Ogre2Scene.hh" /// \brief Private data class for Ogre2RayQuery class gz::rendering::Ogre2RayQueryPrivate diff --git a/ogre2/src/Ogre2RenderEngine.cc b/ogre2/src/Ogre2RenderEngine.cc index 2126ffe66..d7949eecd 100644 --- a/ogre2/src/Ogre2RenderEngine.cc +++ b/ogre2/src/Ogre2RenderEngine.cc @@ -27,18 +27,18 @@ // pulled in by anybody (e.g., Boost). #include #endif -#include -#include -#include - -#include - -#include "ignition/rendering/RenderEngineManager.hh" -#include "ignition/rendering/ogre2/Ogre2Includes.hh" -#include "ignition/rendering/ogre2/Ogre2RenderEngine.hh" -#include "ignition/rendering/ogre2/Ogre2RenderTypes.hh" -#include "ignition/rendering/ogre2/Ogre2Scene.hh" -#include "ignition/rendering/ogre2/Ogre2Storage.hh" +#include +#include +#include + +#include + +#include "gz/rendering/RenderEngineManager.hh" +#include "gz/rendering/ogre2/Ogre2Includes.hh" +#include "gz/rendering/ogre2/Ogre2RenderEngine.hh" +#include "gz/rendering/ogre2/Ogre2RenderTypes.hh" +#include "gz/rendering/ogre2/Ogre2Scene.hh" +#include "gz/rendering/ogre2/Ogre2Storage.hh" class gz::rendering::Ogre2RenderEnginePrivate diff --git a/ogre2/src/Ogre2RenderPass.cc b/ogre2/src/Ogre2RenderPass.cc index 6c8043e44..2b17f8e92 100644 --- a/ogre2/src/Ogre2RenderPass.cc +++ b/ogre2/src/Ogre2RenderPass.cc @@ -14,7 +14,7 @@ * limitations under the License. * */ -#include "ignition/rendering/ogre2/Ogre2RenderPass.hh" +#include "gz/rendering/ogre2/Ogre2RenderPass.hh" using namespace gz; diff --git a/ogre2/src/Ogre2RenderTarget.cc b/ogre2/src/Ogre2RenderTarget.cc index 0dd1ca5f0..950c98730 100644 --- a/ogre2/src/Ogre2RenderTarget.cc +++ b/ogre2/src/Ogre2RenderTarget.cc @@ -25,17 +25,17 @@ #pragma warning(pop) #endif -#include +#include -#include "ignition/rendering/Material.hh" +#include "gz/rendering/Material.hh" -#include "ignition/rendering/ogre2/Ogre2Includes.hh" -#include "ignition/rendering/ogre2/Ogre2RenderEngine.hh" -#include "ignition/rendering/ogre2/Ogre2RenderPass.hh" -#include "ignition/rendering/ogre2/Ogre2Conversions.hh" -#include "ignition/rendering/ogre2/Ogre2Material.hh" -#include "ignition/rendering/ogre2/Ogre2RenderTarget.hh" -#include "ignition/rendering/ogre2/Ogre2Scene.hh" +#include "gz/rendering/ogre2/Ogre2Includes.hh" +#include "gz/rendering/ogre2/Ogre2RenderEngine.hh" +#include "gz/rendering/ogre2/Ogre2RenderPass.hh" +#include "gz/rendering/ogre2/Ogre2Conversions.hh" +#include "gz/rendering/ogre2/Ogre2Material.hh" +#include "gz/rendering/ogre2/Ogre2RenderTarget.hh" +#include "gz/rendering/ogre2/Ogre2Scene.hh" using namespace gz; using namespace rendering; diff --git a/ogre2/src/Ogre2RenderTargetMaterial.cc b/ogre2/src/Ogre2RenderTargetMaterial.cc index a6a7e235a..036597b15 100644 --- a/ogre2/src/Ogre2RenderTargetMaterial.cc +++ b/ogre2/src/Ogre2RenderTargetMaterial.cc @@ -15,7 +15,7 @@ * */ -#include "ignition/rendering/ogre2/Ogre2RenderTargetMaterial.hh" +#include "gz/rendering/ogre2/Ogre2RenderTargetMaterial.hh" using namespace gz::rendering; diff --git a/ogre2/src/Ogre2Scene.cc b/ogre2/src/Ogre2Scene.cc index bdfb93669..f61cce0b9 100644 --- a/ogre2/src/Ogre2Scene.cc +++ b/ogre2/src/Ogre2Scene.cc @@ -15,28 +15,28 @@ * */ -#include - -#include "ignition/rendering/RenderTypes.hh" -#include "ignition/rendering/ogre2/Ogre2Camera.hh" -#include "ignition/rendering/ogre2/Ogre2Conversions.hh" -#include "ignition/rendering/ogre2/Ogre2DepthCamera.hh" -#include "ignition/rendering/ogre2/Ogre2GizmoVisual.hh" -#include "ignition/rendering/ogre2/Ogre2GpuRays.hh" -#include "ignition/rendering/ogre2/Ogre2Grid.hh" -#include "ignition/rendering/ogre2/Ogre2Includes.hh" -#include "ignition/rendering/ogre2/Ogre2Light.hh" -#include "ignition/rendering/ogre2/Ogre2Marker.hh" -#include "ignition/rendering/ogre2/Ogre2Material.hh" -#include "ignition/rendering/ogre2/Ogre2MeshFactory.hh" -#include "ignition/rendering/ogre2/Ogre2Node.hh" -#include "ignition/rendering/ogre2/Ogre2RayQuery.hh" -#include "ignition/rendering/ogre2/Ogre2RenderEngine.hh" -#include "ignition/rendering/ogre2/Ogre2RenderTarget.hh" -#include "ignition/rendering/ogre2/Ogre2RenderTypes.hh" -#include "ignition/rendering/ogre2/Ogre2Scene.hh" -#include "ignition/rendering/ogre2/Ogre2ThermalCamera.hh" -#include "ignition/rendering/ogre2/Ogre2Visual.hh" +#include + +#include "gz/rendering/RenderTypes.hh" +#include "gz/rendering/ogre2/Ogre2Camera.hh" +#include "gz/rendering/ogre2/Ogre2Conversions.hh" +#include "gz/rendering/ogre2/Ogre2DepthCamera.hh" +#include "gz/rendering/ogre2/Ogre2GizmoVisual.hh" +#include "gz/rendering/ogre2/Ogre2GpuRays.hh" +#include "gz/rendering/ogre2/Ogre2Grid.hh" +#include "gz/rendering/ogre2/Ogre2Includes.hh" +#include "gz/rendering/ogre2/Ogre2Light.hh" +#include "gz/rendering/ogre2/Ogre2Marker.hh" +#include "gz/rendering/ogre2/Ogre2Material.hh" +#include "gz/rendering/ogre2/Ogre2MeshFactory.hh" +#include "gz/rendering/ogre2/Ogre2Node.hh" +#include "gz/rendering/ogre2/Ogre2RayQuery.hh" +#include "gz/rendering/ogre2/Ogre2RenderEngine.hh" +#include "gz/rendering/ogre2/Ogre2RenderTarget.hh" +#include "gz/rendering/ogre2/Ogre2RenderTypes.hh" +#include "gz/rendering/ogre2/Ogre2Scene.hh" +#include "gz/rendering/ogre2/Ogre2ThermalCamera.hh" +#include "gz/rendering/ogre2/Ogre2Visual.hh" using namespace gz; using namespace rendering; diff --git a/ogre2/src/Ogre2SelectionBuffer.cc b/ogre2/src/Ogre2SelectionBuffer.cc index 2caa52bda..3e8cb5b15 100644 --- a/ogre2/src/Ogre2SelectionBuffer.cc +++ b/ogre2/src/Ogre2SelectionBuffer.cc @@ -16,16 +16,16 @@ */ #include -#include - -#include "ignition/common/Console.hh" -#include "ignition/rendering/RenderTypes.hh" -#include "ignition/rendering/ogre2/Ogre2Includes.hh" -#include "ignition/rendering/ogre2/Ogre2MaterialSwitcher.hh" -#include "ignition/rendering/ogre2/Ogre2RenderEngine.hh" -#include "ignition/rendering/ogre2/Ogre2RenderTarget.hh" -#include "ignition/rendering/ogre2/Ogre2Scene.hh" -#include "ignition/rendering/ogre2/Ogre2SelectionBuffer.hh" +#include + +#include "gz/common/Console.hh" +#include "gz/rendering/RenderTypes.hh" +#include "gz/rendering/ogre2/Ogre2Includes.hh" +#include "gz/rendering/ogre2/Ogre2MaterialSwitcher.hh" +#include "gz/rendering/ogre2/Ogre2RenderEngine.hh" +#include "gz/rendering/ogre2/Ogre2RenderTarget.hh" +#include "gz/rendering/ogre2/Ogre2Scene.hh" +#include "gz/rendering/ogre2/Ogre2SelectionBuffer.hh" using namespace gz; using namespace rendering; diff --git a/ogre2/src/Ogre2Sensor.cc b/ogre2/src/Ogre2Sensor.cc index 48ab575d7..b5a3c831b 100644 --- a/ogre2/src/Ogre2Sensor.cc +++ b/ogre2/src/Ogre2Sensor.cc @@ -14,7 +14,7 @@ * limitations under the License. * */ -#include "ignition/rendering/ogre2/Ogre2Sensor.hh" +#include "gz/rendering/ogre2/Ogre2Sensor.hh" using namespace gz; using namespace rendering; diff --git a/ogre2/src/Ogre2ThermalCamera.cc b/ogre2/src/Ogre2ThermalCamera.cc index 3d158f91d..a0c816c7b 100644 --- a/ogre2/src/Ogre2ThermalCamera.cc +++ b/ogre2/src/Ogre2ThermalCamera.cc @@ -26,19 +26,19 @@ #include #include -#include -#include - -#include "ignition/rendering/RenderTypes.hh" -#include "ignition/rendering/ogre2/Ogre2Conversions.hh" -#include "ignition/rendering/ogre2/Ogre2Includes.hh" -#include "ignition/rendering/ogre2/Ogre2RenderEngine.hh" -#include "ignition/rendering/ogre2/Ogre2RenderTarget.hh" -#include "ignition/rendering/ogre2/Ogre2RenderTypes.hh" -#include "ignition/rendering/ogre2/Ogre2Scene.hh" -#include "ignition/rendering/ogre2/Ogre2Sensor.hh" -#include "ignition/rendering/ogre2/Ogre2ThermalCamera.hh" -#include "ignition/rendering/ogre2/Ogre2Visual.hh" +#include +#include + +#include "gz/rendering/RenderTypes.hh" +#include "gz/rendering/ogre2/Ogre2Conversions.hh" +#include "gz/rendering/ogre2/Ogre2Includes.hh" +#include "gz/rendering/ogre2/Ogre2RenderEngine.hh" +#include "gz/rendering/ogre2/Ogre2RenderTarget.hh" +#include "gz/rendering/ogre2/Ogre2RenderTypes.hh" +#include "gz/rendering/ogre2/Ogre2Scene.hh" +#include "gz/rendering/ogre2/Ogre2Sensor.hh" +#include "gz/rendering/ogre2/Ogre2ThermalCamera.hh" +#include "gz/rendering/ogre2/Ogre2Visual.hh" namespace gz { diff --git a/ogre2/src/Ogre2Visual.cc b/ogre2/src/Ogre2Visual.cc index 8f36b543b..a3a4419de 100644 --- a/ogre2/src/Ogre2Visual.cc +++ b/ogre2/src/Ogre2Visual.cc @@ -15,13 +15,13 @@ * */ -#include +#include -#include "ignition/rendering/ogre2/Ogre2Conversions.hh" -#include "ignition/rendering/ogre2/Ogre2Geometry.hh" -#include "ignition/rendering/ogre2/Ogre2RenderTypes.hh" -#include "ignition/rendering/ogre2/Ogre2Storage.hh" -#include "ignition/rendering/ogre2/Ogre2Visual.hh" +#include "gz/rendering/ogre2/Ogre2Conversions.hh" +#include "gz/rendering/ogre2/Ogre2Geometry.hh" +#include "gz/rendering/ogre2/Ogre2RenderTypes.hh" +#include "gz/rendering/ogre2/Ogre2Storage.hh" +#include "gz/rendering/ogre2/Ogre2Visual.hh" using namespace gz; using namespace rendering; diff --git a/optix/include/gz/rendering/optix/OptixArrowVisual.hh b/optix/include/gz/rendering/optix/OptixArrowVisual.hh index caecb3f7a..8e00a22d1 100644 --- a/optix/include/gz/rendering/optix/OptixArrowVisual.hh +++ b/optix/include/gz/rendering/optix/OptixArrowVisual.hh @@ -17,8 +17,8 @@ #ifndef GZ_RENDERING_OPTIX_OPTIXARROWVISUAL_HH_ #define GZ_RENDERING_OPTIX_OPTIXARROWVISUAL_HH_ -#include "ignition/rendering/base/BaseArrowVisual.hh" -#include "ignition/rendering/optix/OptixVisual.hh" +#include "gz/rendering/base/BaseArrowVisual.hh" +#include "gz/rendering/optix/OptixVisual.hh" namespace gz { diff --git a/optix/include/gz/rendering/optix/OptixAxisVisual.hh b/optix/include/gz/rendering/optix/OptixAxisVisual.hh index 170fbed40..805105327 100644 --- a/optix/include/gz/rendering/optix/OptixAxisVisual.hh +++ b/optix/include/gz/rendering/optix/OptixAxisVisual.hh @@ -17,8 +17,8 @@ #ifndef GZ_RENDERING_OPTIX_OPTIXAXISVISUAL_HH_ #define GZ_RENDERING_OPTIX_OPTIXAXISVISUAL_HH_ -#include "ignition/rendering/base/BaseAxisVisual.hh" -#include "ignition/rendering/optix/OptixVisual.hh" +#include "gz/rendering/base/BaseAxisVisual.hh" +#include "gz/rendering/optix/OptixVisual.hh" namespace gz { diff --git a/optix/include/gz/rendering/optix/OptixBox.hh b/optix/include/gz/rendering/optix/OptixBox.hh index ad2d420ea..7c4714e88 100644 --- a/optix/include/gz/rendering/optix/OptixBox.hh +++ b/optix/include/gz/rendering/optix/OptixBox.hh @@ -17,7 +17,7 @@ #ifndef GZ_RENDERING_OPTIX_OPTIXBOX_HH_ #define GZ_RENDERING_OPTIX_OPTIXBOX_HH_ -#include "ignition/rendering/optix/OptixPrimitive.hh" +#include "gz/rendering/optix/OptixPrimitive.hh" namespace gz { diff --git a/optix/include/gz/rendering/optix/OptixCamera.hh b/optix/include/gz/rendering/optix/OptixCamera.hh index 5d5cecc7f..ea989d025 100644 --- a/optix/include/gz/rendering/optix/OptixCamera.hh +++ b/optix/include/gz/rendering/optix/OptixCamera.hh @@ -18,9 +18,9 @@ #define GZ_RENDERING_OPTIX_OPTIXCAMERA_HH_ #include -#include "ignition/rendering/base/BaseCamera.hh" -#include "ignition/rendering/optix/OptixRenderTypes.hh" -#include "ignition/rendering/optix/OptixSensor.hh" +#include "gz/rendering/base/BaseCamera.hh" +#include "gz/rendering/optix/OptixRenderTypes.hh" +#include "gz/rendering/optix/OptixSensor.hh" namespace gz { diff --git a/optix/include/gz/rendering/optix/OptixCone.hh b/optix/include/gz/rendering/optix/OptixCone.hh index cee6d1656..6ca32b9c6 100644 --- a/optix/include/gz/rendering/optix/OptixCone.hh +++ b/optix/include/gz/rendering/optix/OptixCone.hh @@ -17,7 +17,7 @@ #ifndef GZ_RENDERING_OPTIX_OPTIXCONE_HH_ #define GZ_RENDERING_OPTIX_OPTIXCONE_HH_ -#include "ignition/rendering/optix/OptixPrimitive.hh" +#include "gz/rendering/optix/OptixPrimitive.hh" namespace gz { diff --git a/optix/include/gz/rendering/optix/OptixConversions.hh b/optix/include/gz/rendering/optix/OptixConversions.hh index 01da68de6..065b3384f 100644 --- a/optix/include/gz/rendering/optix/OptixConversions.hh +++ b/optix/include/gz/rendering/optix/OptixConversions.hh @@ -17,13 +17,13 @@ #ifndef GZ_RENDERING_OPTIX_OPTIXCONVERSIONS_HH_ #define GZ_RENDERING_OPTIX_OPTIXCONVERSIONS_HH_ -#include -#include -#include +#include +#include +#include -#include "ignition/rendering/PixelFormat.hh" -#include "ignition/rendering/optix/OptixIncludes.hh" -#include "ignition/rendering/optix/Export.hh" +#include "gz/rendering/PixelFormat.hh" +#include "gz/rendering/optix/OptixIncludes.hh" +#include "gz/rendering/optix/Export.hh" namespace gz { diff --git a/optix/include/gz/rendering/optix/OptixCylinder.hh b/optix/include/gz/rendering/optix/OptixCylinder.hh index d59746733..f9fc767f8 100644 --- a/optix/include/gz/rendering/optix/OptixCylinder.hh +++ b/optix/include/gz/rendering/optix/OptixCylinder.hh @@ -17,7 +17,7 @@ #ifndef GZ_RENDERING_OPTIX_OPTIXCYLINDER_HH_ #define GZ_RENDERING_OPTIX_OPTIXCYLINDER_HH_ -#include "ignition/rendering/optix/OptixPrimitive.hh" +#include "gz/rendering/optix/OptixPrimitive.hh" namespace gz { diff --git a/optix/include/gz/rendering/optix/OptixGeometry.hh b/optix/include/gz/rendering/optix/OptixGeometry.hh index 143fa5fe2..fbdec650e 100644 --- a/optix/include/gz/rendering/optix/OptixGeometry.hh +++ b/optix/include/gz/rendering/optix/OptixGeometry.hh @@ -17,9 +17,9 @@ #ifndef GZ_RENDERING_OPTIX_OPTIXGEOMETRY_HH_ #define GZ_RENDERING_OPTIX_OPTIXGEOMETRY_HH_ -#include "ignition/rendering/base/BaseGeometry.hh" -#include "ignition/rendering/optix/OptixIncludes.hh" -#include "ignition/rendering/optix/OptixObject.hh" +#include "gz/rendering/base/BaseGeometry.hh" +#include "gz/rendering/optix/OptixIncludes.hh" +#include "gz/rendering/optix/OptixObject.hh" namespace gz { diff --git a/optix/include/gz/rendering/optix/OptixGrid.hh b/optix/include/gz/rendering/optix/OptixGrid.hh index 5145d7de3..1631540c6 100644 --- a/optix/include/gz/rendering/optix/OptixGrid.hh +++ b/optix/include/gz/rendering/optix/OptixGrid.hh @@ -19,10 +19,10 @@ #include #include -#include "ignition/rendering/base/BaseGrid.hh" -#include "ignition/rendering/optix/OptixPrimitive.hh" -#include "ignition/rendering/optix/OptixObject.hh" -#include "ignition/rendering/optix/OptixRenderTypes.hh" +#include "gz/rendering/base/BaseGrid.hh" +#include "gz/rendering/optix/OptixPrimitive.hh" +#include "gz/rendering/optix/OptixObject.hh" +#include "gz/rendering/optix/OptixRenderTypes.hh" namespace gz { diff --git a/optix/include/gz/rendering/optix/OptixLight.hh b/optix/include/gz/rendering/optix/OptixLight.hh index d1f782468..451994b75 100644 --- a/optix/include/gz/rendering/optix/OptixLight.hh +++ b/optix/include/gz/rendering/optix/OptixLight.hh @@ -17,10 +17,10 @@ #ifndef GZ_RENDERING_OPTIX_OPTIXLIGHT_HH_ #define GZ_RENDERING_OPTIX_OPTIXLIGHT_HH_ -#include "ignition/rendering/base/BaseLight.hh" -#include "ignition/rendering/optix/OptixNode.hh" -#include "ignition/rendering/optix/OptixIncludes.hh" -#include "ignition/rendering/optix/OptixLightTypes.hh" +#include "gz/rendering/base/BaseLight.hh" +#include "gz/rendering/optix/OptixNode.hh" +#include "gz/rendering/optix/OptixIncludes.hh" +#include "gz/rendering/optix/OptixLightTypes.hh" namespace gz { diff --git a/optix/include/gz/rendering/optix/OptixLightManager.hh b/optix/include/gz/rendering/optix/OptixLightManager.hh index d6d5c3113..1d1a35633 100644 --- a/optix/include/gz/rendering/optix/OptixLightManager.hh +++ b/optix/include/gz/rendering/optix/OptixLightManager.hh @@ -19,11 +19,11 @@ #include #include -#include "ignition/rendering/config.hh" -#include "ignition/rendering/optix/OptixLightTypes.hh" -#include "ignition/rendering/optix/OptixRenderTypes.hh" -#include "ignition/rendering/optix/OptixIncludes.hh" -#include "ignition/rendering/optix/Export.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/optix/OptixLightTypes.hh" +#include "gz/rendering/optix/OptixRenderTypes.hh" +#include "gz/rendering/optix/OptixIncludes.hh" +#include "gz/rendering/optix/Export.hh" namespace gz { diff --git a/optix/include/gz/rendering/optix/OptixMaterial.hh b/optix/include/gz/rendering/optix/OptixMaterial.hh index 17c30d0a4..f333de231 100644 --- a/optix/include/gz/rendering/optix/OptixMaterial.hh +++ b/optix/include/gz/rendering/optix/OptixMaterial.hh @@ -18,9 +18,9 @@ #define GZ_RENDERING_OPTIX_OPTIXMATERIAL_HH_ #include -#include "ignition/rendering/base/BaseMaterial.hh" -#include "ignition/rendering/optix/OptixObject.hh" -#include "ignition/rendering/optix/OptixIncludes.hh" +#include "gz/rendering/base/BaseMaterial.hh" +#include "gz/rendering/optix/OptixObject.hh" +#include "gz/rendering/optix/OptixIncludes.hh" namespace gz { diff --git a/optix/include/gz/rendering/optix/OptixMesh.hh b/optix/include/gz/rendering/optix/OptixMesh.hh index 4252e2233..d7e77335e 100644 --- a/optix/include/gz/rendering/optix/OptixMesh.hh +++ b/optix/include/gz/rendering/optix/OptixMesh.hh @@ -19,10 +19,10 @@ #include #include -#include "ignition/rendering/base/BaseMesh.hh" -#include "ignition/rendering/optix/OptixGeometry.hh" -#include "ignition/rendering/optix/OptixObject.hh" -#include "ignition/rendering/optix/OptixRenderTypes.hh" +#include "gz/rendering/base/BaseMesh.hh" +#include "gz/rendering/optix/OptixGeometry.hh" +#include "gz/rendering/optix/OptixObject.hh" +#include "gz/rendering/optix/OptixRenderTypes.hh" namespace gz { diff --git a/optix/include/gz/rendering/optix/OptixMeshFactory.hh b/optix/include/gz/rendering/optix/OptixMeshFactory.hh index 9d7c5e5e6..ea8ff688e 100644 --- a/optix/include/gz/rendering/optix/OptixMeshFactory.hh +++ b/optix/include/gz/rendering/optix/OptixMeshFactory.hh @@ -19,12 +19,12 @@ #include #include -#include +#include -#include "ignition/rendering/MeshDescriptor.hh" -#include "ignition/rendering/optix/OptixRenderTypes.hh" -#include "ignition/rendering/optix/OptixMesh.hh" -#include "ignition/rendering/optix/OptixIncludes.hh" +#include "gz/rendering/MeshDescriptor.hh" +#include "gz/rendering/optix/OptixRenderTypes.hh" +#include "gz/rendering/optix/OptixMesh.hh" +#include "gz/rendering/optix/OptixIncludes.hh" namespace gz { diff --git a/optix/include/gz/rendering/optix/OptixNode.hh b/optix/include/gz/rendering/optix/OptixNode.hh index 7cec33ce9..2a4089948 100644 --- a/optix/include/gz/rendering/optix/OptixNode.hh +++ b/optix/include/gz/rendering/optix/OptixNode.hh @@ -17,10 +17,10 @@ #ifndef GZ_RENDERING_OPTIX_OPTIXNODE_HH_ #define GZ_RENDERING_OPTIX_OPTIXNODE_HH_ -#include "ignition/rendering/base/BaseNode.hh" -#include "ignition/rendering/optix/OptixIncludes.hh" -#include "ignition/rendering/optix/OptixRenderTypes.hh" -#include "ignition/rendering/optix/OptixObject.hh" +#include "gz/rendering/base/BaseNode.hh" +#include "gz/rendering/optix/OptixIncludes.hh" +#include "gz/rendering/optix/OptixRenderTypes.hh" +#include "gz/rendering/optix/OptixObject.hh" namespace gz { diff --git a/optix/include/gz/rendering/optix/OptixObject.hh b/optix/include/gz/rendering/optix/OptixObject.hh index b292c3bf1..a76f339c5 100644 --- a/optix/include/gz/rendering/optix/OptixObject.hh +++ b/optix/include/gz/rendering/optix/OptixObject.hh @@ -17,9 +17,9 @@ #ifndef GZ_RENDERING_OPTIX_OPTIXOBJECT_HH_ #define GZ_RENDERING_OPTIX_OPTIXOBJECT_HH_ -#include "ignition/rendering/base/BaseObject.hh" -#include "ignition/rendering/optix/OptixRenderTypes.hh" -#include "ignition/rendering/optix/Export.hh" +#include "gz/rendering/base/BaseObject.hh" +#include "gz/rendering/optix/OptixRenderTypes.hh" +#include "gz/rendering/optix/Export.hh" namespace gz { diff --git a/optix/include/gz/rendering/optix/OptixPrimitive.hh b/optix/include/gz/rendering/optix/OptixPrimitive.hh index 1e1ca647f..81c8ef42e 100644 --- a/optix/include/gz/rendering/optix/OptixPrimitive.hh +++ b/optix/include/gz/rendering/optix/OptixPrimitive.hh @@ -18,7 +18,7 @@ #define GZ_RENDERING_OPTIX_OPTIXPRIMITIVE_HH_ #include -#include "ignition/rendering/optix/OptixGeometry.hh" +#include "gz/rendering/optix/OptixGeometry.hh" namespace gz { diff --git a/optix/include/gz/rendering/optix/OptixRenderEngine.hh b/optix/include/gz/rendering/optix/OptixRenderEngine.hh index 9c2637517..0f9b49fef 100644 --- a/optix/include/gz/rendering/optix/OptixRenderEngine.hh +++ b/optix/include/gz/rendering/optix/OptixRenderEngine.hh @@ -19,11 +19,11 @@ #include #include -#include +#include -#include "ignition/rendering/RenderEnginePlugin.hh" -#include "ignition/rendering/base/BaseRenderEngine.hh" -#include "ignition/rendering/optix/OptixRenderTypes.hh" +#include "gz/rendering/RenderEnginePlugin.hh" +#include "gz/rendering/base/BaseRenderEngine.hh" +#include "gz/rendering/optix/OptixRenderTypes.hh" namespace gz { diff --git a/optix/include/gz/rendering/optix/OptixRenderTarget.hh b/optix/include/gz/rendering/optix/OptixRenderTarget.hh index b5a3c8df0..3a96344cf 100644 --- a/optix/include/gz/rendering/optix/OptixRenderTarget.hh +++ b/optix/include/gz/rendering/optix/OptixRenderTarget.hh @@ -17,10 +17,10 @@ #ifndef GZ_RENDERING_OPTIX_OPTIXRENDERTARGET_HH_ #define GZ_RENDERING_OPTIX_OPTIXRENDERTARGET_HH_ -#include "ignition/rendering/base/BaseRenderTarget.hh" -#include "ignition/rendering/optix/OptixIncludes.hh" -#include "ignition/rendering/optix/OptixRenderTypes.hh" -#include "ignition/rendering/optix/OptixObject.hh" +#include "gz/rendering/base/BaseRenderTarget.hh" +#include "gz/rendering/optix/OptixIncludes.hh" +#include "gz/rendering/optix/OptixRenderTypes.hh" +#include "gz/rendering/optix/OptixObject.hh" namespace gz { diff --git a/optix/include/gz/rendering/optix/OptixRenderTypes.hh b/optix/include/gz/rendering/optix/OptixRenderTypes.hh index 81e46b005..aceef798d 100644 --- a/optix/include/gz/rendering/optix/OptixRenderTypes.hh +++ b/optix/include/gz/rendering/optix/OptixRenderTypes.hh @@ -17,7 +17,7 @@ #ifndef GZ_RENDERING_OPTIX_OPTIXRENDERTYPES_HH_ #define GZ_RENDERING_OPTIX_OPTIXRENDERTYPES_HH_ -#include "ignition/rendering/base/BaseRenderTypes.hh" +#include "gz/rendering/base/BaseRenderTypes.hh" namespace gz { diff --git a/optix/include/gz/rendering/optix/OptixScene.hh b/optix/include/gz/rendering/optix/OptixScene.hh index 13f51216e..bba2fcd88 100644 --- a/optix/include/gz/rendering/optix/OptixScene.hh +++ b/optix/include/gz/rendering/optix/OptixScene.hh @@ -19,11 +19,11 @@ #include -#include "ignition/rendering/base/BaseScene.hh" +#include "gz/rendering/base/BaseScene.hh" -#include "ignition/rendering/optix/OptixRenderTypes.hh" -#include "ignition/rendering/optix/OptixIncludes.hh" -#include "ignition/rendering/optix/Export.hh" +#include "gz/rendering/optix/OptixRenderTypes.hh" +#include "gz/rendering/optix/OptixIncludes.hh" +#include "gz/rendering/optix/Export.hh" namespace gz { diff --git a/optix/include/gz/rendering/optix/OptixSensor.hh b/optix/include/gz/rendering/optix/OptixSensor.hh index a0fa08a53..18378ef03 100644 --- a/optix/include/gz/rendering/optix/OptixSensor.hh +++ b/optix/include/gz/rendering/optix/OptixSensor.hh @@ -17,8 +17,8 @@ #ifndef GZ_RENDERING_OPTIX_OPTIXSENSOR_HH_ #define GZ_RENDERING_OPTIX_OPTIXSENSOR_HH_ -#include "ignition/rendering/base/BaseSensor.hh" -#include "ignition/rendering/optix/OptixNode.hh" +#include "gz/rendering/base/BaseSensor.hh" +#include "gz/rendering/optix/OptixNode.hh" namespace gz { diff --git a/optix/include/gz/rendering/optix/OptixSphere.hh b/optix/include/gz/rendering/optix/OptixSphere.hh index ede293733..85f8282bd 100644 --- a/optix/include/gz/rendering/optix/OptixSphere.hh +++ b/optix/include/gz/rendering/optix/OptixSphere.hh @@ -17,7 +17,7 @@ #ifndef GZ_RENDERING_OPTIX_OPTIXSPHERE_HH_ #define GZ_RENDERING_OPTIX_OPTIXSPHERE_HH_ -#include "ignition/rendering/optix/OptixPrimitive.hh" +#include "gz/rendering/optix/OptixPrimitive.hh" namespace gz { diff --git a/optix/include/gz/rendering/optix/OptixStorage.hh b/optix/include/gz/rendering/optix/OptixStorage.hh index c861172d7..c44789aec 100644 --- a/optix/include/gz/rendering/optix/OptixStorage.hh +++ b/optix/include/gz/rendering/optix/OptixStorage.hh @@ -17,16 +17,16 @@ #ifndef GZ_RENDERING_OPTIX_OPTIXSTORAGE_HH_ #define GZ_RENDERING_OPTIX_OPTIXSTORAGE_HH_ -#include "ignition/rendering/base/BaseStorage.hh" +#include "gz/rendering/base/BaseStorage.hh" -#include "ignition/rendering/optix/OptixGeometry.hh" -#include "ignition/rendering/optix/OptixLight.hh" -#include "ignition/rendering/optix/OptixMaterial.hh" -#include "ignition/rendering/optix/OptixMesh.hh" -#include "ignition/rendering/optix/OptixNode.hh" -#include "ignition/rendering/optix/OptixScene.hh" -#include "ignition/rendering/optix/OptixSensor.hh" -#include "ignition/rendering/optix/OptixVisual.hh" +#include "gz/rendering/optix/OptixGeometry.hh" +#include "gz/rendering/optix/OptixLight.hh" +#include "gz/rendering/optix/OptixMaterial.hh" +#include "gz/rendering/optix/OptixMesh.hh" +#include "gz/rendering/optix/OptixNode.hh" +#include "gz/rendering/optix/OptixScene.hh" +#include "gz/rendering/optix/OptixSensor.hh" +#include "gz/rendering/optix/OptixVisual.hh" namespace gz { diff --git a/optix/include/gz/rendering/optix/OptixTextureFactory.hh b/optix/include/gz/rendering/optix/OptixTextureFactory.hh index 6a766cf3d..a8506d02d 100644 --- a/optix/include/gz/rendering/optix/OptixTextureFactory.hh +++ b/optix/include/gz/rendering/optix/OptixTextureFactory.hh @@ -18,9 +18,9 @@ #define GZ_RENDERING_OPTIX_OPTIXTEXTUREFACTORY_HH_ #include -#include "ignition/rendering/optix/OptixRenderTypes.hh" -#include "ignition/rendering/optix/OptixIncludes.hh" -#include "ignition/rendering/optix/Export.hh" +#include "gz/rendering/optix/OptixRenderTypes.hh" +#include "gz/rendering/optix/OptixIncludes.hh" +#include "gz/rendering/optix/Export.hh" namespace gz { diff --git a/optix/include/gz/rendering/optix/OptixVisual.hh b/optix/include/gz/rendering/optix/OptixVisual.hh index c3e0b33ee..d117a1874 100644 --- a/optix/include/gz/rendering/optix/OptixVisual.hh +++ b/optix/include/gz/rendering/optix/OptixVisual.hh @@ -17,9 +17,9 @@ #ifndef GZ_RENDERING_OPTIX_OPTIXVISUAL_HH_ #define GZ_RENDERING_OPTIX_OPTIXVISUAL_HH_ -#include "ignition/rendering/base/BaseVisual.hh" -#include "ignition/rendering/optix/OptixNode.hh" -#include "ignition/rendering/optix/OptixRenderTypes.hh" +#include "gz/rendering/base/BaseVisual.hh" +#include "gz/rendering/optix/OptixNode.hh" +#include "gz/rendering/optix/OptixRenderTypes.hh" namespace gz { diff --git a/optix/include/gz/rendering/optix/optix.hh.in b/optix/include/gz/rendering/optix/optix.hh.in index acfd26ae7..c4092f0cd 100644 --- a/optix/include/gz/rendering/optix/optix.hh.in +++ b/optix/include/gz/rendering/optix/optix.hh.in @@ -1,3 +1,3 @@ // Automatically generated -#include +#include ${ign_headers} diff --git a/optix/src/OptixArrowVisual.cc b/optix/src/OptixArrowVisual.cc index 9b2ccb8cd..5492e1668 100644 --- a/optix/src/OptixArrowVisual.cc +++ b/optix/src/OptixArrowVisual.cc @@ -14,7 +14,7 @@ * limitations under the License. * */ -#include "ignition/rendering/optix/OptixArrowVisual.hh" +#include "gz/rendering/optix/OptixArrowVisual.hh" using namespace gz; using namespace rendering; diff --git a/optix/src/OptixAxisVisual.cc b/optix/src/OptixAxisVisual.cc index 0cd7cd8c7..e12593d77 100644 --- a/optix/src/OptixAxisVisual.cc +++ b/optix/src/OptixAxisVisual.cc @@ -14,7 +14,7 @@ * limitations under the License. * */ -#include "ignition/rendering/optix/OptixAxisVisual.hh" +#include "gz/rendering/optix/OptixAxisVisual.hh" using namespace gz; using namespace rendering; diff --git a/optix/src/OptixBox.cc b/optix/src/OptixBox.cc index 08a851c34..2d51ee2a9 100644 --- a/optix/src/OptixBox.cc +++ b/optix/src/OptixBox.cc @@ -14,7 +14,7 @@ * limitations under the License. * */ -#include "ignition/rendering/optix/OptixBox.hh" +#include "gz/rendering/optix/OptixBox.hh" using namespace gz; using namespace rendering; diff --git a/optix/src/OptixCamera.cc b/optix/src/OptixCamera.cc index 61711fbca..b0bc8d9cb 100644 --- a/optix/src/OptixCamera.cc +++ b/optix/src/OptixCamera.cc @@ -14,12 +14,12 @@ * limitations under the License. * */ -#include "ignition/rendering/optix/OptixCamera.hh" +#include "gz/rendering/optix/OptixCamera.hh" -#include -#include "ignition/rendering/optix/OptixIncludes.hh" -#include "ignition/rendering/optix/OptixRenderTarget.hh" -#include "ignition/rendering/optix/OptixScene.hh" +#include +#include "gz/rendering/optix/OptixIncludes.hh" +#include "gz/rendering/optix/OptixRenderTarget.hh" +#include "gz/rendering/optix/OptixScene.hh" using namespace gz; using namespace rendering; diff --git a/optix/src/OptixCamera.cu b/optix/src/OptixCamera.cu index 70b8021b3..370239064 100644 --- a/optix/src/OptixCamera.cu +++ b/optix/src/OptixCamera.cu @@ -16,7 +16,7 @@ */ #include #include -#include +#include // camera variables rtDeclareVariable(float3, eye, , ); diff --git a/optix/src/OptixCone.cc b/optix/src/OptixCone.cc index c63447009..a5f731bca 100644 --- a/optix/src/OptixCone.cc +++ b/optix/src/OptixCone.cc @@ -14,7 +14,7 @@ * limitations under the License. * */ -#include "ignition/rendering/optix/OptixCone.hh" +#include "gz/rendering/optix/OptixCone.hh" using namespace gz; using namespace rendering; diff --git a/optix/src/OptixConversions.cc b/optix/src/OptixConversions.cc index df8f84bd8..3f7193947 100644 --- a/optix/src/OptixConversions.cc +++ b/optix/src/OptixConversions.cc @@ -14,7 +14,7 @@ * limitations under the License. * */ -#include "ignition/rendering/optix/OptixConversions.hh" +#include "gz/rendering/optix/OptixConversions.hh" using namespace gz; using namespace rendering; diff --git a/optix/src/OptixCylinder.cc b/optix/src/OptixCylinder.cc index 183363f1a..be0539d05 100644 --- a/optix/src/OptixCylinder.cc +++ b/optix/src/OptixCylinder.cc @@ -14,7 +14,7 @@ * limitations under the License. * */ -#include "ignition/rendering/optix/OptixCylinder.hh" +#include "gz/rendering/optix/OptixCylinder.hh" using namespace gz; using namespace rendering; diff --git a/optix/src/OptixGeometry.cc b/optix/src/OptixGeometry.cc index 9213ad7e0..4d703df24 100644 --- a/optix/src/OptixGeometry.cc +++ b/optix/src/OptixGeometry.cc @@ -15,10 +15,10 @@ * */ -#include "ignition/rendering/optix/OptixGeometry.hh" +#include "gz/rendering/optix/OptixGeometry.hh" -#include "ignition/rendering/optix/OptixScene.hh" -#include "ignition/rendering/optix/OptixVisual.hh" +#include "gz/rendering/optix/OptixScene.hh" +#include "gz/rendering/optix/OptixVisual.hh" using namespace gz; using namespace rendering; diff --git a/optix/src/OptixGrid.cc b/optix/src/OptixGrid.cc index f965e60c7..1ec8f0cd8 100644 --- a/optix/src/OptixGrid.cc +++ b/optix/src/OptixGrid.cc @@ -15,9 +15,9 @@ * */ -#include "ignition/rendering/optix/OptixGrid.hh" -#include "ignition/rendering/optix/OptixIncludes.hh" -#include "ignition/rendering/optix/OptixVisual.hh" +#include "gz/rendering/optix/OptixGrid.hh" +#include "gz/rendering/optix/OptixIncludes.hh" +#include "gz/rendering/optix/OptixVisual.hh" using namespace gz; using namespace rendering; diff --git a/optix/src/OptixLight.cc b/optix/src/OptixLight.cc index bd61f693c..64e7df818 100644 --- a/optix/src/OptixLight.cc +++ b/optix/src/OptixLight.cc @@ -14,12 +14,12 @@ * limitations under the License. * */ -#include "ignition/rendering/optix/OptixLight.hh" +#include "gz/rendering/optix/OptixLight.hh" -#include "ignition/rendering/optix/OptixConversions.hh" -#include "ignition/rendering/optix/OptixLightManager.hh" -#include "ignition/rendering/optix/OptixIncludes.hh" -#include "ignition/rendering/optix/OptixScene.hh" +#include "gz/rendering/optix/OptixConversions.hh" +#include "gz/rendering/optix/OptixLightManager.hh" +#include "gz/rendering/optix/OptixIncludes.hh" +#include "gz/rendering/optix/OptixScene.hh" using namespace gz; using namespace rendering; diff --git a/optix/src/OptixLightManager.cc b/optix/src/OptixLightManager.cc index 7f13d379b..ea12678c8 100644 --- a/optix/src/OptixLightManager.cc +++ b/optix/src/OptixLightManager.cc @@ -14,11 +14,11 @@ * limitations under the License. * */ -#include "ignition/rendering/optix/OptixLightManager.hh" +#include "gz/rendering/optix/OptixLightManager.hh" -#include "ignition/rendering/optix/OptixLight.hh" -#include "ignition/rendering/optix/OptixScene.hh" -#include "ignition/rendering/optix/OptixVisual.hh" +#include "gz/rendering/optix/OptixLight.hh" +#include "gz/rendering/optix/OptixScene.hh" +#include "gz/rendering/optix/OptixVisual.hh" using namespace gz; using namespace rendering; diff --git a/optix/src/OptixMaterial.cc b/optix/src/OptixMaterial.cc index 623bfb11b..9218c73d8 100644 --- a/optix/src/OptixMaterial.cc +++ b/optix/src/OptixMaterial.cc @@ -14,12 +14,12 @@ * limitations under the License. * */ -#include "ignition/rendering/optix/OptixMaterial.hh" -#include "ignition/rendering/optix/OptixConversions.hh" -#include "ignition/rendering/optix/OptixRayTypes.hh" -#include "ignition/rendering/optix/OptixRenderEngine.hh" -#include "ignition/rendering/optix/OptixScene.hh" -#include "ignition/rendering/optix/OptixTextureFactory.hh" +#include "gz/rendering/optix/OptixMaterial.hh" +#include "gz/rendering/optix/OptixConversions.hh" +#include "gz/rendering/optix/OptixRayTypes.hh" +#include "gz/rendering/optix/OptixRenderEngine.hh" +#include "gz/rendering/optix/OptixScene.hh" +#include "gz/rendering/optix/OptixTextureFactory.hh" using namespace gz; using namespace rendering; diff --git a/optix/src/OptixMaterial.cu b/optix/src/OptixMaterial.cu index 7539048fd..46ec0fa62 100644 --- a/optix/src/OptixMaterial.cu +++ b/optix/src/OptixMaterial.cu @@ -17,8 +17,8 @@ #include #include #include -#include "ignition/rendering/optix/OptixRayTypes.hh" -#include "ignition/rendering/optix/OptixLightTypes.hh" +#include "gz/rendering/optix/OptixRayTypes.hh" +#include "gz/rendering/optix/OptixLightTypes.hh" // scene variables rtDeclareVariable(float3, ambientLightColor, , ); diff --git a/optix/src/OptixMesh.cc b/optix/src/OptixMesh.cc index fc1ffb902..39df3fcbb 100644 --- a/optix/src/OptixMesh.cc +++ b/optix/src/OptixMesh.cc @@ -15,12 +15,12 @@ * */ -#include +#include -#include "ignition/rendering/optix/OptixMesh.hh" -#include "ignition/rendering/optix/OptixIncludes.hh" -#include "ignition/rendering/optix/OptixMaterial.hh" -#include "ignition/rendering/optix/OptixStorage.hh" +#include "gz/rendering/optix/OptixMesh.hh" +#include "gz/rendering/optix/OptixIncludes.hh" +#include "gz/rendering/optix/OptixMaterial.hh" +#include "gz/rendering/optix/OptixStorage.hh" using namespace gz; using namespace rendering; diff --git a/optix/src/OptixMeshFactory.cc b/optix/src/OptixMeshFactory.cc index 24068845b..d7e0cc687 100644 --- a/optix/src/OptixMeshFactory.cc +++ b/optix/src/OptixMeshFactory.cc @@ -14,13 +14,13 @@ * limitations under the License. * */ -#include "ignition/rendering/optix/OptixMeshFactory.hh" +#include "gz/rendering/optix/OptixMeshFactory.hh" #include -#include -#include -#include "ignition/rendering/optix/OptixMesh.hh" -#include "ignition/rendering/optix/OptixStorage.hh" +#include +#include +#include "gz/rendering/optix/OptixMesh.hh" +#include "gz/rendering/optix/OptixStorage.hh" using namespace gz; using namespace rendering; diff --git a/optix/src/OptixMissProgram.cu b/optix/src/OptixMissProgram.cu index 55a003a73..800b55b29 100644 --- a/optix/src/OptixMissProgram.cu +++ b/optix/src/OptixMissProgram.cu @@ -16,7 +16,7 @@ */ #include #include -#include "ignition/rendering/optix/OptixRayTypes.hh" +#include "gz/rendering/optix/OptixRayTypes.hh" rtDeclareVariable(float3, color, , ); rtDeclareVariable(OptixRadianceRayData, payload, rtPayload, ); diff --git a/optix/src/OptixNode.cc b/optix/src/OptixNode.cc index c18be5e6a..1e28cc737 100644 --- a/optix/src/OptixNode.cc +++ b/optix/src/OptixNode.cc @@ -14,11 +14,11 @@ * limitations under the License. * */ -#include "ignition/rendering/optix/OptixNode.hh" -#include "ignition/rendering/optix/OptixConversions.hh" -#include "ignition/rendering/optix/OptixIncludes.hh" -#include "ignition/rendering/optix/OptixScene.hh" -#include "ignition/rendering/optix/OptixStorage.hh" +#include "gz/rendering/optix/OptixNode.hh" +#include "gz/rendering/optix/OptixConversions.hh" +#include "gz/rendering/optix/OptixIncludes.hh" +#include "gz/rendering/optix/OptixScene.hh" +#include "gz/rendering/optix/OptixStorage.hh" using namespace gz; using namespace rendering; diff --git a/optix/src/OptixObject.cc b/optix/src/OptixObject.cc index b45584c51..07f25a4ab 100644 --- a/optix/src/OptixObject.cc +++ b/optix/src/OptixObject.cc @@ -14,9 +14,9 @@ * limitations under the License. * */ -#include "ignition/rendering/optix/OptixObject.hh" +#include "gz/rendering/optix/OptixObject.hh" -#include "ignition/rendering/optix/OptixScene.hh" +#include "gz/rendering/optix/OptixScene.hh" using namespace gz; using namespace rendering; diff --git a/optix/src/OptixPrimitive.cc b/optix/src/OptixPrimitive.cc index d2cc35ebf..003d0401b 100644 --- a/optix/src/OptixPrimitive.cc +++ b/optix/src/OptixPrimitive.cc @@ -15,11 +15,11 @@ * */ -#include +#include -#include "ignition/rendering/optix/OptixPrimitive.hh" -#include "ignition/rendering/optix/OptixMaterial.hh" -#include "ignition/rendering/optix/OptixScene.hh" +#include "gz/rendering/optix/OptixPrimitive.hh" +#include "gz/rendering/optix/OptixMaterial.hh" +#include "gz/rendering/optix/OptixScene.hh" using namespace gz; using namespace rendering; diff --git a/optix/src/OptixRenderEngine.cc b/optix/src/OptixRenderEngine.cc index 4b8031bd8..fc9218295 100644 --- a/optix/src/OptixRenderEngine.cc +++ b/optix/src/OptixRenderEngine.cc @@ -17,13 +17,13 @@ #include -#include +#include -#include "ignition/rendering/RenderEngineManager.hh" -#include "ignition/rendering/optix/OptixIncludes.hh" -#include "ignition/rendering/optix/OptixScene.hh" -#include "ignition/rendering/optix/OptixStorage.hh" -#include "ignition/rendering/optix/OptixRenderEngine.hh" +#include "gz/rendering/RenderEngineManager.hh" +#include "gz/rendering/optix/OptixIncludes.hh" +#include "gz/rendering/optix/OptixScene.hh" +#include "gz/rendering/optix/OptixStorage.hh" +#include "gz/rendering/optix/OptixRenderEngine.hh" using namespace gz; using namespace rendering; diff --git a/optix/src/OptixRenderTarget.cc b/optix/src/OptixRenderTarget.cc index 46d6083b0..5f03ce7ed 100644 --- a/optix/src/OptixRenderTarget.cc +++ b/optix/src/OptixRenderTarget.cc @@ -15,12 +15,12 @@ * */ -#include +#include -#include "ignition/rendering/optix/OptixRenderTarget.hh" +#include "gz/rendering/optix/OptixRenderTarget.hh" -#include "ignition/rendering/optix/OptixConversions.hh" -#include "ignition/rendering/optix/OptixScene.hh" +#include "gz/rendering/optix/OptixConversions.hh" +#include "gz/rendering/optix/OptixScene.hh" using namespace gz; using namespace rendering; diff --git a/optix/src/OptixScene.cc b/optix/src/OptixScene.cc index aea89fd12..46dcae5d5 100644 --- a/optix/src/OptixScene.cc +++ b/optix/src/OptixScene.cc @@ -13,25 +13,25 @@ * */ -#include - -#include "ignition/rendering/optix/OptixArrowVisual.hh" -#include "ignition/rendering/optix/OptixAxisVisual.hh" -#include "ignition/rendering/optix/OptixBox.hh" -#include "ignition/rendering/optix/OptixCamera.hh" -#include "ignition/rendering/optix/OptixCone.hh" -#include "ignition/rendering/optix/OptixCylinder.hh" -#include "ignition/rendering/optix/OptixGeometry.hh" -#include "ignition/rendering/optix/OptixGrid.hh" -#include "ignition/rendering/optix/OptixLightManager.hh" -#include "ignition/rendering/optix/OptixMeshFactory.hh" -#include "ignition/rendering/optix/OptixRayTypes.hh" -#include "ignition/rendering/optix/OptixRenderEngine.hh" -#include "ignition/rendering/optix/OptixRenderTarget.hh" -#include "ignition/rendering/optix/OptixScene.hh" -#include "ignition/rendering/optix/OptixSphere.hh" -#include "ignition/rendering/optix/OptixStorage.hh" -#include "ignition/rendering/optix/OptixVisual.hh" +#include + +#include "gz/rendering/optix/OptixArrowVisual.hh" +#include "gz/rendering/optix/OptixAxisVisual.hh" +#include "gz/rendering/optix/OptixBox.hh" +#include "gz/rendering/optix/OptixCamera.hh" +#include "gz/rendering/optix/OptixCone.hh" +#include "gz/rendering/optix/OptixCylinder.hh" +#include "gz/rendering/optix/OptixGeometry.hh" +#include "gz/rendering/optix/OptixGrid.hh" +#include "gz/rendering/optix/OptixLightManager.hh" +#include "gz/rendering/optix/OptixMeshFactory.hh" +#include "gz/rendering/optix/OptixRayTypes.hh" +#include "gz/rendering/optix/OptixRenderEngine.hh" +#include "gz/rendering/optix/OptixRenderTarget.hh" +#include "gz/rendering/optix/OptixScene.hh" +#include "gz/rendering/optix/OptixSphere.hh" +#include "gz/rendering/optix/OptixStorage.hh" +#include "gz/rendering/optix/OptixVisual.hh" using namespace gz; using namespace rendering; diff --git a/optix/src/OptixSensor.cc b/optix/src/OptixSensor.cc index a7c16c3fc..6efeb9203 100644 --- a/optix/src/OptixSensor.cc +++ b/optix/src/OptixSensor.cc @@ -14,7 +14,7 @@ * limitations under the License. * */ -#include "ignition/rendering/optix/OptixSensor.hh" +#include "gz/rendering/optix/OptixSensor.hh" using namespace gz; using namespace rendering; diff --git a/optix/src/OptixSphere.cc b/optix/src/OptixSphere.cc index 95c9918b7..45f7e8943 100644 --- a/optix/src/OptixSphere.cc +++ b/optix/src/OptixSphere.cc @@ -14,7 +14,7 @@ * limitations under the License. * */ -#include "ignition/rendering/optix/OptixSphere.hh" +#include "gz/rendering/optix/OptixSphere.hh" using namespace gz; using namespace rendering; diff --git a/optix/src/OptixTextureFactory.cc b/optix/src/OptixTextureFactory.cc index 160406d21..039e692eb 100644 --- a/optix/src/OptixTextureFactory.cc +++ b/optix/src/OptixTextureFactory.cc @@ -15,11 +15,11 @@ */ #include -#include +#include -#include "ignition/rendering/config.hh" -#include "ignition/rendering/optix/OptixTextureFactory.hh" -#include "ignition/rendering/optix/OptixScene.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/optix/OptixTextureFactory.hh" +#include "gz/rendering/optix/OptixScene.hh" using namespace gz; using namespace rendering; diff --git a/optix/src/OptixVisual.cc b/optix/src/OptixVisual.cc index e0312b80c..cb51a1d27 100644 --- a/optix/src/OptixVisual.cc +++ b/optix/src/OptixVisual.cc @@ -15,11 +15,11 @@ * */ -#include +#include -#include "ignition/rendering/optix/OptixVisual.hh" -#include "ignition/rendering/optix/OptixConversions.hh" -#include "ignition/rendering/optix/OptixStorage.hh" +#include "gz/rendering/optix/OptixVisual.hh" +#include "gz/rendering/optix/OptixConversions.hh" +#include "gz/rendering/optix/OptixStorage.hh" using namespace gz; using namespace rendering; diff --git a/src/Camera_TEST.cc b/src/Camera_TEST.cc index 945422786..24bea7f5f 100644 --- a/src/Camera_TEST.cc +++ b/src/Camera_TEST.cc @@ -17,15 +17,15 @@ #include -#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/rendering/Camera.hh" -#include "ignition/rendering/GaussianNoisePass.hh" -#include "ignition/rendering/RenderEngine.hh" -#include "ignition/rendering/RenderingIface.hh" -#include "ignition/rendering/RenderPassSystem.hh" -#include "ignition/rendering/Scene.hh" +#include "gz/rendering/Camera.hh" +#include "gz/rendering/GaussianNoisePass.hh" +#include "gz/rendering/RenderEngine.hh" +#include "gz/rendering/RenderingIface.hh" +#include "gz/rendering/RenderPassSystem.hh" +#include "gz/rendering/Scene.hh" using namespace gz; using namespace rendering; diff --git a/src/GaussianNoisePass.cc b/src/GaussianNoisePass.cc index a87e00d1f..231225416 100644 --- a/src/GaussianNoisePass.cc +++ b/src/GaussianNoisePass.cc @@ -16,7 +16,7 @@ */ -#include "ignition/rendering/GaussianNoisePass.hh" +#include "gz/rendering/GaussianNoisePass.hh" using namespace gz; using namespace rendering; diff --git a/src/GaussianNoisePass_TEST.cc b/src/GaussianNoisePass_TEST.cc index 7f6515d47..a20e72cf3 100644 --- a/src/GaussianNoisePass_TEST.cc +++ b/src/GaussianNoisePass_TEST.cc @@ -18,13 +18,13 @@ #include #include -#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/rendering/GaussianNoisePass.hh" -#include "ignition/rendering/RenderEngine.hh" -#include "ignition/rendering/RenderingIface.hh" -#include "ignition/rendering/RenderPassSystem.hh" +#include "gz/rendering/GaussianNoisePass.hh" +#include "gz/rendering/RenderEngine.hh" +#include "gz/rendering/RenderingIface.hh" +#include "gz/rendering/RenderPassSystem.hh" using namespace gz; using namespace rendering; diff --git a/src/GizmoVisual_TEST.cc b/src/GizmoVisual_TEST.cc index 0005b61fd..8d0fbcac7 100644 --- a/src/GizmoVisual_TEST.cc +++ b/src/GizmoVisual_TEST.cc @@ -18,14 +18,14 @@ #include #include -#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/rendering/GizmoVisual.hh" -#include "ignition/rendering/RenderEngine.hh" -#include "ignition/rendering/RenderingIface.hh" -#include "ignition/rendering/Scene.hh" +#include "gz/rendering/GizmoVisual.hh" +#include "gz/rendering/RenderEngine.hh" +#include "gz/rendering/RenderingIface.hh" +#include "gz/rendering/Scene.hh" using namespace gz; using namespace rendering; diff --git a/src/Grid_TEST.cc b/src/Grid_TEST.cc index 61937b904..081be071e 100644 --- a/src/Grid_TEST.cc +++ b/src/Grid_TEST.cc @@ -17,13 +17,13 @@ #include -#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/rendering/RenderEngine.hh" -#include "ignition/rendering/RenderingIface.hh" -#include "ignition/rendering/Grid.hh" -#include "ignition/rendering/Scene.hh" +#include "gz/rendering/RenderEngine.hh" +#include "gz/rendering/RenderingIface.hh" +#include "gz/rendering/Grid.hh" +#include "gz/rendering/Scene.hh" using namespace gz; using namespace rendering; diff --git a/src/Image.cc b/src/Image.cc index a94f040cc..983022e66 100644 --- a/src/Image.cc +++ b/src/Image.cc @@ -14,7 +14,7 @@ * limitations under the License. * */ -#include "ignition/rendering/Image.hh" +#include "gz/rendering/Image.hh" using namespace gz; using namespace rendering; diff --git a/src/Light_TEST.cc b/src/Light_TEST.cc index c101e4ace..bb24051d3 100644 --- a/src/Light_TEST.cc +++ b/src/Light_TEST.cc @@ -17,13 +17,13 @@ #include -#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/rendering/Light.hh" -#include "ignition/rendering/RenderEngine.hh" -#include "ignition/rendering/RenderingIface.hh" -#include "ignition/rendering/Scene.hh" +#include "gz/rendering/Light.hh" +#include "gz/rendering/RenderEngine.hh" +#include "gz/rendering/RenderingIface.hh" +#include "gz/rendering/Scene.hh" using namespace gz; using namespace rendering; diff --git a/src/Marker.cc b/src/Marker.cc index 805882f34..71481eabe 100644 --- a/src/Marker.cc +++ b/src/Marker.cc @@ -16,7 +16,7 @@ */ -#include "ignition/rendering/Marker.hh" +#include "gz/rendering/Marker.hh" using namespace gz; using namespace rendering; diff --git a/src/Marker_TEST.cc b/src/Marker_TEST.cc index 0254f373a..05e0661be 100644 --- a/src/Marker_TEST.cc +++ b/src/Marker_TEST.cc @@ -16,13 +16,13 @@ #include -#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/rendering/RenderEngine.hh" -#include "ignition/rendering/RenderingIface.hh" -#include "ignition/rendering/Marker.hh" -#include "ignition/rendering/Scene.hh" +#include "gz/rendering/RenderEngine.hh" +#include "gz/rendering/RenderingIface.hh" +#include "gz/rendering/Marker.hh" +#include "gz/rendering/Scene.hh" using namespace gz; using namespace rendering; diff --git a/src/Material_TEST.cc b/src/Material_TEST.cc index 79a5ef926..03a9b5aa2 100644 --- a/src/Material_TEST.cc +++ b/src/Material_TEST.cc @@ -18,17 +18,17 @@ #include #include -#include -#include +#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/rendering/Camera.hh" -#include "ignition/rendering/Material.hh" -#include "ignition/rendering/RenderEngine.hh" -#include "ignition/rendering/RenderingIface.hh" -#include "ignition/rendering/ShaderType.hh" -#include "ignition/rendering/Scene.hh" +#include "gz/rendering/Camera.hh" +#include "gz/rendering/Material.hh" +#include "gz/rendering/RenderEngine.hh" +#include "gz/rendering/RenderingIface.hh" +#include "gz/rendering/ShaderType.hh" +#include "gz/rendering/Scene.hh" using namespace gz; using namespace rendering; diff --git a/src/MeshDescriptor.cc b/src/MeshDescriptor.cc index 4aa9d57b0..3d0d2f13d 100644 --- a/src/MeshDescriptor.cc +++ b/src/MeshDescriptor.cc @@ -15,11 +15,11 @@ * */ -#include -#include -#include +#include +#include +#include -#include "ignition/rendering/MeshDescriptor.hh" +#include "gz/rendering/MeshDescriptor.hh" using namespace gz; using namespace rendering; diff --git a/src/MeshDescriptor_TEST.cc b/src/MeshDescriptor_TEST.cc index b32c4a660..8b197cbc2 100644 --- a/src/MeshDescriptor_TEST.cc +++ b/src/MeshDescriptor_TEST.cc @@ -18,16 +18,16 @@ #include #include -#include -#include +#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/rendering/Camera.hh" -#include "ignition/rendering/MeshDescriptor.hh" -#include "ignition/rendering/RenderEngine.hh" -#include "ignition/rendering/RenderingIface.hh" -#include "ignition/rendering/Scene.hh" +#include "gz/rendering/Camera.hh" +#include "gz/rendering/MeshDescriptor.hh" +#include "gz/rendering/RenderEngine.hh" +#include "gz/rendering/RenderingIface.hh" +#include "gz/rendering/Scene.hh" using namespace gz; using namespace rendering; diff --git a/src/Mesh_TEST.cc b/src/Mesh_TEST.cc index 49fb9ab94..47b345995 100644 --- a/src/Mesh_TEST.cc +++ b/src/Mesh_TEST.cc @@ -18,14 +18,14 @@ #include #include -#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/rendering/Camera.hh" -#include "ignition/rendering/Mesh.hh" -#include "ignition/rendering/RenderEngine.hh" -#include "ignition/rendering/RenderingIface.hh" -#include "ignition/rendering/Scene.hh" +#include "gz/rendering/Camera.hh" +#include "gz/rendering/Mesh.hh" +#include "gz/rendering/RenderEngine.hh" +#include "gz/rendering/RenderingIface.hh" +#include "gz/rendering/Scene.hh" using namespace gz; using namespace rendering; diff --git a/src/MoveToHelper.cc b/src/MoveToHelper.cc index 46997e8e4..ed4c3e475 100644 --- a/src/MoveToHelper.cc +++ b/src/MoveToHelper.cc @@ -15,15 +15,15 @@ * */ -#include "ignition/rendering/MoveToHelper.hh" +#include "gz/rendering/MoveToHelper.hh" #include -#include -#include -#include +#include +#include +#include -#include "ignition/rendering/Camera.hh" +#include "gz/rendering/Camera.hh" class gz::rendering::MoveToHelperPrivate { diff --git a/src/MoveToHelper_TEST.cc b/src/MoveToHelper_TEST.cc index 96252cdd3..90f7701c8 100644 --- a/src/MoveToHelper_TEST.cc +++ b/src/MoveToHelper_TEST.cc @@ -18,14 +18,14 @@ #include -#include -#include +#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/rendering/RenderEngine.hh" -#include "ignition/rendering/RenderingIface.hh" -#include "ignition/rendering/Scene.hh" +#include "gz/rendering/RenderEngine.hh" +#include "gz/rendering/RenderingIface.hh" +#include "gz/rendering/Scene.hh" using namespace gz; using namespace rendering; diff --git a/src/Node_TEST.cc b/src/Node_TEST.cc index 6016b320f..2fa2573c2 100644 --- a/src/Node_TEST.cc +++ b/src/Node_TEST.cc @@ -18,15 +18,15 @@ #include #include -#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/rendering/Node.hh" -#include "ignition/rendering/RenderEngine.hh" -#include "ignition/rendering/RenderingIface.hh" -#include "ignition/rendering/Scene.hh" -#include "ignition/rendering/Visual.hh" +#include "gz/rendering/Node.hh" +#include "gz/rendering/RenderEngine.hh" +#include "gz/rendering/RenderingIface.hh" +#include "gz/rendering/Scene.hh" +#include "gz/rendering/Visual.hh" using namespace gz; using namespace rendering; diff --git a/src/OrbitViewController.cc b/src/OrbitViewController.cc index fd20ba7ee..c1c0054d7 100644 --- a/src/OrbitViewController.cc +++ b/src/OrbitViewController.cc @@ -15,11 +15,11 @@ * */ -#include +#include -#include "ignition/rendering/OrbitViewController.hh" -#include "ignition/rendering/Scene.hh" -#include "ignition/rendering/Visual.hh" +#include "gz/rendering/OrbitViewController.hh" +#include "gz/rendering/Scene.hh" +#include "gz/rendering/Visual.hh" class gz::rendering::OrbitViewControllerPrivate { diff --git a/src/OrbitViewController_TEST.cc b/src/OrbitViewController_TEST.cc index ee660c98a..e01b2e2bd 100644 --- a/src/OrbitViewController_TEST.cc +++ b/src/OrbitViewController_TEST.cc @@ -17,14 +17,14 @@ #include -#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/rendering/Camera.hh" -#include "ignition/rendering/OrbitViewController.hh" -#include "ignition/rendering/RenderEngine.hh" -#include "ignition/rendering/RenderingIface.hh" -#include "ignition/rendering/Scene.hh" +#include "gz/rendering/Camera.hh" +#include "gz/rendering/OrbitViewController.hh" +#include "gz/rendering/RenderEngine.hh" +#include "gz/rendering/RenderingIface.hh" +#include "gz/rendering/Scene.hh" using namespace gz; using namespace rendering; diff --git a/src/PixelFormat.cc b/src/PixelFormat.cc index ab253f4e1..75fa8dd95 100644 --- a/src/PixelFormat.cc +++ b/src/PixelFormat.cc @@ -15,9 +15,9 @@ * */ -#include +#include -#include "ignition/rendering/PixelFormat.hh" +#include "gz/rendering/PixelFormat.hh" using namespace gz; using namespace rendering; diff --git a/src/PixelFormat_TEST.cc b/src/PixelFormat_TEST.cc index 589f7e944..3ba8e2c14 100644 --- a/src/PixelFormat_TEST.cc +++ b/src/PixelFormat_TEST.cc @@ -19,7 +19,7 @@ #include "test_config.h" // NOLINT(build/include) -#include "ignition/rendering/PixelFormat.hh" +#include "gz/rendering/PixelFormat.hh" using namespace gz; using namespace rendering; diff --git a/src/RayQuery_TEST.cc b/src/RayQuery_TEST.cc index 1768493f1..f0e35d389 100644 --- a/src/RayQuery_TEST.cc +++ b/src/RayQuery_TEST.cc @@ -17,15 +17,15 @@ #include -#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/rendering/Camera.hh" -#include "ignition/rendering/RayQuery.hh" -#include "ignition/rendering/RenderEngine.hh" -#include "ignition/rendering/RenderingIface.hh" -#include "ignition/rendering/Scene.hh" +#include "gz/rendering/Camera.hh" +#include "gz/rendering/RayQuery.hh" +#include "gz/rendering/RenderEngine.hh" +#include "gz/rendering/RenderingIface.hh" +#include "gz/rendering/Scene.hh" using namespace gz; using namespace rendering; diff --git a/src/RenderEngineManager.cc b/src/RenderEngineManager.cc index d926ec998..f604b82d1 100644 --- a/src/RenderEngineManager.cc +++ b/src/RenderEngineManager.cc @@ -18,15 +18,15 @@ #include #include -#include -#include +#include +#include -#include +#include -#include "ignition/rendering/config.hh" -#include "ignition/rendering/RenderEngine.hh" -#include "ignition/rendering/RenderEngineManager.hh" -#include "ignition/rendering/RenderEnginePlugin.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/RenderEngine.hh" +#include "gz/rendering/RenderEngineManager.hh" +#include "gz/rendering/RenderEnginePlugin.hh" /// \brief Holds information about an engine struct EngineInfo diff --git a/src/RenderEnginePlugin.cc b/src/RenderEnginePlugin.cc index 192226270..7f89fa2b5 100644 --- a/src/RenderEnginePlugin.cc +++ b/src/RenderEnginePlugin.cc @@ -15,7 +15,7 @@ * */ -#include "ignition/rendering/RenderEnginePlugin.hh" +#include "gz/rendering/RenderEnginePlugin.hh" class gz::rendering::RenderEnginePluginPrivate { diff --git a/src/RenderEngine_TEST.cc b/src/RenderEngine_TEST.cc index 182e5586d..e3671d734 100644 --- a/src/RenderEngine_TEST.cc +++ b/src/RenderEngine_TEST.cc @@ -17,13 +17,13 @@ #include -#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/rendering/RenderingIface.hh" -#include "ignition/rendering/Scene.hh" -#include "ignition/rendering/RenderEngine.hh" +#include "gz/rendering/RenderingIface.hh" +#include "gz/rendering/Scene.hh" +#include "gz/rendering/RenderEngine.hh" using namespace gz; using namespace rendering; diff --git a/src/RenderPassSystem.cc b/src/RenderPassSystem.cc index a1f24599f..ef16bca0d 100644 --- a/src/RenderPassSystem.cc +++ b/src/RenderPassSystem.cc @@ -15,9 +15,9 @@ * */ -#include +#include -#include "ignition/rendering/RenderPassSystem.hh" +#include "gz/rendering/RenderPassSystem.hh" using namespace gz; using namespace rendering; diff --git a/src/RenderPassSystem_TEST.cc b/src/RenderPassSystem_TEST.cc index ddad4947e..941d6406b 100644 --- a/src/RenderPassSystem_TEST.cc +++ b/src/RenderPassSystem_TEST.cc @@ -17,13 +17,13 @@ #include -#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/rendering/GaussianNoisePass.hh" -#include "ignition/rendering/RenderEngine.hh" -#include "ignition/rendering/RenderingIface.hh" -#include "ignition/rendering/RenderPassSystem.hh" +#include "gz/rendering/GaussianNoisePass.hh" +#include "gz/rendering/RenderEngine.hh" +#include "gz/rendering/RenderingIface.hh" +#include "gz/rendering/RenderPassSystem.hh" using namespace gz; using namespace rendering; diff --git a/src/RenderTarget_TEST.cc b/src/RenderTarget_TEST.cc index 55134dd14..8b300bc1c 100644 --- a/src/RenderTarget_TEST.cc +++ b/src/RenderTarget_TEST.cc @@ -17,17 +17,17 @@ #include -#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/rendering/Camera.hh" -#include "ignition/rendering/GaussianNoisePass.hh" -#include "ignition/rendering/RenderEngine.hh" -#include "ignition/rendering/RenderingIface.hh" -#include "ignition/rendering/RenderPassSystem.hh" -#include "ignition/rendering/RenderTarget.hh" -#include "ignition/rendering/Scene.hh" +#include "gz/rendering/Camera.hh" +#include "gz/rendering/GaussianNoisePass.hh" +#include "gz/rendering/RenderEngine.hh" +#include "gz/rendering/RenderingIface.hh" +#include "gz/rendering/RenderPassSystem.hh" +#include "gz/rendering/RenderTarget.hh" +#include "gz/rendering/Scene.hh" using namespace gz; using namespace rendering; diff --git a/src/RenderingIface.cc b/src/RenderingIface.cc index dd8ebf266..45fb3d312 100644 --- a/src/RenderingIface.cc +++ b/src/RenderingIface.cc @@ -15,12 +15,12 @@ * */ -#include "ignition/common/Console.hh" +#include "gz/common/Console.hh" -#include "ignition/rendering/RenderEngine.hh" -#include "ignition/rendering/RenderingIface.hh" -#include "ignition/rendering/RenderEngineManager.hh" -#include "ignition/rendering/Scene.hh" +#include "gz/rendering/RenderEngine.hh" +#include "gz/rendering/RenderingIface.hh" +#include "gz/rendering/RenderEngineManager.hh" +#include "gz/rendering/Scene.hh" namespace gz { diff --git a/src/RenderingIface_TEST.cc b/src/RenderingIface_TEST.cc index 7d2f9deb3..971afd4fb 100644 --- a/src/RenderingIface_TEST.cc +++ b/src/RenderingIface_TEST.cc @@ -19,11 +19,11 @@ #include "test_config.h" // NOLINT(build/include) -#include +#include -#include "ignition/rendering/config.hh" -#include "ignition/rendering/RenderEngine.hh" -#include "ignition/rendering/RenderingIface.hh" +#include "gz/rendering/config.hh" +#include "gz/rendering/RenderEngine.hh" +#include "gz/rendering/RenderingIface.hh" using namespace gz; using namespace rendering; diff --git a/src/Scene_TEST.cc b/src/Scene_TEST.cc index 98497353a..4c999e95a 100644 --- a/src/Scene_TEST.cc +++ b/src/Scene_TEST.cc @@ -17,13 +17,13 @@ #include -#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/rendering/RenderEngine.hh" -#include "ignition/rendering/RenderTarget.hh" -#include "ignition/rendering/RenderingIface.hh" -#include "ignition/rendering/Scene.hh" +#include "gz/rendering/RenderEngine.hh" +#include "gz/rendering/RenderTarget.hh" +#include "gz/rendering/RenderingIface.hh" +#include "gz/rendering/Scene.hh" using namespace gz; using namespace rendering; diff --git a/src/ShaderParam.cc b/src/ShaderParam.cc index bce4a6d78..1aac74bb9 100644 --- a/src/ShaderParam.cc +++ b/src/ShaderParam.cc @@ -15,7 +15,7 @@ * */ -#include "ignition/rendering/ShaderParam.hh" +#include "gz/rendering/ShaderParam.hh" using namespace gz::rendering; diff --git a/src/ShaderParam_TEST.cc b/src/ShaderParam_TEST.cc index b9ea83809..3c736834c 100644 --- a/src/ShaderParam_TEST.cc +++ b/src/ShaderParam_TEST.cc @@ -17,7 +17,7 @@ #include -#include "ignition/rendering/ShaderParam.hh" +#include "gz/rendering/ShaderParam.hh" using namespace gz::rendering; diff --git a/src/ShaderParams.cc b/src/ShaderParams.cc index be0fa3ea3..336473a49 100644 --- a/src/ShaderParams.cc +++ b/src/ShaderParams.cc @@ -15,7 +15,7 @@ * */ -#include "ignition/rendering/ShaderParams.hh" +#include "gz/rendering/ShaderParams.hh" #include diff --git a/src/ShaderParams_TEST.cc b/src/ShaderParams_TEST.cc index ffb35ffed..b993a9cbc 100644 --- a/src/ShaderParams_TEST.cc +++ b/src/ShaderParams_TEST.cc @@ -17,7 +17,7 @@ #include -#include "ignition/rendering/ShaderParams.hh" +#include "gz/rendering/ShaderParams.hh" using namespace gz::rendering; diff --git a/src/ShaderType.cc b/src/ShaderType.cc index f9511f297..81b3c2c17 100644 --- a/src/ShaderType.cc +++ b/src/ShaderType.cc @@ -15,9 +15,9 @@ * */ -#include +#include -#include "ignition/rendering/ShaderType.hh" +#include "gz/rendering/ShaderType.hh" using namespace gz; using namespace rendering; diff --git a/src/Text_TEST.cc b/src/Text_TEST.cc index f0d10604b..1eafe7472 100644 --- a/src/Text_TEST.cc +++ b/src/Text_TEST.cc @@ -16,13 +16,13 @@ #include -#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/rendering/RenderEngine.hh" -#include "ignition/rendering/RenderingIface.hh" -#include "ignition/rendering/Text.hh" -#include "ignition/rendering/Scene.hh" +#include "gz/rendering/RenderEngine.hh" +#include "gz/rendering/RenderingIface.hh" +#include "gz/rendering/Text.hh" +#include "gz/rendering/Scene.hh" using namespace gz; using namespace rendering; diff --git a/src/ThermalCamera_TEST.cc b/src/ThermalCamera_TEST.cc index 3263c1af3..fdbe14dc5 100644 --- a/src/ThermalCamera_TEST.cc +++ b/src/ThermalCamera_TEST.cc @@ -17,13 +17,13 @@ #include -#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/rendering/ThermalCamera.hh" -#include "ignition/rendering/RenderEngine.hh" -#include "ignition/rendering/RenderingIface.hh" -#include "ignition/rendering/Scene.hh" +#include "gz/rendering/ThermalCamera.hh" +#include "gz/rendering/RenderEngine.hh" +#include "gz/rendering/RenderingIface.hh" +#include "gz/rendering/Scene.hh" using namespace gz; using namespace rendering; diff --git a/src/TransformController.cc b/src/TransformController.cc index 2782b14da..c9a1cf4a3 100644 --- a/src/TransformController.cc +++ b/src/TransformController.cc @@ -15,14 +15,14 @@ * */ -#include -#include - -#include "ignition/rendering/Camera.hh" -#include "ignition/rendering/GizmoVisual.hh" -#include "ignition/rendering/RayQuery.hh" -#include "ignition/rendering/Scene.hh" -#include "ignition/rendering/TransformController.hh" +#include +#include + +#include "gz/rendering/Camera.hh" +#include "gz/rendering/GizmoVisual.hh" +#include "gz/rendering/RayQuery.hh" +#include "gz/rendering/Scene.hh" +#include "gz/rendering/TransformController.hh" /// \brief Private data class for TransformController class gz::rendering::TransformControllerPrivate diff --git a/src/TransformController_TEST.cc b/src/TransformController_TEST.cc index c59c76b94..7aab7b487 100644 --- a/src/TransformController_TEST.cc +++ b/src/TransformController_TEST.cc @@ -17,15 +17,15 @@ #include -#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/rendering/Camera.hh" -#include "ignition/rendering/RenderEngine.hh" -#include "ignition/rendering/RenderingIface.hh" -#include "ignition/rendering/Scene.hh" -#include "ignition/rendering/TransformController.hh" +#include "gz/rendering/Camera.hh" +#include "gz/rendering/RenderEngine.hh" +#include "gz/rendering/RenderingIface.hh" +#include "gz/rendering/Scene.hh" +#include "gz/rendering/TransformController.hh" using namespace gz; using namespace rendering; diff --git a/src/Utils.cc b/src/Utils.cc index b918fe5fc..91ebb6c95 100644 --- a/src/Utils.cc +++ b/src/Utils.cc @@ -20,13 +20,13 @@ #include #endif -#include "ignition/math/Plane.hh" -#include "ignition/math/Vector2.hh" -#include "ignition/math/Vector3.hh" +#include "gz/math/Plane.hh" +#include "gz/math/Vector2.hh" +#include "gz/math/Vector3.hh" -#include "ignition/rendering/Camera.hh" -#include "ignition/rendering/RayQuery.hh" -#include "ignition/rendering/Utils.hh" +#include "gz/rendering/Camera.hh" +#include "gz/rendering/RayQuery.hh" +#include "gz/rendering/Utils.hh" namespace gz { diff --git a/src/Utils_TEST.cc b/src/Utils_TEST.cc index 8519817eb..f2ed38024 100644 --- a/src/Utils_TEST.cc +++ b/src/Utils_TEST.cc @@ -15,15 +15,15 @@ */ #include -#include - -#include "ignition/rendering/Camera.hh" -#include "ignition/rendering/RayQuery.hh" -#include "ignition/rendering/RenderEngine.hh" -#include "ignition/rendering/RenderingIface.hh" -#include "ignition/rendering/Scene.hh" -#include "ignition/rendering/Utils.hh" -#include "ignition/rendering/Visual.hh" +#include + +#include "gz/rendering/Camera.hh" +#include "gz/rendering/RayQuery.hh" +#include "gz/rendering/RenderEngine.hh" +#include "gz/rendering/RenderingIface.hh" +#include "gz/rendering/Scene.hh" +#include "gz/rendering/Utils.hh" +#include "gz/rendering/Visual.hh" #include "test_config.h" // NOLINT(build/include) diff --git a/src/Visual_TEST.cc b/src/Visual_TEST.cc index 6427be7fb..6c2f7a021 100644 --- a/src/Visual_TEST.cc +++ b/src/Visual_TEST.cc @@ -18,15 +18,15 @@ #include #include -#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/rendering/Geometry.hh" -#include "ignition/rendering/RenderEngine.hh" -#include "ignition/rendering/RenderingIface.hh" -#include "ignition/rendering/Scene.hh" -#include "ignition/rendering/Visual.hh" +#include "gz/rendering/Geometry.hh" +#include "gz/rendering/RenderEngine.hh" +#include "gz/rendering/RenderingIface.hh" +#include "gz/rendering/Scene.hh" +#include "gz/rendering/Visual.hh" using namespace gz; using namespace rendering; diff --git a/src/base/BaseObject.cc b/src/base/BaseObject.cc index f70b47a94..b00a5e987 100644 --- a/src/base/BaseObject.cc +++ b/src/base/BaseObject.cc @@ -14,7 +14,7 @@ * limitations under the License. * */ -#include "ignition/rendering/base/BaseObject.hh" +#include "gz/rendering/base/BaseObject.hh" using namespace gz; using namespace rendering; diff --git a/src/base/BaseRenderEngine.cc b/src/base/BaseRenderEngine.cc index f6121f9ea..53e9c44d2 100644 --- a/src/base/BaseRenderEngine.cc +++ b/src/base/BaseRenderEngine.cc @@ -15,10 +15,10 @@ * */ -#include +#include -#include "ignition/rendering/RenderPassSystem.hh" -#include "ignition/rendering/base/BaseRenderEngine.hh" +#include "gz/rendering/RenderPassSystem.hh" +#include "gz/rendering/base/BaseRenderEngine.hh" using namespace gz; using namespace rendering; diff --git a/src/base/BaseScene.cc b/src/base/BaseScene.cc index f03a54b85..80eb9fbd7 100644 --- a/src/base/BaseScene.cc +++ b/src/base/BaseScene.cc @@ -17,28 +17,28 @@ #include -#include - -#include -#include -#include - -#include "ignition/common/Time.hh" - -#include "ignition/rendering/ArrowVisual.hh" -#include "ignition/rendering/AxisVisual.hh" -#include "ignition/rendering/Camera.hh" -#include "ignition/rendering/DepthCamera.hh" -#include "ignition/rendering/GizmoVisual.hh" -#include "ignition/rendering/GpuRays.hh" -#include "ignition/rendering/Grid.hh" -#include "ignition/rendering/RayQuery.hh" -#include "ignition/rendering/RenderTarget.hh" -#include "ignition/rendering/Text.hh" -#include "ignition/rendering/ThermalCamera.hh" -#include "ignition/rendering/Visual.hh" -#include "ignition/rendering/base/BaseStorage.hh" -#include "ignition/rendering/base/BaseScene.hh" +#include + +#include +#include +#include + +#include "gz/common/Time.hh" + +#include "gz/rendering/ArrowVisual.hh" +#include "gz/rendering/AxisVisual.hh" +#include "gz/rendering/Camera.hh" +#include "gz/rendering/DepthCamera.hh" +#include "gz/rendering/GizmoVisual.hh" +#include "gz/rendering/GpuRays.hh" +#include "gz/rendering/Grid.hh" +#include "gz/rendering/RayQuery.hh" +#include "gz/rendering/RenderTarget.hh" +#include "gz/rendering/Text.hh" +#include "gz/rendering/ThermalCamera.hh" +#include "gz/rendering/Visual.hh" +#include "gz/rendering/base/BaseStorage.hh" +#include "gz/rendering/base/BaseScene.hh" using namespace gz; using namespace rendering; diff --git a/test/integration/camera.cc b/test/integration/camera.cc index 892addc54..50c880cb4 100644 --- a/test/integration/camera.cc +++ b/test/integration/camera.cc @@ -17,14 +17,14 @@ #include -#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/rendering/Camera.hh" -#include "ignition/rendering/RenderEngine.hh" -#include "ignition/rendering/RenderingIface.hh" -#include "ignition/rendering/Scene.hh" +#include "gz/rendering/Camera.hh" +#include "gz/rendering/RenderEngine.hh" +#include "gz/rendering/RenderingIface.hh" +#include "gz/rendering/Scene.hh" using namespace gz; using namespace rendering; diff --git a/test/integration/depth_camera.cc b/test/integration/depth_camera.cc index 174cd6f10..85c37bb5a 100644 --- a/test/integration/depth_camera.cc +++ b/test/integration/depth_camera.cc @@ -17,16 +17,16 @@ #include -#include -#include -#include +#include +#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/rendering/DepthCamera.hh" -#include "ignition/rendering/RenderEngine.hh" -#include "ignition/rendering/RenderingIface.hh" -#include "ignition/rendering/Scene.hh" +#include "gz/rendering/DepthCamera.hh" +#include "gz/rendering/RenderEngine.hh" +#include "gz/rendering/RenderingIface.hh" +#include "gz/rendering/Scene.hh" #define DEPTH_TOL 1e-4 #define DOUBLE_TOL 1e-6 diff --git a/test/integration/gpu_rays.cc b/test/integration/gpu_rays.cc index ff21fd473..3c9c7f882 100644 --- a/test/integration/gpu_rays.cc +++ b/test/integration/gpu_rays.cc @@ -17,16 +17,16 @@ #include -#include -#include -#include +#include +#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/rendering/GpuRays.hh" -#include "ignition/rendering/RenderEngine.hh" -#include "ignition/rendering/RenderingIface.hh" -#include "ignition/rendering/Scene.hh" +#include "gz/rendering/GpuRays.hh" +#include "gz/rendering/RenderEngine.hh" +#include "gz/rendering/RenderingIface.hh" +#include "gz/rendering/Scene.hh" #define LASER_TOL 2e-4 #define DOUBLE_TOL 1e-6 diff --git a/test/integration/render_pass.cc b/test/integration/render_pass.cc index 476121dfe..543d23f23 100644 --- a/test/integration/render_pass.cc +++ b/test/integration/render_pass.cc @@ -17,20 +17,20 @@ #include -#include -#include +#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/rendering/Camera.hh" -#include "ignition/rendering/DepthCamera.hh" -#include "ignition/rendering/GaussianNoisePass.hh" -#include "ignition/rendering/Image.hh" -#include "ignition/rendering/PixelFormat.hh" -#include "ignition/rendering/RenderEngine.hh" -#include "ignition/rendering/RenderingIface.hh" -#include "ignition/rendering/RenderPassSystem.hh" -#include "ignition/rendering/Scene.hh" +#include "gz/rendering/Camera.hh" +#include "gz/rendering/DepthCamera.hh" +#include "gz/rendering/GaussianNoisePass.hh" +#include "gz/rendering/Image.hh" +#include "gz/rendering/PixelFormat.hh" +#include "gz/rendering/RenderEngine.hh" +#include "gz/rendering/RenderingIface.hh" +#include "gz/rendering/RenderPassSystem.hh" +#include "gz/rendering/Scene.hh" #define DOUBLE_TOL 1e-6 unsigned int g_pointCloudCounter = 0; diff --git a/test/integration/scene.cc b/test/integration/scene.cc index e95fd23b5..889551e79 100644 --- a/test/integration/scene.cc +++ b/test/integration/scene.cc @@ -17,14 +17,14 @@ #include -#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/rendering/Camera.hh" -#include "ignition/rendering/RenderEngine.hh" -#include "ignition/rendering/RenderingIface.hh" -#include "ignition/rendering/Scene.hh" +#include "gz/rendering/Camera.hh" +#include "gz/rendering/RenderEngine.hh" +#include "gz/rendering/RenderingIface.hh" +#include "gz/rendering/Scene.hh" using namespace gz; using namespace rendering; diff --git a/test/integration/shadows.cc b/test/integration/shadows.cc index c28e0dbd2..f1f7c43f7 100644 --- a/test/integration/shadows.cc +++ b/test/integration/shadows.cc @@ -17,17 +17,17 @@ #include -#include -#include +#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/rendering/Camera.hh" -#include "ignition/rendering/Image.hh" -#include "ignition/rendering/PixelFormat.hh" -#include "ignition/rendering/RenderEngine.hh" -#include "ignition/rendering/RenderingIface.hh" -#include "ignition/rendering/Scene.hh" +#include "gz/rendering/Camera.hh" +#include "gz/rendering/Image.hh" +#include "gz/rendering/PixelFormat.hh" +#include "gz/rendering/RenderEngine.hh" +#include "gz/rendering/RenderingIface.hh" +#include "gz/rendering/Scene.hh" using namespace gz; using namespace rendering; diff --git a/test/integration/thermal_camera.cc b/test/integration/thermal_camera.cc index 60b6725e4..e74bed75c 100644 --- a/test/integration/thermal_camera.cc +++ b/test/integration/thermal_camera.cc @@ -17,16 +17,16 @@ #include -#include -#include -#include +#include +#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/rendering/ThermalCamera.hh" -#include "ignition/rendering/RenderEngine.hh" -#include "ignition/rendering/RenderingIface.hh" -#include "ignition/rendering/Scene.hh" +#include "gz/rendering/ThermalCamera.hh" +#include "gz/rendering/RenderEngine.hh" +#include "gz/rendering/RenderingIface.hh" +#include "gz/rendering/Scene.hh" #define DEPTH_TOL 1e-4 #define DOUBLE_TOL 1e-6 diff --git a/test/performance/scene_factory.cc b/test/performance/scene_factory.cc index 7c4705a42..334cd50e6 100644 --- a/test/performance/scene_factory.cc +++ b/test/performance/scene_factory.cc @@ -22,13 +22,13 @@ #include -#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/rendering/RenderEngine.hh" -#include "ignition/rendering/RenderingIface.hh" -#include "ignition/rendering/Scene.hh" +#include "gz/rendering/RenderEngine.hh" +#include "gz/rendering/RenderingIface.hh" +#include "gz/rendering/Scene.hh" using namespace gz; using namespace rendering; diff --git a/test/test_config.h.in b/test/test_config.h.in index 1f01b4dc4..645f8a69a 100644 --- a/test/test_config.h.in +++ b/test/test_config.h.in @@ -12,7 +12,7 @@ static const std::vector kRenderEngineTestValues{"ogre2", "optix"}; #include -#include +#include namespace gz {