Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 6 -> main #647

Merged
merged 11 commits into from
Oct 8, 2024
Merged

Merge 6 -> main #647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3f819f7
Update Changelog, README and prepare for gz-common6.0.0~pre1 release …
iche033 Aug 28, 2024
8efac40
Experimenting with spdlog (#615)
mjcarroll Aug 28, 2024
ff19dee
Prepare for gz-common6.0.0~pre2 release (#629)
iche033 Aug 29, 2024
3f129c3
Fix AssimpLoader collada texture coordinates (#634)
iche033 Sep 5, 2024
bbb3183
Fix loading lightmaps from gltf / glb meshes (#630)
iche033 Sep 5, 2024
0a4a80f
Fix severity level of gzlog (#635)
azeey Sep 6, 2024
3e26b22
fix table of content (#639)
avanmalleghem Sep 11, 2024
427fa59
docs/hw-encoding: Add a note about the conda-distributed ffmpeg on wi…
peci1 Sep 16, 2024
e2bd46c
Prepare for 6.0.0 (#643)
azeey Sep 26, 2024
6b19c9e
Remove gts references from documentation (#645)
traversaro Sep 30, 2024
7c73f51
merge from gz-common6
iche033 Oct 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions Changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,25 @@
## Gazebo Common 6.x

## Gazebo Common 6.0.0 (2024-09-XX)
## Gazebo Common 6.0.0 (2024-09-25)

1. **Baseline:** this includes all changes from 5.6.0 and earlier.

1. Experimenting with spdlog
1. Add a note about the conda-distributed ffmpeg on windows
* [Pull request #640](https://github.com/gazebosim/gz-common/pull/640)

1. Fix table of content
* [Pull request #639](https://github.com/gazebosim/gz-common/pull/639)

1. Fix severity level of gzlog
* [Pull request #635](https://github.com/gazebosim/gz-common/pull/635)

1. Fix loading lightmaps from gltf / glb meshes
* [Pull request #630](https://github.com/gazebosim/gz-common/pull/630)

1. Fix AssimpLoader collada texture coordinates
* [Pull request #634](https://github.com/gazebosim/gz-common/pull/634)

1. Implement console logging using `spdlog`
* [Pull request #615](https://github.com/gazebosim/gz-common/pull/615)

1. Update Changelog, README and prepare for gz-common6.0.0~pre1 release
Expand Down
14 changes: 7 additions & 7 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@

Build | Status
-- | --
Test coverage | [![codecov](https://codecov.io/gh/gazebosim/gz-common/tree/gz-common6/graph/badge.svg)](https://codecov.io/gh/gazebosim/gz-common/tree/gz-common6)
Ubuntu Noble | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_common-ci-gz-common6-noble-amd64)](https://build.osrfoundation.org/job/gz_common-ci-gz-common6-noble-amd64)
Homebrew | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_common-ci-gz-common6-homebrew-amd64)](https://build.osrfoundation.org/job/gz_common-ci-gz-common6-homebrew-amd64)
Windows | [![Build Status](https://build.osrfoundation.org/job/gz_common-6-win/badge/icon)](https://build.osrfoundation.org/job/gz_common-6-win/)
Test coverage | [![codecov](https://codecov.io/gh/gazebosim/gz-common/tree/main/graph/badge.svg)](https://codecov.io/gh/gazebosim/gz-common/tree/main)
Ubuntu Noble | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_common-ci-main-noble-amd64)](https://build.osrfoundation.org/job/gz_common-ci-main-noble-amd64)
Homebrew | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_common-ci-main-homebrew-amd64)](https://build.osrfoundation.org/job/gz_common-ci-main-homebrew-amd64)
Windows | [![Build Status](https://build.osrfoundation.org/job/gz_common-main-win/badge/icon)](https://build.osrfoundation.org/job/gz_common-main-win/)

Gazebo Common, a component of [Gazebo](https://gazebosim.org), provides a set of libraries that
cover many different use cases. An audio-visual library supports
Expand All @@ -31,9 +31,9 @@ encoding/decoding to thread pools.

[Folder Structure](#folder-structure)

[Code of Conduct](#code-of-conduct)
[Contributing](#contributing)

[Contributing](#code-of-contributing)
[Code of Conduct](#code-of-conduct)

[Versioning](#versioning)

Expand All @@ -59,7 +59,7 @@ See the [installation tutorial](https://gazebosim.org/api/common/6/install.html)

# Usage

Please refer to the [examples directory](https://github.com/gazebosim/gz-common/tree/gz-common6/examples).
Please refer to the [examples directory](https://github.com/gazebosim/gz-common/tree/main/examples).

# Folder Structure

Expand Down
8 changes: 8 additions & 0 deletions tutorials/hw-encoding.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,14 @@ Just give them a try and dig deeper in the configuration if something is wrong.

# Caveats

## FFMpeg on Windows via Conda

The current distribution of FFMpeg via Conda for Windows does not include the h264_qsv
encoder. It only has h264_nvenc. This means that using Intel GPUs for HW acceleration is
not possible out of the box. A possible solution would be to build a custom build of
ffmpeg in the workspace with gz-common. Pull requests with the relevant tutorial are
welcome.

## NVEnc per-machine limit

If you have a multi-GPU station with desktop-class (not server-class) GPUs, you will
Expand Down
3 changes: 1 addition & 2 deletions tutorials/install.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ Gazebo Common requires:
The Graphics component requires:

* [FreeImage](http://freeimage.sourceforge.net/)
* [GTS](http://gts.sourceforge.net/).

The AV component requires:

Expand All @@ -98,7 +97,7 @@ conda activate gz-ws

Install prerequisites:
```
conda install freeimage gdal gts glib dlfcn-win32 ffmpeg --channel conda-forge
conda install freeimage gdal glib dlfcn-win32 ffmpeg --channel conda-forge
```

Install Gazebo dependencies:
Expand Down
Loading