Merge branch 'luca/assimp_sandbox' into otore19/assimp_flag_env

.github/ci/packages.apt

@@ -1,13 +1,14 @@
+libassimp-dev
 libavcodec-dev
 libavdevice-dev
 libavformat-dev
 libavutil-dev
 libfreeimage-dev
 libgdal-dev
 libgts-dev
-libignition-cmake3-dev
-libignition-math7-dev
-libignition-utils2-dev
+libgz-cmake3-dev
+libgz-math7-dev
+libgz-utils2-dev
 libswscale-dev
 libtinyxml2-dev
 pkg-config

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
         uses: actions/checkout@v2
       - name: Compile and test
         id: ci
-        uses: ignition-tooling/action-ignition-ci@focal
+        uses: gazebo-tooling/action-gz-ci@focal
         with:
           codecov-enabled: true
   jammy-ci:
@@ -22,5 +22,4 @@ jobs:
         uses: actions/checkout@v2
       - name: Compile and test
         id: ci
-        uses: ignition-tooling/action-ignition-ci@jammy
-
+        uses: gazebo-tooling/action-gz-ci@jammy

.github/workflows/macos.yml

@@ -5,7 +5,7 @@ on: [push, pull_request]
 jobs:
   build:
     env:
-      PACKAGE: ignition-common5
+      PACKAGE: gz-common5
     runs-on: macos-latest
     steps:
     - uses: actions/checkout@v2
@@ -19,7 +19,7 @@ jobs:
         brew tap osrf/simulation;
         # check for ci_matching_branch
         brew install wget
-        wget https://github.com/ignition-tooling/release-tools/raw/master/jenkins-scripts/tools/detect_ci_matching_branch.py
+        wget https://github.com/gazebo-tooling/release-tools/raw/master/jenkins-scripts/tools/detect_ci_matching_branch.py
         TRY_BRANCH="${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}"
         if python3 detect_ci_matching_branch.py ${TRY_BRANCH}
         then
@@ -30,7 +30,7 @@ jobs:
           popd
           echo '# END SECTION'
         fi
-        # ignition-math7 has problems with swig, remove it for now
+        # gz-math7 has problems with swig, remove it for now
         brew remove swig || true
         brew install --only-dependencies ${PACKAGE};
     - run: mkdir build

.github/workflows/pr-collection-labeler.yml

@@ -8,6 +8,6 @@ jobs:
     steps:
     - name: Add collection labels
       if: github.event.action == 'opened'
-      uses: ignition-tooling/pr-collection-labeler@v1
+      uses: gazebo-tooling/pr-collection-labeler@v1
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}

BUILD.bazel

@@ -1,23 +1,23 @@
 load(
     "//gz_bazel:build_defs.bzl",
-    "IGNITION_FEATURES",
-    "IGNITION_ROOT",
-    "IGNITION_VISIBILITY",
+    "GZ_FEATURES",
+    "GZ_ROOT",
+    "GZ_VISIBILITY",
     "generate_include_header",
     "gz_config_header",
     "gz_export_header",
 )
 
 package(
-    default_visibility = IGNITION_VISIBILITY,
-    features = IGNITION_FEATURES,
+    default_visibility = GZ_VISIBILITY,
+    features = GZ_FEATURES,
 )
 
 licenses(["notice"])
 
 exports_files(["LICENSE"])
 
-PROJECT_NAME = "ignition-common"
+PROJECT_NAME = "gz-common"
 
 PROJECT_MAJOR = 5
 
