Skip to content

Commit

Permalink
Migrate include statements
Browse files Browse the repository at this point in the history
Signed-off-by: methylDragon <[email protected]>
  • Loading branch information
methylDragon committed Aug 19, 2022
1 parent dc50423 commit d7e384d
Show file tree
Hide file tree
Showing 350 changed files with 1,522 additions and 1,522 deletions.
20 changes: 10 additions & 10 deletions examples/actor_animation/GlutWindow.cc
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,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
4 changes: 2 additions & 2 deletions examples/actor_animation/GlutWindow.hh
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
#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 = gz::rendering;
namespace ic = gz::common;
Expand Down
10 changes: 5 additions & 5 deletions examples/actor_animation/Main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
#include <iostream>
#include <vector>

#include <ignition/common/Console.hh>
#include <ignition/common/Skeleton.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/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
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
2 changes: 1 addition & 1 deletion examples/camera_tracking/GlutWindow.hh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#define GZ_RENDERING_EXAMPLES_CAMERA_TRACKING_GLUTWINDOW_HH_

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

namespace ir = gz::rendering;

Expand Down
4 changes: 2 additions & 2 deletions examples/camera_tracking/Main.cc
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 gz;
Expand Down
2 changes: 1 addition & 1 deletion examples/custom_scene_viewer/DemoWindow.cc
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#include <string>
#include <vector>

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

#include "ManualSceneDemo.hh"
#include "DemoWindow.hh"
Expand Down
2 changes: 1 addition & 1 deletion examples/custom_scene_viewer/ManualSceneDemo.cc
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*
*/
#include <iostream>
#include <ignition/common/Console.hh>
#include <gz/common/Console.hh>
#include "ManualSceneDemo.hh"
#include "SceneBuilder.hh"
#include "DemoWindow.hh"
Expand Down
2 changes: 1 addition & 1 deletion examples/custom_scene_viewer/ManualSceneDemo.hh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#define GZ_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_MANUALSCENEDEMO_HH_

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

namespace gz
Expand Down
2 changes: 1 addition & 1 deletion examples/custom_scene_viewer/TestTypes.hh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#define GZ_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_TESTYPES_HH_

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

namespace gz
{
Expand Down
6 changes: 3 additions & 3 deletions examples/custom_shaders/custom_shaders.cc
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
8 changes: 4 additions & 4 deletions examples/gazebo_scene_viewer/CameraWindow.cc
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@

#include <gazebo/common/Console.hh>

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

#include "SceneManager.hh"

Expand Down
2 changes: 1 addition & 1 deletion examples/gazebo_scene_viewer/CameraWindow.hh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#define GZ_RENDERING_EXAMPLES_CAMERAWINDOW_HH_

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

namespace gz = gz::rendering;

Expand Down
2 changes: 1 addition & 1 deletion examples/gazebo_scene_viewer/GazeboDemo.cc
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <gazebo/common/Console.hh>
#include <gazebo/transport/TransportIface.hh>

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

#include "CameraWindow.hh"
#include "SceneManager.hh"
Expand Down
4 changes: 2 additions & 2 deletions examples/gazebo_scene_viewer/GazeboWorldDemo.cc
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
*
*/
#include <iostream>
#include <ignition/common/Console.hh>
#include <gz/common/Console.hh>
#include <gazebo/transport/TransportIface.hh>

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

#include "CameraWindow.hh"
#include "SceneManager.hh"
Expand Down
6 changes: 3 additions & 3 deletions examples/gazebo_scene_viewer/SceneManager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@

#include <gazebo/common/Events.hh>

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

#include "SceneManager.hh"
#include "SceneManagerPrivate.hh"
Expand Down
4 changes: 2 additions & 2 deletions examples/gazebo_scene_viewer/SceneManager.hh
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
#endif

#include <string>
#include <ignition/common/SingletonT.hh>
#include "ignition/rendering/RenderTypes.hh"
#include <gz/common/SingletonT.hh>
#include "gz/rendering/RenderTypes.hh"

namespace gz
{
Expand Down
10 changes: 5 additions & 5 deletions examples/gazebo_scene_viewer/SceneManagerPrivate.hh
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
#include <string>
#include <vector>

#include <ignition/common/Time.hh>
#include <gz/common/Time.hh>

#include <ignition/math/Color.hh>
#include <ignition/math/Pose3.hh>
#include <gz/math/Color.hh>
#include <gz/math/Pose3.hh>

#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
Expand Down
10 changes: 5 additions & 5 deletions examples/hello_world_plugin/HelloWorldPlugin.cc
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
*
*/

#include <ignition/common/SingletonT.hh>
#include <gz/common/SingletonT.hh>

#include <ignition/plugin/Register.hh>
#include <gz/plugin/Register.hh>

#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
{
Expand Down
12 changes: 6 additions & 6 deletions examples/mesh_viewer/GlutWindow.cc
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
2 changes: 1 addition & 1 deletion examples/mesh_viewer/GlutWindow.hh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#define GZ_RENDERING_EXAMPLES_MESH_VIEWER_GLUTWINDOW_HH_

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

namespace ir = gz::rendering;

Expand Down
6 changes: 3 additions & 3 deletions examples/mesh_viewer/Main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
#include <iostream>
#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
16 changes: 8 additions & 8 deletions examples/mouse_picking/GlutWindow.cc
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@

#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/Visual.hh>
#include <ignition/rendering.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/Visual.hh>
#include <gz/rendering.hh>
#include <gz/rendering/OrbitViewController.hh>

#include "GlutWindow.hh"

Expand Down
2 changes: 1 addition & 1 deletion examples/mouse_picking/GlutWindow.hh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#define GZ_RENDERING_EXAMPLES_MOUSE_PICKING_GLUTWINDOW_HH_

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

namespace ir = gz::rendering;

Expand Down
4 changes: 2 additions & 2 deletions examples/mouse_picking/Main.cc
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"

Expand Down
14 changes: 7 additions & 7 deletions examples/ogre2_demo/GlutWindow.cc
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@

#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/RenderPass.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/RenderPass.hh>
#include <gz/rendering/Scene.hh>
#include <gz/rendering/OrbitViewController.hh>

#include "GlutWindow.hh"

Expand Down
2 changes: 1 addition & 1 deletion examples/ogre2_demo/GlutWindow.hh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#define GZ_RENDERING_EXAMPLES_OGRE2_DEMO_GLUTWINDOW_HH_

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

namespace ir = gz::rendering;

Expand Down
6 changes: 3 additions & 3 deletions examples/ogre2_demo/Main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
#include <iostream>
#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
10 changes: 5 additions & 5 deletions examples/render_pass/GlutWindow.cc
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@

#include <mutex>

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

#include "GlutWindow.hh"

Expand Down
Loading

0 comments on commit d7e384d

Please sign in to comment.