Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ign -> gz Header Migration : ign-rendering #618

Merged
merged 4 commits into from
May 9, 2022
Merged

ign -> gz Header Migration : ign-rendering #618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2e464fe
Move header files with git mv (#618)
methylDragon May 4, 2022
bd6b316
Create redirection aliases (#618)
methylDragon May 4, 2022
714be92
Migrate sources in src, test, examples, and include (#618)
methylDragon May 5, 2022
5c0254e
Migrate CMake files (#618)
methylDragon May 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 3 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ set(IGN_CMAKE_VER ${ignition-cmake3_VERSION_MAJOR})
#============================================================================
# Set up the project
#============================================================================
ign_configure_project(VERSION_SUFFIX pre1)
ign_configure_project(
REPLACE_IGNITION_INCLUDE_PATH gz/rendering
VERSION_SUFFIX pre1)

#============================================================================
# Set project-specific options
Expand Down
2 changes: 1 addition & 1 deletion doc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ if (DOXYGEN_FOUND)
COMMENT "Generating API documentation with Doxygen" VERBATIM)

install(FILES ${CMAKE_BINARY_DIR}/doc/${PROJECT_NAME_LOWER}.tag.xml
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/ignition/${PROJECT_NAME_LOWER}_${PROJECT_VERSION_MINOR})
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/gz/${PROJECT_NAME_LOWER}_${PROJECT_VERSION_MINOR})
endif()
20 changes: 10 additions & 10 deletions examples/actor_animation/GlutWindow.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,16 @@
#include <map>
#include <string>

#include <ignition/math/Matrix4.hh>
#include <ignition/common/Console.hh>
#include <ignition/common/Mesh.hh>
#include <ignition/common/Skeleton.hh>
#include <ignition/common/SkeletonAnimation.hh>
#include <ignition/rendering/Camera.hh>
#include <ignition/rendering/Image.hh>
#include <ignition/rendering/OrbitViewController.hh>
#include <ignition/rendering/RayQuery.hh>
#include <ignition/rendering/Scene.hh>
#include <gz/math/Matrix4.hh>
#include <gz/common/Console.hh>
#include <gz/common/Mesh.hh>
#include <gz/common/Skeleton.hh>
#include <gz/common/SkeletonAnimation.hh>
#include <gz/rendering/Camera.hh>
#include <gz/rendering/Image.hh>
#include <gz/rendering/OrbitViewController.hh>
#include <gz/rendering/RayQuery.hh>
#include <gz/rendering/Scene.hh>

#include "GlutWindow.hh"
#include "example_config.hh"
Expand Down
8 changes: 4 additions & 4 deletions examples/actor_animation/GlutWindow.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
* limitations under the License.
*
*/
#ifndef IGNITION_RENDERING_EXAMPLES_ACTOR_ANIMATION_GLUTWINDOW_HH_
#define IGNITION_RENDERING_EXAMPLES_ACTOR_ANIMATION_GLUTWINDOW_HH_
#ifndef GZ_RENDERING_EXAMPLES_ACTOR_ANIMATION_GLUTWINDOW_HH_
#define GZ_RENDERING_EXAMPLES_ACTOR_ANIMATION_GLUTWINDOW_HH_

#include <vector>
#include "ignition/rendering/RenderTypes.hh"
#include "ignition/common/graphics/Types.hh"
#include "gz/rendering/RenderTypes.hh"
#include "gz/common/graphics/Types.hh"

namespace ir = ignition::rendering;
namespace ic = ignition::common;
Expand Down
12 changes: 6 additions & 6 deletions examples/actor_animation/Main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
#include <iostream>
#include <vector>

#include <ignition/common/Console.hh>
#include <ignition/common/Skeleton.hh>
#include <ignition/common/SkeletonAnimation.hh>
#include <ignition/common/MeshManager.hh>
#include <ignition/common/Mesh.hh>
#include <ignition/rendering.hh>
#include <gz/common/Console.hh>
#include <gz/common/Skeleton.hh>
#include <gz/common/SkeletonAnimation.hh>
#include <gz/common/MeshManager.hh>
#include <gz/common/Mesh.hh>
#include <gz/rendering.hh>

#include "example_config.hh"
#include "GlutWindow.hh"
Expand Down
12 changes: 6 additions & 6 deletions examples/camera_tracking/GlutWindow.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@

#include <mutex>

#include <ignition/common/Console.hh>
#include <ignition/rendering/Camera.hh>
#include <ignition/rendering/Image.hh>
#include <ignition/rendering/RayQuery.hh>
#include <ignition/rendering/Scene.hh>
#include <ignition/rendering/OrbitViewController.hh>
#include <gz/common/Console.hh>
#include <gz/rendering/Camera.hh>
#include <gz/rendering/Image.hh>
#include <gz/rendering/RayQuery.hh>
#include <gz/rendering/Scene.hh>
#include <gz/rendering/OrbitViewController.hh>

#include "GlutWindow.hh"

Expand Down
6 changes: 3 additions & 3 deletions examples/camera_tracking/GlutWindow.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
* limitations under the License.
*
*/
#ifndef IGNITION_RENDERING_EXAMPLES_CAMERA_TRACKING_GLUTWINDOW_HH_
#define IGNITION_RENDERING_EXAMPLES_CAMERA_TRACKING_GLUTWINDOW_HH_
#ifndef GZ_RENDERING_EXAMPLES_CAMERA_TRACKING_GLUTWINDOW_HH_
#define GZ_RENDERING_EXAMPLES_CAMERA_TRACKING_GLUTWINDOW_HH_

#include <vector>
#include <ignition/rendering/RenderTypes.hh>
#include <gz/rendering/RenderTypes.hh>

namespace ir = ignition::rendering;

Expand Down
4 changes: 2 additions & 2 deletions examples/camera_tracking/Main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
#include <iostream>
#include <vector>

#include <ignition/common/Console.hh>
#include <ignition/rendering.hh>
#include <gz/common/Console.hh>
#include <gz/rendering.hh>
#include "GlutWindow.hh"

using namespace ignition;
Expand Down
2 changes: 1 addition & 1 deletion examples/custom_scene_viewer/DemoWindow.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include <string>
#include <vector>

#include <ignition/rendering.hh>
#include <gz/rendering.hh>

#include "ManualSceneDemo.hh"
#include "DemoWindow.hh"
Expand Down
4 changes: 2 additions & 2 deletions examples/custom_scene_viewer/DemoWindow.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* limitations under the License.
*
*/
#ifndef IGNITION_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_DEMOWINDOW_HH_
#define IGNITION_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_DEMOWINDOW_HH_
#ifndef GZ_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_DEMOWINDOW_HH_
#define GZ_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_DEMOWINDOW_HH_

#include "TestTypes.hh"

Expand Down
2 changes: 1 addition & 1 deletion examples/custom_scene_viewer/ManualSceneDemo.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#endif

#include <iostream>
#include <ignition/common/Console.hh>
#include <gz/common/Console.hh>
#include "ManualSceneDemo.hh"
#include "SceneBuilder.hh"
#include "DemoWindow.hh"
Expand Down
6 changes: 3 additions & 3 deletions examples/custom_scene_viewer/ManualSceneDemo.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
* limitations under the License.
*
*/
#ifndef IGNITION_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_MANUALSCENEDEMO_HH_
#define IGNITION_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_MANUALSCENEDEMO_HH_
#ifndef GZ_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_MANUALSCENEDEMO_HH_
#define GZ_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_MANUALSCENEDEMO_HH_

#include <map>
#include <string>
#include <ignition/rendering.hh>
#include <gz/rendering.hh>
#include "TestTypes.hh"

namespace ignition
Expand Down
4 changes: 2 additions & 2 deletions examples/custom_scene_viewer/SceneBuilder.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* limitations under the License.
*
*/
#ifndef IGNITION_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_SCENEBUILDER_HH_
#define IGNITION_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_SCENEBUILDER_HH_
#ifndef GZ_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_SCENEBUILDER_HH_
#define GZ_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_SCENEBUILDER_HH_

#include <string>
#include "TestTypes.hh"
Expand Down
6 changes: 3 additions & 3 deletions examples/custom_scene_viewer/TestTypes.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
* limitations under the License.
*
*/
#ifndef IGNITION_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_TESTYPES_HH_
#define IGNITION_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_TESTYPES_HH_
#ifndef GZ_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_TESTYPES_HH_
#define GZ_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_TESTYPES_HH_

#include <vector>
#include <ignition/rendering.hh>
#include <gz/rendering.hh>

namespace ignition
{
Expand Down
6 changes: 3 additions & 3 deletions examples/custom_shaders/custom_shaders.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
* limitations under the License.
*
*/
#include <ignition/common/Image.hh>
#include <ignition/common/Filesystem.hh>
#include <ignition/rendering.hh>
#include <gz/common/Image.hh>
#include <gz/common/Filesystem.hh>
#include <gz/rendering.hh>

#include "example_config.hh"

Expand Down
10 changes: 5 additions & 5 deletions examples/custom_shaders_uniforms/GlutWindow.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@

#include <mutex>

#include <ignition/common/Console.hh>
#include <ignition/rendering.hh>
#include <ignition/rendering/Camera.hh>
#include <ignition/rendering/Image.hh>
#include <ignition/rendering/Scene.hh>
#include <gz/common/Console.hh>
#include <gz/rendering.hh>
#include <gz/rendering/Camera.hh>
#include <gz/rendering/Image.hh>
#include <gz/rendering/Scene.hh>

#include "GlutWindow.hh"

Expand Down
6 changes: 3 additions & 3 deletions examples/custom_shaders_uniforms/GlutWindow.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
* limitations under the License.
*
*/
#ifndef IGNITION_RENDERING_EXAMPLES_CUSTOM_SHADERS_UNIFORMS_DEMO_GLUTWINDOW_HH_
#define IGNITION_RENDERING_EXAMPLES_CUSTOM_SHADERS_UNIFORMS_DEMO_GLUTWINDOW_HH_
#ifndef GZ_RENDERING_EXAMPLES_CUSTOM_SHADERS_UNIFORMS_DEMO_GLUTWINDOW_HH_
#define GZ_RENDERING_EXAMPLES_CUSTOM_SHADERS_UNIFORMS_DEMO_GLUTWINDOW_HH_

#include <vector>
#include "ignition/rendering/RenderTypes.hh"
#include "gz/rendering/RenderTypes.hh"

namespace ir = ignition::rendering;

Expand Down
4 changes: 2 additions & 2 deletions examples/custom_shaders_uniforms/Main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
#include <iostream>
#include <vector>

#include <ignition/common/Console.hh>
#include <ignition/rendering.hh>
#include <gz/common/Console.hh>
#include <gz/rendering.hh>

#include "example_config.hh"

Expand Down
24 changes: 12 additions & 12 deletions examples/depth_camera/GlutWindow.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,18 @@
#include <string>
#include <vector>

#include <ignition/common/Console.hh>
#include <ignition/common/Image.hh>

#include <ignition/math/Vector2.hh>

#include <ignition/rendering/Camera.hh>
#include <ignition/rendering/Image.hh>
#include <ignition/rendering/OrbitViewController.hh>
#include <ignition/rendering/RayQuery.hh>
#include <ignition/rendering/Scene.hh>
#include <ignition/rendering/SegmentationCamera.hh>
#include <ignition/rendering/DepthCamera.hh>
#include <gz/common/Console.hh>
#include <gz/common/Image.hh>

#include <gz/math/Vector2.hh>

#include <gz/rendering/Camera.hh>
#include <gz/rendering/Image.hh>
#include <gz/rendering/OrbitViewController.hh>
#include <gz/rendering/RayQuery.hh>
#include <gz/rendering/Scene.hh>
#include <gz/rendering/SegmentationCamera.hh>
#include <gz/rendering/DepthCamera.hh>

#include "GlutWindow.hh"

Expand Down
6 changes: 3 additions & 3 deletions examples/depth_camera/GlutWindow.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
* limitations under the License.
*
*/
#ifndef IGNITION_RENDERING_EXAMPLES_DEPTH_CAMERA_GLUTWINDOW_HH_
#define IGNITION_RENDERING_EXAMPLES_DEPTH_CAMERA_GLUTWINDOW_HH_
#ifndef GZ_RENDERING_EXAMPLES_DEPTH_CAMERA_GLUTWINDOW_HH_
#define GZ_RENDERING_EXAMPLES_DEPTH_CAMERA_GLUTWINDOW_HH_

#include <vector>
#include "ignition/rendering/RenderTypes.hh"
#include "gz/rendering/RenderTypes.hh"

namespace ir = ignition::rendering;

Expand Down
6 changes: 3 additions & 3 deletions examples/depth_camera/Main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
#include <string>
#include <vector>

#include <ignition/common/Console.hh>
#include <ignition/common/MeshManager.hh>
#include <ignition/rendering.hh>
#include <gz/common/Console.hh>
#include <gz/common/MeshManager.hh>
#include <gz/rendering.hh>

#include "example_config.hh"
#include "GlutWindow.hh"
Expand Down
6 changes: 3 additions & 3 deletions examples/gazebo_scene_viewer/CameraWindow.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
#include <gazebo/common/Console.hh>
#include <gazebo/transport/TransportIface.hh>

#include <ignition/rendering/Camera.hh>
#include <ignition/rendering/Image.hh>
#include <ignition/rendering/Scene.hh>
#include <gz/rendering/Camera.hh>
#include <gz/rendering/Image.hh>
#include <gz/rendering/Scene.hh>

#include "CameraWindow.hh"
#include "SceneManager.hh"
Expand Down
6 changes: 3 additions & 3 deletions examples/gazebo_scene_viewer/CameraWindow.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
* limitations under the License.
*
*/
#ifndef IGNITION_RENDERING_EXAMPLES_CAMERAWINDOW_HH_
#define IGNITION_RENDERING_EXAMPLES_CAMERAWINDOW_HH_
#ifndef GZ_RENDERING_EXAMPLES_CAMERAWINDOW_HH_
#define GZ_RENDERING_EXAMPLES_CAMERAWINDOW_HH_

#include <vector>
#include "ignition/rendering/RenderTypes.hh"
#include "gz/rendering/RenderTypes.hh"

namespace gz = ignition::rendering;

Expand Down
10 changes: 5 additions & 5 deletions examples/gazebo_scene_viewer/GazeboDemo.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
#include <gazebo/common/Console.hh>
#include <gazebo/transport/TransportIface.hh>

#include <ignition/rendering/Camera.hh>
#include <ignition/rendering/RenderingIface.hh>
#include <ignition/rendering/RenderEngine.hh>
#include <ignition/rendering/Scene.hh>
#include <ignition/rendering/Visual.hh>
#include <gz/rendering/Camera.hh>
#include <gz/rendering/RenderingIface.hh>
#include <gz/rendering/RenderEngine.hh>
#include <gz/rendering/Scene.hh>
#include <gz/rendering/Visual.hh>

#include "CameraWindow.hh"
#include "SceneManager.hh"
Expand Down
12 changes: 6 additions & 6 deletions examples/gazebo_scene_viewer/GazeboWorldDemo.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@
#endif

#include <iostream>
#include <ignition/common/Console.hh>
#include <gz/common/Console.hh>
#include <gazebo/transport/TransportIface.hh>

#include <ignition/rendering/Camera.hh>
#include <ignition/rendering/RenderingIface.hh>
#include <ignition/rendering/RenderEngine.hh>
#include <ignition/rendering/Scene.hh>
#include <ignition/rendering/Visual.hh>
#include <gz/rendering/Camera.hh>
#include <gz/rendering/RenderingIface.hh>
#include <gz/rendering/RenderEngine.hh>
#include <gz/rendering/Scene.hh>
#include <gz/rendering/Visual.hh>

#include "CameraWindow.hh"
#include "SceneManager.hh"
Expand Down
Loading