Bumps in garden: use ignition-math7

.github/ci/packages.apt

@@ -5,7 +5,7 @@ libavutil-dev
 libfreeimage-dev
 libgts-dev
 libignition-cmake2-dev
-libignition-math6-dev
+libignition-math7-dev
 libignition-utils1-dev
 libswscale-dev
 libtinyxml2-dev

BUILD.bazel

@@ -84,9 +84,9 @@ cc_library(
 )
 
 cc_binary(
-    name = "libignition-common4.so",
+    name = "libignition-common5.so",
     includes = ["include"],
-    linkopts = ["-Wl,-soname,libignition-common4.so"],
+    linkopts = ["-Wl,-soname,libignition-common5.so"],
     linkshared = True,
     deps = [":ign_common"],
 )
@@ -99,7 +99,7 @@ test_srcs = glob(
 [cc_test(
     name = src.replace("/", "_").replace(".cc", "").replace("src_", ""),
     srcs = [src],
-    data = [":libignition-common4.so"],
+    data = [":libignition-common5.so"],
     deps = [
         ":ign_common",
         IGNITION_ROOT + "ign_bazel:utilities",

CMakeLists.txt

@@ -48,8 +48,8 @@ message(STATUS "\n\n-- ====== Finding Dependencies ======")
 
 #--------------------------------------
 # Find ignition-math
-ign_find_package(ignition-math6 REQUIRED_BY graphics events VERSION 6.6)
-set(IGN_MATH_VER ${ignition-math6_VERSION_MAJOR})
+ign_find_package(ignition-math7 REQUIRED_BY graphics events)
+set(IGN_MATH_VER ${ignition-math7_VERSION_MAJOR})
 
 #--------------------------------------
 # Find ignition-utils

av/BUILD.bazel

@@ -65,9 +65,9 @@ cc_library(
 )
 
 cc_binary(
-    name = "libignition-common4-av.so",
+    name = "libignition-common5-av.so",
     includes = ["include"],
-    linkopts = ["-Wl,-soname,libignition-common4-av.so"],
+    linkopts = ["-Wl,-soname,libignition-common5-av.so"],
     linkshared = True,
     deps = [":av"],
 )

configure.bat

@@ -5,7 +5,7 @@
 
 :: Install dependencies
 call %win_lib% :download_unzip_install dlfcn-win32-vc15-x64-dll-MD.zip
-call %win_lib% :install_ign_project ign-math ign-math6
+call %win_lib% :install_ign_project ign-math main
 
 :: Set configuration variables
 @set build_type=Release

events/BUILD.bazel

@@ -57,9 +57,9 @@ cc_library(
 )
 
 cc_binary(
-    name = "libignition-common4-events.so",
+    name = "libignition-common5-events.so",
     includes = ["include"],
-    linkopts = ["-Wl,-soname,libignition-common4-events.so"],
+    linkopts = ["-Wl,-soname,libignition-common5-events.so"],
     linkshared = True,
     deps = [":events"],
 )

graphics/BUILD.bazel

@@ -63,9 +63,9 @@ cc_library(
 )
 
 cc_binary(
-    name = "libignition-common4-graphics.so",
+    name = "libignition-common5-graphics.so",
     includes = ["include"],
-    linkopts = ["-Wl,-soname,libignition-common4-graphics.so"],
+    linkopts = ["-Wl,-soname,libignition-common5-graphics.so"],
     linkshared = True,
     deps = [":graphics"],
 )

graphics/src/ColladaExporter.cc

@@ -963,11 +963,11 @@ void ColladaExporter::Implementation::ExportVisualScenes(
       auto lightdir_norm = light.direction.Normalized();
       math::Vector3d initial_dir(0, 0, -1);
       math::Quaterniond q;
-      q.From2Axes(initial_dir, lightdir_norm);
+      q.SetFrom2Axes(initial_dir, lightdir_norm);
 
       math::Vector3d axis;
       double angle = 0.0;
-      q.ToAxis(axis, angle);
+      q.AxisAngle(axis, angle);
 
       tinyxml2::XMLElement *rotateXml =
         _libraryVisualScenesXml->GetDocument()->NewElement("rotate");

graphics/src/MeshManager.cc

@@ -379,7 +379,7 @@ void MeshManager::CreatePlane(const std::string &_name,
   xlate = rot = ignition::math::Matrix4d::Identity;
 
   ignition::math::Matrix3d rot3;
-  rot3.Axes(xAxis, yAxis, zAxis);
+  rot3.SetAxes(xAxis, yAxis, zAxis);
 
   rot = rot3;
 

graphics/src/NodeTransform.cc

@@ -14,8 +14,11 @@
  * limitations under the License.
  *
  */
+
 #include <ignition/common/NodeTransform.hh>
 
+#include <iostream>
+
 using namespace ignition;
 using namespace common;
 
@@ -161,10 +164,10 @@ void NodeTransform::RecalculateMatrix()
       if (this->dataPtr->type == ROTATE)
       {
         math::Matrix3d mat;
-        mat.Axis(math::Vector3d(this->dataPtr->source[0],
-                                this->dataPtr->source[1],
-                                this->dataPtr->source[2]),
-                 IGN_DTOR(this->dataPtr->source[3]));
+        mat.SetFromAxisAngle(math::Vector3d(this->dataPtr->source[0],
+                                            this->dataPtr->source[1],
+                                            this->dataPtr->source[2]),
+                             IGN_DTOR(this->dataPtr->source[3]));
         this->dataPtr->transform = mat;
       }
       else

graphics/src/SVGLoader.cc

@@ -149,7 +149,7 @@ ignition::math::Matrix3d ParseTransformMatrixStr(
     }
     double deg = stod(numbers[0]);
     ignition::math::Angle angle;
-    angle.Degree(deg);
+    angle.SetDegree(deg);
     // get the tangent of the angle
     double t = tan(angle.Radian());
     ignition::math::Matrix3d m(1, t, 0, 0, 1, 0, 0, 0, 1);
@@ -166,7 +166,7 @@ ignition::math::Matrix3d ParseTransformMatrixStr(
     }
     double deg = stod(numbers[0]);
     ignition::math::Angle angle;
-    angle.Degree(deg);
+    angle.SetDegree(deg);
     // get the tangent of the angle
     double t = tan(angle.Radian());
     ignition::math::Matrix3d m(1, 0, 0, t, 1, 0, 0, 0, 1);
@@ -223,7 +223,7 @@ ignition::math::Matrix3d ParseTransformMatrixStr(
     }
     double deg = stod(numbers[0]);
     ignition::math::Angle angle;
-    angle.Degree(deg);
+    angle.SetDegree(deg);
     double a = angle.Radian();
     double sina = sin(a);
     double cosa = cos(a);

profiler/BUILD.bazel

@@ -100,9 +100,9 @@ cc_library(
 )
 
 cc_binary(
-    name = "libignition-common4-profiler.so",
+    name = "libignition-common5-profiler.so",
     includes = ["include"],
-    linkopts = ["-Wl,-soname,libignition-common4-profiler.so"],
+    linkopts = ["-Wl,-soname,libignition-common5-profiler.so"],
     linkshared = True,
     deps = [":profiler"],
 )

src/Filesystem.cc

@@ -242,8 +242,16 @@ std::string checkWindowsPath(const std::string _path)
   std::string result = std::regex_replace(_path, std::regex(R"(/)"), "\\");
   std::string drive_letters;
 
+<<<<<<< HEAD
   // only Windows contains absolute paths starting with drive letters
   if (result.length() > 3 && 0 == result.compare(1, 2, ":\\"))
+=======
+  if (is_url)
+  {
+    ret = copyToUnixPath(ret);
+  }
+  else
+>>>>>>> edad65f... Fix deprecations when using ign-math7
   {
     drive_letters = result.substr(0, 3);
     result = result.substr(3);