@@ -36,8 +36,8 @@ gz_config_header(
 
 gz_export_header(
     name = "include/gz/common/Export.hh",
-    export_base = "IGNITION_COMMON",
-    lib_name = "ignition-common",
+    export_base = "GZ_COMMON",
+    lib_name = "gz-common",
     visibility = ["//visibility:private"],
 )
 
@@ -79,14 +79,14 @@ cc_library(
     linkopts = ["-ldl"],
     deps = [
         "@uuid",
-        IGNITION_ROOT + "gz_math",
+        GZ_ROOT + "gz_math",
     ],
 )
 
 cc_binary(
-    name = "libignition-common5.so",
+    name = "libgz-common5.so",
     includes = ["include"],
-    linkopts = ["-Wl,-soname,libignition-common5.so"],
+    linkopts = ["-Wl,-soname,libgz-common5.so"],
     linkshared = True,
     deps = [":gz_common"],
 )
@@ -99,11 +99,11 @@ test_srcs = glob(
 [cc_test(
     name = src.replace("/", "_").replace(".cc", "").replace("src_", ""),
     srcs = [src],
-    data = [":libignition-common5.so"],
+    data = [":libgz-common5.so"],
     deps = [
         ":gz_common",
-        IGNITION_ROOT + "gz_bazel:utilities",
-        IGNITION_ROOT + "gz_common/test:test_utils",
+        GZ_ROOT + "gz_bazel:utilities",
+        GZ_ROOT + "gz_common/test:test_utils",
         "@gtest",
         "@gtest//:gtest_main",
     ],

CMakeLists.txt

@@ -15,21 +15,19 @@ set(GZ_CMAKE_VER ${gz-cmake3_VERSION_MAJOR})
 #============================================================================
 # Configure the project
 #============================================================================
-gz_configure_project(
-  REPLACE_IGNITION_INCLUDE_PATH gz/common
-  VERSION_SUFFIX pre1)
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+gz_configure_project(VERSION_SUFFIX pre1)
 
 #============================================================================
 # Set project-specific options
 #============================================================================
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
 #--------------------------------------
 # Option: Should Windows test symlinking?
 if(WIN32)
   option(
-    IGN_BUILD_SYMLINK_TESTS_ON_WINDOWS
+    GZ_BUILD_SYMLINK_TESTS_ON_WINDOWS
     "Creating symlinks requires special permissions on Windows, so those tests are disabled by default"
     false)
 endif()
@@ -126,7 +124,7 @@ gz_find_package(AVUTIL REQUIRED_BY av PRETTY libavutil)
 
 #------------------------------------
 # Find assimp
-ign_find_package(ASSIMP VERSION 5.2.0 REQUIRED_BY graphics PRETTY assimp)
+gz_find_package(GzAssimp REQUIRED_BY graphics PRETTY assimp)
 
 
 message(STATUS "-------------------------------------------\n")

Changelog.md

@@ -8,7 +8,7 @@
 1. Fix spelling in URI error message
     * [Pull request #333](https://github.com/gazebosim/gz-common/pull/333)
 
-1. `ignLogInit` fails if run after console output
+1. `gzLogInit` fails if run after console output
     * [Pull request #332](https://github.com/gazebosim/gz-common/pull/332)
 
 1. Fix compatibility with FFmpeg 5.0
@@ -77,7 +77,7 @@
 
 ## Gazebo Common 4.3.0 (2021-09-27)
 
-1. Remove ign-utils from TempDirectory
+1. Remove gz-utils from TempDirectory
     * [Pull request #248](https://github.com/gazebosim/gz-common/pull/248)
 
 1. Add functions and objects for Temporary Directories
@@ -163,7 +163,7 @@
 
 1. Add bazel buildsystem support
     * [Pull request #123](https://github.com/gazebosim/gz-common/pull/123)
->>>>>>> ign-common4
+>>>>>>> gz-common4
 
 ## Gazebo Common 4.0.0 (2021-03-30)
 
@@ -176,7 +176,7 @@
 1. Rotate capsule to Z-up
     * [Pull request #186](https://github.com/gazebosim/gz-common/pull/186)
 
-1. Add implementation pointer to ign-common classes
+1. Add implementation pointer to gz-common classes
     * [Pull request #163](https://github.com/gazebosim/gz-common/pull/163)
 
 1. Cleanup and add implementation pointer to Animation classes
@@ -201,7 +201,7 @@
     * [Pull request #58](https://github.com/gazebosim/gz-common/pull/58)
 
 1. Corrected `BAYER_RGGR8` to `BAYER_BGGR8` in `PixelFormatName` and
-   `PixelFormatType` located in `graphics/include/ignition/common/Image.hh`.
+   `PixelFormatType` located in `graphics/include/gz/common/Image.hh`.
     * [BitBucket pull request 191](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-common/pull-requests/191)
 
 1. Added URI Authority parsing to the URI class. Authority information can
@@ -210,7 +210,31 @@
 
 ## Gazebo Common 3.x
 
-## Gazebo Common 3.X.X
+## Gazebo Common 3.14.1 (2022-06-01)
+
+1. Profiler tutorial: viewing from Docker container
+    * [Pull request #362](https://github.com/gazebosim/gz-common/pull/362)
+
+1. ignLogInit can be called after an ignerr, etc
+    * [Pull request #332](https://github.com/gazebosim/gz-common/pull/332)
+
+1. Fix compatibility with FFmpeg 5.0
+    * [Pull request #325](https://github.com/gazebosim/gz-common/pull/325)
+
+1. Fix out-of-bounds access in sanitizeSlashes
+    * [Pull request #303](https://github.com/gazebosim/gz-common/pull/303)
+
+1. Fix memory corruption & leaks in Image
+    * [Pull request #287](https://github.com/gazebosim/gz-common/pull/287)
+
+1. Normalize normal vectors from OBJ.
+    * [Pull request #269](https://github.com/gazebosim/gz-common/pull/269)
+
+1. Fixed macos symbol in `common::profiler`
+    * [Pull request #262](https://github.com/gazebosim/gz-common/pull/262)
+
+1. Fix skip logic for integration tests
+    * [Pull request #264](https://github.com/gazebosim/gz-common/pull/264)
 
 ## Gazebo Common 3.14.0 (2021-10-12)
 
@@ -366,7 +390,7 @@
 
 1. Windows
     * Do not hardcode USE_EXTERNAL_TINYXML2 to OFF: [Pull Request 116](https://github.com/gazebosim/gz-common/pull/116)
-    * Fix IGN_HOMEDIR on Windows: [Pull Request 127](https://github.com/gazebosim/gz-common/pull/127)
+    * Fix GZ_HOMEDIR on Windows: [Pull Request 127](https://github.com/gazebosim/gz-common/pull/127)
     * Improve Windows support: [Pull Request 128](https://github.com/gazebosim/gz-common/pull/128)
     * Fix Windows AV CI warnings and test failures: [Pull Request 135](https://github.com/gazebosim/gz-common/pull/135)
 
@@ -512,7 +536,7 @@
 
 ## Gazebo Common 3.2.0 (2019-08-07)
 
-1. Allow gzLogInit to use an absolute path. Added a timeToIso that converts a given time to an ISO string. Some console timestamps were using `IGN_SYSTEM_TIME_NS()` and others `gz::common::systemTimeISO()`. Switched all to use `gz::common::systemTimeISO()`.
+1. Allow gzLogInit to use an absolute path. Added a timeToIso that converts a given time to an ISO string. Some console timestamps were using `GZ_SYSTEM_TIME_NS()` and others `gz::common::systemTimeISO()`. Switched all to use `gz::common::systemTimeISO()`.
     * [BitBucket pull request 203](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-common/pull-requests/203)
 
 1. Port ColladaLoader fix: use default value of 1 for stride parameter when unset.
@@ -535,7 +559,7 @@
 1. Filesystem functions to create unique paths
     * [BitBucket pull request 187](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-common/pull-requests/187)
 
-1. Battery additions for LinearBatteryPlugin port to ign-gazebo
+1. Battery additions for LinearBatteryPlugin port to gz-sim
     * [BitBucket pull request 186](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-common/pull-requests/186)
 
 1. Consolidate Console::log streams to reduce colored log size
@@ -548,7 +572,7 @@
 
 ## Gazebo Common 3.0.0 (2019-02-28)
 
-1. Use ign-cmake2 and support Ubuntu Bionic (18.04).
+1. Use gz-cmake2 and support Ubuntu Bionic (18.04).
     * [BitBucket pull request 131](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-common/pull-requests/131)
 
 1. WorkerPool: allow user to set minimum number of worker threads.
@@ -574,7 +598,7 @@
     * [BitBucket pull request 171](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-common/pull-requests/171)
     * [BitBucket pull request 172](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-common/pull-requests/172)
 
-1. SystemPaths: search paths in `IGN_FILE_PATH` environment variable when finding files
+1. SystemPaths: search paths in `GZ_FILE_PATH` environment variable when finding files
     * [BitBucket pull request 175](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-common/pull-requests/175)
 
 1. `Time::Sleep`: return amount of time actually slept

Migration.md

@@ -43,13 +43,22 @@ release will remove the deprecated code.
    10. `IGN_CREATE_SPEC_INTERFACE`
    11. `IGN_DUMMY_PLUGIN_PATH`
    12. `IGNITION_UNITTEST_SPECIALIZED_PLUGIN_ACCESS`
+8. The `Image::Data(unsigned char**, unsigned int&)` functions that accept a pointer and a size and internally allocate memory are deprecated and will be removed in future versions.
+   Use the new `Data` functions that return a `std::vector<unsigned char>` to have automatic memory management.
 
+### Breaking Changes
 
+1. The project name has been changed to use the `gz-` prefix, you **must** use the `gz` prefix!
+  * This also means that any generated code that use the project name (e.g. CMake variables, in-source macros) would have to be migrated.
+  * Some non-exhaustive examples of this include:
+    * `GZ_<PROJECT>_<VISIBLE/HIDDEN>`
+    * CMake `-config` files
+    * Paths that depend on the project name
 
 ### Additions
 
 1. **geospatial** component that loads heightmap images and DEMs
-    + Depends on the ign-common's `graphics` component and the `gdal` library
+    + Depends on the gz-common's `graphics` component and the `gdal` library
 
 ### Modifications
 
@@ -68,7 +77,7 @@ release will remove the deprecated code.
 ### Modifications
 
 1. Corrected `BAYER_RGGR8` to `BAYER_BGGR8` in `PixelFormatName` and
-   `PixelFormatType` located in `graphics/include/ignition/common/Image.hh`.
+   `PixelFormatType` located in `graphics/include/gz/common/Image.hh`.
 
 1. URI parsing has updated to follow the specification more closely when
    `URI::Authority` is set. Changes include:
@@ -99,8 +108,8 @@ release will remove the deprecated code.
 
 ### Modifications
 
-1. Depends on **ignition-cmake2**
-    + Ignition-common now depends on ignition-cmake2.
+1. Depends on **gz-cmake2**
+    + gz-common now depends on gz-cmake2.
 
 1. Requires c++17.
 
@@ -110,12 +119,12 @@ release will remove the deprecated code.
 
 ### Modifications
 
-1. Depends on **ignition-cmake1**
-    + Ignition-common now depends on ignition-cmake1, which provides
+1. Depends on **gz-cmake1**
+    + gz-common now depends on gz-cmake1, which provides
       support for Component libraries.
 
 1. Component libraries
-    + Some classes have been moved from the main ignition-common library
+    + Some classes have been moved from the main gz-common library
       to component libraries. To use these features, you must
       list them in the `find_package` call and link against them.
       - av: audio and video playback and encoding
@@ -126,6 +135,6 @@ release will remove the deprecated code.
 
 ### Added dependencies
 
-1. **ignition-cmake**
-    + Ignition-math now has a build dependency on ignition-cmake, which
-      allows cmake scripts to be shared across all the ignition packages.
+1. **gz-cmake**
+    + gz-math now has a build dependency on gz-cmake, which
+      allows cmake scripts to be shared across all the Gazebo packages.