Forward port 3 to 6, Jan 29 2023

CMakeLists.txt

@@ -15,7 +15,10 @@ set(IGN_CMAKE_VER ${ignition-cmake2_VERSION_MAJOR})
 #============================================================================
 # Set up the project
 #============================================================================
-ign_configure_project(VERSION_SUFFIX)
+ign_configure_project(
+  REPLACE_IGNITION_INCLUDE_PATH gz/rendering
+  VERSION_SUFFIX
+)
 
 #============================================================================
 # Set project-specific options

Changelog.md

@@ -860,6 +860,67 @@
 1. Add support for transparency based on textures alpha channel for ogre1 and ogre2
     * [BitBucket pull request 229](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-rendering/pull-requests/229)
 
+
+### Ignition Rendering 3.7.0 (2022-11-29)
+
+1. Migrate ignition to gazebo headers.
+    * [Pull request #705](https://github.com/gazebosim/gz-rendering/pull/705)
+
+### Ignition Rendering 3.6.1 (2022-11-08)
+
+1. Improved coverage: MeshDescriptor, Mesh, MoveToHelper, OrbitViewController, PixelFormat and ShadersParams
+    * [Pull request #748](https://github.com/gazebosim/gz-rendering/pull/748)
+
+1. Suppress Windows warnings
+    * [Pull request #749](https://github.com/gazebosim/gz-rendering/pull/749)
+
+1. Improved RenderEngine and Mesh coverage
+    * [Pull request #739](https://github.com/gazebosim/gz-rendering/pull/739)
+
+1. Increase TransformControl test converage (#668)
+    * [Pull request #741](https://github.com/gazebosim/gz-rendering/pull/741)
+
+1. Increased Marker coverage
+    * [Pull request #738](https://github.com/gazebosim/gz-rendering/pull/738)
+
+1. Added shaderType converage
+    * [Pull request #740](https://github.com/gazebosim/gz-rendering/pull/740)
+
+1. Improved grid coverage
+    * [Pull request #737](https://github.com/gazebosim/gz-rendering/pull/737)
+
+1. Improved coverage Arrow and Axis visuals and fixed some warnings
+    * [Pull request #736](https://github.com/gazebosim/gz-rendering/pull/736)
+
+1. Backport from 6 to 3. Disable C4275 warnings on Windows from OgreUTFString (#621)
+    * [Pull request #707](https://github.com/gazebosim/gz-rendering/pull/707)
+
+1. Remove redundant namespace references
+    * [Pull request #701](https://github.com/gazebosim/gz-rendering/pull/701)
+
+1. Disabling flaky depth and thermal camera tests on mac (#405)
+    * [Pull request #696](https://github.com/gazebosim/gz-rendering/pull/696)
+
+1. Change IGN_DESIGNATION to GZ_DESIGNATION (#677)
+    * [Pull request #691](https://github.com/gazebosim/gz-rendering/pull/691)
+
+1. Add coverage ignore file
+    * [Pull request #689](https://github.com/gazebosim/gz-rendering/pull/689)
+
+1. Ignition -> Gazebo
+    * [Pull request #674](https://github.com/gazebosim/gz-rendering/pull/674)
+
+1. fix checking unofficial ogre version when ogre 1.x is not installed
+    * [Pull request #648](https://github.com/gazebosim/gz-rendering/pull/648)
+
+1. Updated CODEOWNERS
+    * [Pull request #612](https://github.com/gazebosim/gz-rendering/pull/612)
+    * [Pull request #613](https://github.com/gazebosim/gz-rendering/pull/613)
+    * [Pull request #634](https://github.com/gazebosim/gz-rendering/pull/634)
+
+1. Silence CMake policy CMP0072
+    * [Pull request #528](https://github.com/gazebosim/gz-rendering/pull/528)
+
 ### Ignition Rendering 3.6.0 (2021-10-15)
 
 1. Avoid symbol redefition to fix armel builds

examples/actor_animation/GlutWindow.cc

@@ -34,16 +34,16 @@
 #include <map>
 #include <string>
 
-#include <ignition/math/Matrix4.hh>
-#include <ignition/common/Console.hh>
-#include <ignition/common/Mesh.hh>
-#include <ignition/common/Skeleton.hh>
-#include <ignition/common/SkeletonAnimation.hh>
-#include <ignition/rendering/Camera.hh>
-#include <ignition/rendering/Image.hh>
-#include <ignition/rendering/OrbitViewController.hh>
-#include <ignition/rendering/RayQuery.hh>
-#include <ignition/rendering/Scene.hh>
+#include <gz/math/Matrix4.hh>
+#include <gz/common/Console.hh>
+#include <gz/common/Mesh.hh>
+#include <gz/common/Skeleton.hh>
+#include <gz/common/SkeletonAnimation.hh>
+#include <gz/rendering/Camera.hh>
+#include <gz/rendering/Image.hh>
+#include <gz/rendering/OrbitViewController.hh>
+#include <gz/rendering/RayQuery.hh>
+#include <gz/rendering/Scene.hh>
 
 #include "GlutWindow.hh"
 #include "example_config.hh"
@@ -171,7 +171,7 @@ void handleMouse()
         2.0 * g_mouse.x / static_cast<double>(rayCamera->ImageWidth()) - 1.0;
     double ny = 1.0 -
         2.0 * g_mouse.y / static_cast<double>(rayCamera->ImageHeight());
-    g_rayQuery->SetFromCamera(rayCamera, ignition::math::Vector2d(nx, ny));
+    g_rayQuery->SetFromCamera(rayCamera, gz::math::Vector2d(nx, ny));
     g_target  = g_rayQuery->ClosestPoint();
     if (!g_target)
     {
@@ -201,7 +201,7 @@ void handleMouse()
   if (g_mouse.motionDirty)
   {
     g_mouse.motionDirty = false;
-    auto drag = ignition::math::Vector2d(g_mouse.dragX, g_mouse.dragY);
+    auto drag = gz::math::Vector2d(g_mouse.dragX, g_mouse.dragY);
 
     // left mouse button pan
     if (g_mouse.button == GLUT_LEFT_BUTTON && g_mouse.state == GLUT_DOWN)

examples/actor_animation/GlutWindow.hh

@@ -14,15 +14,15 @@
  * 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;
+namespace ir = gz::rendering;
+namespace ic = gz::common;
 
 /// \brief Run the demo and render the scene from the cameras
 /// \param[in] _cameras Cameras in the scene

examples/actor_animation/Main.cc

@@ -27,17 +27,17 @@
 #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"
 
-using namespace ignition;
+using namespace gz;
 using namespace rendering;
 
 const std::string RESOURCE_PATH =

examples/camera_tracking/GlutWindow.cc

@@ -31,12 +31,12 @@
 
 #include <mutex>
 
-#include <ignition/common/Console.hh>
-#include <ignition/rendering/Camera.hh>
-#include <ignition/rendering/Image.hh>
-#include <ignition/rendering/RayQuery.hh>
-#include <ignition/rendering/Scene.hh>
-#include <ignition/rendering/OrbitViewController.hh>
+#include <gz/common/Console.hh>
+#include <gz/rendering/Camera.hh>
+#include <gz/rendering/Image.hh>
+#include <gz/rendering/RayQuery.hh>
+#include <gz/rendering/Scene.hh>
+#include <gz/rendering/OrbitViewController.hh>
 
 #include "GlutWindow.hh"
 
@@ -92,8 +92,8 @@ struct mouseButton
 struct mouseButton g_mouse;
 std::mutex g_mouseMutex;
 
-ignition::math::Vector3d g_trackOffset(1.0, 0, 0);
-ignition::math::Vector3d g_followOffset(-3, 0, 3);
+gz::math::Vector3d g_trackOffset(1.0, 0, 0);
+gz::math::Vector3d g_followOffset(-3, 0, 3);
 
 
 //////////////////////////////////////////////////
@@ -158,7 +158,7 @@ void handleMouse()
         2.0 * g_mouse.x / static_cast<double>(rayCamera->ImageWidth()) - 1.0;
     double ny = 1.0 -
         2.0 * g_mouse.y / static_cast<double>(rayCamera->ImageHeight());
-    g_rayQuery->SetFromCamera(rayCamera, ignition::math::Vector2d(nx, ny));
+    g_rayQuery->SetFromCamera(rayCamera, gz::math::Vector2d(nx, ny));
     g_target  = g_rayQuery->ClosestPoint();
     if (!g_target)
     {
@@ -188,7 +188,7 @@ void handleMouse()
   if (g_mouse.motionDirty)
   {
     g_mouse.motionDirty = false;
-    auto drag = ignition::math::Vector2d(g_mouse.dragX, g_mouse.dragY);
+    auto drag = gz::math::Vector2d(g_mouse.dragX, g_mouse.dragY);
 
     // left mouse button pan
     if (g_mouse.button == GLUT_LEFT_BUTTON && g_mouse.state == GLUT_DOWN)
@@ -296,21 +296,21 @@ void keyboardCB(unsigned char _key, int, int)
     if (_key == 'w' || _key == 'W')
     {
       node->SetWorldPosition(node->WorldPosition() +
-          node->WorldRotation() * ignition::math::Vector3d(posIncr, 0, 0));
+          node->WorldRotation() * gz::math::Vector3d(posIncr, 0, 0));
     }
     else if (_key == 's' || _key == 'S')
     {
       node->SetWorldPosition(node->WorldPosition() +
-          node->WorldRotation() * ignition::math::Vector3d(-posIncr, 0, 0));
+          node->WorldRotation() * gz::math::Vector3d(-posIncr, 0, 0));
     }
     else if (_key == 'a' || _key == 'A')
     {
-      node->SetWorldRotation(ignition::math::Quaterniond(0, 0,
+      node->SetWorldRotation(gz::math::Quaterniond(0, 0,
           node->WorldRotation().Yaw() + yawIncr));
     }
     else if (_key == 'd' || _key == 'D')
     {
-      node->SetWorldRotation(ignition::math::Quaterniond(0, 0,
+      node->SetWorldRotation(gz::math::Quaterniond(0, 0,
           node->WorldRotation().Yaw() - yawIncr));
     }
   }
@@ -399,14 +399,14 @@ void keyboardCB(unsigned char _key, int, int)
     if (_key == 't' || _key == 'T')
     {
       double trackPGain = 0.005;
-      double p = ignition::math::equal(cam->TrackPGain(), 1.0) ?
+      double p = gz::math::equal(cam->TrackPGain(), 1.0) ?
           trackPGain : 1.0;
       cam->SetTrackPGain(p);
     }
     else if (_key == 'f' || _key == 'F')
     {
       double followPGain = 0.01;
-      double p = ignition::math::equal(cam->FollowPGain(), 1.0) ?
+      double p = gz::math::equal(cam->FollowPGain(), 1.0) ?
           followPGain : 1.0;
       cam->SetFollowPGain(p);
     }

examples/camera_tracking/GlutWindow.hh

@@ -14,13 +14,13 @@
  * 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;
+namespace ir = gz::rendering;
 
 /// \brief Run the demo and render the scene from the cameras
 /// \param[in] _cameras Cameras in the scene

examples/camera_tracking/Main.cc

@@ -27,11 +27,11 @@
 #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;
+using namespace gz;
 using namespace rendering;
 
 //////////////////////////////////////////////////

examples/custom_scene_viewer/DemoWindow.cc

@@ -33,15 +33,15 @@
 #include <string>
 #include <vector>
 
-#include <ignition/rendering.hh>
+#include <gz/rendering.hh>
 
 #include "ManualSceneDemo.hh"
 #include "DemoWindow.hh"
 
 #define KEY_ESC 27
 #define KEY_TAB  9
 
-using namespace ignition;
+using namespace gz;
 using namespace rendering;
 
 //////////////////////////////////////////////////

examples/custom_scene_viewer/DemoWindow.hh

@@ -14,12 +14,12 @@
  * 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"
 
-namespace ir = ignition::rendering;
+namespace ir = gz::rendering;
 
 /// \brief Run the demo
 /// \param[in] _Pointer to demo

examples/custom_scene_viewer/ManualSceneDemo.cc

@@ -25,12 +25,12 @@
 #endif
 
 #include <iostream>
-#include <ignition/common/Console.hh>
+#include <gz/common/Console.hh>
 #include "ManualSceneDemo.hh"
 #include "SceneBuilder.hh"
 #include "DemoWindow.hh"
 
-using namespace ignition;
+using namespace gz;
 using namespace rendering;
 
 //////////////////////////////////////////////////

examples/custom_scene_viewer/ManualSceneDemo.hh

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

examples/custom_scene_viewer/SceneBuilder.cc

@@ -18,7 +18,7 @@
 #include "example_config.hh"
 #include "SceneBuilder.hh"
 
-using namespace ignition;
+using namespace gz;
 using namespace rendering;
 
 const std::string RESOURCE_PATH = std::string(PROJECT_BINARY_PATH) + "/media";

examples/custom_scene_viewer/SceneBuilder.hh

@@ -14,8 +14,8 @@
  * limitations under the License.
  *
  */
-#ifndef IGNITION_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_SCENEBUILDER_HH_
-#define IGNITION_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_SCENEBUILDER_HH_
+#ifndef GZ_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_SCENEBUILDER_HH_
+#define GZ_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_SCENEBUILDER_HH_
 
 #include <string>
 #include "TestTypes.hh"

examples/custom_scene_viewer/TestTypes.hh

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