Skip to content
This repository was archived by the owner on Feb 3, 2025. It is now read-only.

Cherry-pick from 9 to 11 #2926

Merged
merged 4 commits into from
Jan 28, 2021
Merged

Cherry-pick from 9 to 11 #2926

merged 4 commits into from
Jan 28, 2021

Conversation

scpeters
Copy link
Member

This cherry-picks some recent pull requests (#2914, #2917, #2918) from gazebo9 to gazebo11. Use rebase and merge.

iche033 and others added 4 commits January 25, 2021 16:46
Updated gazebo to generate shadow maps for spot lights.
This does not mean the spot lights will now start casting
shadows in gazebo - we still need to update the
RTShaderSystem code to actually render them.
This does however mean that the shadow maps are now
available and we can access them through custom
material shaders.

The spotlight_shadow_demo.world contains a shadow
receiver ground plane with custom material shaders to show
how to access the shadow texture generated by OGRE.

Signed-off-by: Ian Chen <ichen@osrfoundation.org>
* Add test for performance metrics deadlock

Load the pr2 world with --lockstep and then subscribe to
/gazebo/performance_metrics to reproduce the deadlock.

* Fix deadlock when publishing performance metrics

Currently the PublishPerformanceMetrics function is called within
SensorManager.cc by each SensorContainer with protection by the
mutex of each SensorContainer. This leads to a deadlock when a
world has sensors in more than one container (i.e. more than one
category of sensors) as described in gazebosim#2902.

Since the PublishPerformanceMetrics function is not a member
function of SensorContainer and uses only global variables,
the function can be called by the SensorManager thread instead
of by each SensorContainer thread. This change will avoid the
deadlock.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
gazebosim#2918)

* add support for camera with floating point image format
* visualize 16 bit float images

Signed-off-by: Ian Chen <ichen@osrfoundation.org>
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Co-authored-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@scpeters
Copy link
Member Author

@osrf-jenkins run tests please

@iche033
Copy link
Contributor

iche033 commented Jan 26, 2021

changes look fine. The ABI build gave an error ERROR: some errors occurred when compiling headers, not sure why. I don't see anything in this PR that would break ABI though

@scpeters
Copy link
Member Author

changes look fine. The ABI build gave an error ERROR: some errors occurred when compiling headers, not sure why. I don't see anything in this PR that would break ABI though

that's the 2nd time; I thought the first time was a flaky error; I'll take a closer look

@scpeters
Copy link
Member Author

changes look fine. The ABI build gave an error ERROR: some errors occurred when compiling headers, not sure why. I don't see anything in this PR that would break ABI though

that's the 2nd time; I thought the first time was a flaky error; I'll take a closer look

ERROR: problem with 'find' utility (-1): Cannot allocate memory
ERROR: library objects are not found

@scpeters
Copy link
Member Author

it may be a problem with drogon

@scpeters
Copy link
Member Author

@osrf-jenkins run tests please

@scpeters
Copy link
Member Author

there were some CI failures due to problems with build machines, but the homebrew job looks fine to me; I'll go ahead and merge without an approval since this code has previously been approved on gazebo9

@scpeters scpeters merged commit 8f1cbd6 into gazebosim:gazebo11 Jan 28, 2021
@scpeters scpeters deleted the pick_9_to_11 branch January 28, 2021 09:16
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants