Merge pull request #537 from gazebosim/merge_5_main_20230926

Merge: 5 -> main

.github/workflows/macos.yml

@@ -14,6 +14,15 @@ jobs:
       uses: Homebrew/actions/setup-homebrew@master
     - run: brew config
 
+    # Workaround for https://github.com/actions/setup-python/issues/577
+    - name: Clean up python binaries
+      run: |
+        rm -f /usr/local/bin/2to3*;
+        rm -f /usr/local/bin/idle3*;
+        rm -f /usr/local/bin/pydoc3*;
+        rm -f /usr/local/bin/python3*;
+        rm -f /usr/local/bin/python3*-config;
+
     - name: Install base dependencies
       run: |
         brew tap osrf/simulation;
@@ -39,12 +48,14 @@ jobs:
       run: cmake .. -DCMAKE_INSTALL_PREFIX=/usr/local/Cellar/${PACKAGE}/HEAD
     - run: make
       working-directory: build
-    - run: make test
-      working-directory: build
-      env:
-        CTEST_OUTPUT_ON_FAILURE: 1
+    # Run make install before make test so that the package will be available to
+    # build examples as part of the test
     - name: make install
       working-directory: build
       run: |
         make install;
         brew link ${PACKAGE};
+    - run: make test
+      working-directory: build
+      env:
+        CTEST_OUTPUT_ON_FAILURE: 1

.github/workflows/triage.yml

@@ -10,10 +10,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Add ticket to inbox
-        uses: technote-space/create-project-card-action@v1
+        uses: actions/[email protected]
         with:
-          PROJECT: Core development
-          COLUMN: Inbox
-          GITHUB_TOKEN: ${{ secrets.TRIAGE_TOKEN }}
-          CHECK_ORG_PROJECT: true
+          project-url: https://github.com/orgs/gazebosim/projects/7
+          github-token: ${{ secrets.TRIAGE_TOKEN }}
 

CMakeLists.txt

@@ -139,7 +139,6 @@ gz_configure_build(QUIT_IF_BUILD_ERRORS
 #============================================================================
 gz_create_packages()
 
-
 #============================================================================
 # Create documentation
 #============================================================================
@@ -152,3 +151,13 @@ gz_create_docs(
   TAGFILES
     "${GZ-MATH_DOXYGEN_TAGFILE} = ${GZ-MATH_API_URL}"
   )
+
+#============================================================================
+# Build examples
+#============================================================================
+if (BUILD_TESTING)
+  gz_build_examples(
+    SOURCE_DIR ${PROJECT_SOURCE_DIR}/examples
+    BINARY_DIR ${PROJECT_BINARY_DIR}/examples
+  )
+endif()

Changelog.md

@@ -4,6 +4,54 @@
 
 ## Gazebo Common 5.x
 
+## Gazebo Common 5.4.2 (2023-09-26)
+
+1. Documentation fixes
+    * [Pull request #534](https://github.com/gazebosim/gz-common/pull/534)
+    * [Pull request #535](https://github.com/gazebosim/gz-common/pull/535)
+
+1. Fix glTF metalness and roughness map orientation
+    * [Pull request #532](https://github.com/gazebosim/gz-common/pull/532)
+
+1. Build examples from CMake rather than executable
+    * [Pull request #502](https://github.com/gazebosim/gz-common/pull/502)
+
+
+## Gazebo Common 5.4.1 (2023-08-21)
+
+1. Use `pull_request_target`  for triage workflow
+    * [Pull request #527](https://github.com/gazebosim/gz-common/pull/527)
+
+1. Fix Github project automation for new project board
+    * [Pull request #526](https://github.com/gazebosim/gz-common/pull/526)
+
+1. Fix Github Actions on macOS
+    * [Pull request #524](https://github.com/gazebosim/gz-common/pull/524)
+
+1. Only build integration tests if libraries exist
+    * [Pull request #523](https://github.com/gazebosim/gz-common/pull/523)
+
+1. Fix compiling under linux
+    * [Pull request #521](https://github.com/gazebosim/gz-common/pull/521)
+
+1. Add missing <fstream> header includes
+    * [Pull request #518](https://github.com/gazebosim/gz-common/pull/518)
+
+1. Header was dropped in the forward port and breaks downstream
+    * [Pull request #515](https://github.com/gazebosim/gz-common/pull/515)
+
+1. Port: 4 to 5
+    * [Pull request #511](https://github.com/gazebosim/gz-common/pull/511)
+
+1. Lint
+    * [Pull request #Lint](https://github.com/gazebosim/gz-common/pull/Lint)
+
+1. 🎈 4.7.0
+    * [Pull request #510](https://github.com/gazebosim/gz-common/pull/510)
+
+1. Fix build error when using gz:: with ign-common4
+    * [Pull request #489](https://github.com/gazebosim/gz-common/pull/489)
+
 ## Gazebo Common 5.4.0 (2023-04-28)
 
 1. Add support for bayer images to be saved in a directory

README.md

@@ -55,7 +55,7 @@ callback system.
 
 # Install
 
-See the [installation tutorial](https://gazebosim.org/api/common/4.0/install.html).
+See the [installation tutorial](https://gazebosim.org/api/common/6/install.html).
 
 # Usage
 
@@ -69,8 +69,10 @@ Refer to the following table for information about important directories and fil
 +-- av                       Header and source files for the AV component.
 +-- events                   Header and source files for the Event component.
 +-- examples                 Example programs.
++-- geospatial               Geospatial component for heightmap & DEMs
 +-- graphics                 Header and source files for the Graphics component.
 +-- include/gz/common        Header files for the core component.
++-- io                       IO component. Read object from stream.
 +-- profiler                 Header and source files for the Profiler component.
 +-- src                      Core source files and unit tests.
 +-- test

examples/CMakeLists.txt

@@ -1,4 +1,6 @@
-cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
+
+project(gz-common-examples)
 
 # Find the gz-common library
 find_package(gz-common6 QUIET REQUIRED COMPONENTS events profiler)

graphics/src/AssimpLoader.cc

@@ -507,13 +507,13 @@ std::pair<ImagePtr, ImagePtr>
   std::vector<unsigned char> metalnessData(width * height * bytesPerPixel);
   std::vector<unsigned char> roughnessData(width * height * bytesPerPixel);
 
-  for (unsigned int x = 0; x < width; ++x)
+  for (unsigned int y = 0; y < height; ++y)
   {
-    for (unsigned int y = 0; y < height; ++y)
+    for (unsigned int x = 0; x < width; ++x)
     {
       // RGBA so 4 bytes per pixel, alpha fully opaque
-      auto baseIndex = bytesPerPixel * (x * height + y);
-      auto color = _img.Pixel(x, y);
+      auto baseIndex = bytesPerPixel * (y * width + x);
+      auto color = _img.Pixel(x, (height - y - 1));
       metalnessData[baseIndex] = color.B() * 255.0;
       metalnessData[baseIndex + 1] = color.B() * 255.0;
       metalnessData[baseIndex + 2] = color.B() * 255.0;

test/integration/CMakeLists.txt

@@ -5,16 +5,22 @@ if (SKIP_av OR INTERNAL_SKIP_av)
   list(REMOVE_ITEM tests video_encoder.cc)
 endif()
 
+if (SKIP_graphics OR INTERNAL_SKIP_graphics)
+  list(REMOVE_ITEM tests mesh.cc)
+endif()
+
 gz_build_tests(
   TYPE INTEGRATION
   SOURCES ${tests}
   LIB_DEPS gz-common${GZ_COMMON_VER}-testing
 )
 
+# Graphics specific integration tests
 if(TARGET INTEGRATION_mesh)
   target_link_libraries(INTEGRATION_mesh ${PROJECT_LIBRARY_TARGET_NAME}-graphics)
 endif()
 
+# AV specific integration tests
 if(TARGET INTEGRATION_encoder_timing)
   target_link_libraries(INTEGRATION_encoder_timing ${PROJECT_LIBRARY_TARGET_NAME}-av)
 endif()

tutorials/profiler.md

@@ -125,8 +125,8 @@ colcon build --cmake-args -DENABLE_PROFILER=1
 ```
 
 Run your Gazebo library then go to your Gazebo installation path and open the profiler browser using:
-```
-libexec/gz/gz-common<N>/gz_remotery_vis
+```{.sh}
+<workspace>/install/libexec/gz/gz-common<N>/gz_remotery_vis
 ```
 
 If the profiler is run successfully, you should see output in a browser. Similar to this