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

Jump to bottom

gazebo10 -> gazebo11 forward port #2816

Merged
merged 86 commits into from
Aug 12, 2020
Merged

gazebo10 -> gazebo11 forward port #2816

merged 86 commits into from
Aug 12, 2020

Conversation

j-rivero
Copy link
Contributor

@j-rivero j-rivero commented Aug 6, 2020

No description provided.

ahcorde and others added 30 commits February 10, 2020 11:55
@ahcorde
including reflectance
8263c01
@ahcorde
removed some debug traces
0f2193e
@ahcorde
included ReflectancePlugin in CMakelists.txt
40de940
@ahcorde
Added reflectance TEST
5fc2f67
@ahcorde
fixed cppcheck reflections
3d9c73e
@ahcorde
Fixed depthCameraTEST
7e84b5a
@ahcorde
Gazebo reflectance added feedback
9eb8e00
@ahcorde
Fixed DepthCameraSensor_TEST, destroying objects in the right place
3a6ce67
@ahcorde
added reflectance to depth camera sensor in changelog.md
bc237d7
@ahcorde
added reflectance to depth camera sensor in changelog.md
7389984
NULL to nullptr and Style fixes
6b3448a
nullptrptr to nullptr
a7ec5c3
isnullptr to isNull
a9c9a74
@iche033
fix bbox for visual that has link offset
158c51e
@iche033
changelog
099a1ec
@ahcorde
Adding some feedback to reflectance map
41da996
@ahcorde
fixed cpp checks
028bf0e
@jslee02
Use target based compile options to specify C++ standard
c7e13c0
@ahcorde
adding map to avoid ABI break and minor fixes in DepthCameraSensor TEST
acc3b97
@ahcorde
merge with normals branch to resolve conflicts
3dd413d
modified changelog normals and reflectance to gazebo 9.XX.X
d4b66c6
@ahcorde
merge with gazebo9
8d655e4
@ahcorde
Adding more doc to reflectance plugin and minor fixes
6a735b9
@jslee02
Build gazebomsgs_out with C++11
7f1ffb9
@jslee02
Add comment why C++11 is not specified for MSVC
a74c7fd
@jslee02
Merged osrf/gazebo:gazebo9 into jlee02/gazebo:gazebo9
038a4ec
@jslee02
Build tests with C++11
79a4612
@jslee02
Use target_compile_features for CMake >= 3.8.2
4480cf7
@jslee02
Use target_compile_features for CMake >= 3.8.2 (for msgs)
8237eab
@jslee02
Fix copy and paste errors
0d0201b
ahcorde and others added 8 commits July 13, 2020 10:42
@ahcorde
Fixed else brackets introduced in #2768 (#2786)
28a4af5 
Signed-off-by: ahcorde <ahcorde@gmail.com>
@iche033
Fix sensor update rate throttling when new sensors are spawned (#2784)
fbf99a2 
* fix sensor manager max update rate after spawning new sensors

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* changelog

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* revert changes in Visual.cc

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* revert changes

Signed-off-by: Ian Chen <ichen@osrfoundation.org>
@j-rivero @scpeters
Fix pkg-config boost entries for Ubuntu Focal (gazebo9) (#2751)
01a89a5 
* update changelog
* bump to 9.13.2

Signed-off-by: Steve Peters <scpeters@openrobotics.org>

Co-authored-by: Steve Peters <scpeters@openrobotics.org>
@ahcorde
[Gazebo 9] Added test to check collisions equal to zero (#2788)
7dc6453 
* Added test to check collisions equal to zero

Signed-off-by: ahcorde <ahcorde@gmail.com>

* Included feedback

Signed-off-by: ahcorde <ahcorde@gmail.com>

* make linters happy

Signed-off-by: ahcorde <ahcorde@gmail.com>

* Update Visual_TEST.cc
@j-rivero
Merge branch 'gazebo9' of github.com:osrf/gazebo into gazebo9_gazebo1…
a56fede 
…0_forward
@j-rivero
Merge pull request #2796 from osrf/gazebo9_gazebo10_forward
a42f269 
Merge forward gazebo9 -> gazebo10
@j-rivero
gazebo10 -> gazebo11 forward port
cbbc04a
@j-rivero
Missing changes in merge
f2fa5a2
chapulina
chapulina reviewed Aug 7, 2020
View reviewed changes
plugins/CMakeLists.txt Outdated Show resolved Hide resolved
@chapulina chapulina added the 11 Gazebo 11 label Aug 7, 2020
@j-rivero
Copy link
Contributor Author

The ABI report message:

DepthCamera.hh
namespace gazebo::rendering
[+] DepthCamera::CreateNormalsTexture ( std::__cxx11::string const& _textureName )  

| Change | Effect
| -- | --
1st parameter _textureName has been renamed to _normalsName. | No effect.

Does not seem like a problem to me.

@ahcorde @j-rivero
@chapulina @scpeters
[Gazebo9] Fixed fails for OSX: Added using namespace boost::placehold…
7eda92b 
…ers (#2809)

Signed-off-by: Alejandro Hernández <ahcorde@gmail.com>

Co-authored-by: Jose Luis Rivero <jrivero@osrfoundation.org>
Co-authored-by: Louise Poubel <louise@openrobotics.org>
Co-authored-by: Steve Peters <scpeters@openrobotics.org>
@j-rivero
Copy link
Contributor Author

Forward port of #2809 to solve problems on compilation on Brew.

@iche033
Copy link
Contributor

iche033 commented Aug 11, 2020

looks good to me. Waiting for results from jenkins build

chapulina
chapulina reviewed Aug 11, 2020
View reviewed changes
Copy link
Contributor

@chapulina chapulina left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just noticed a couple of things

gazebo/rendering/Visual_TEST.cc Outdated Show resolved Hide resolved
test/integration/joint_spawn.cc Outdated Show resolved Hide resolved
@scpeters
Copy link
Member

The ABI report message:

DepthCamera.hh
namespace gazebo::rendering
[+] DepthCamera::CreateNormalsTexture ( std::__cxx11::string const& _textureName )  

| Change | Effect
| -- | --
1st parameter _textureName has been renamed to _normalsName. | No effect.

Does not seem like a problem to me.

the DepthCameraPlugin v-table has also changed, which is a more significant problem, though for a plugin

it also complained about this in the 9 -> 10 forward port: #2796 (comment)

@chapulina
Copy link
Contributor

the DepthCameraPlugin v-table has also changed, which is a more significant problem, though for a plugin

I suspect that was considered acceptable when merging this PR into Gazebo 9, although I didn't find any explicit discussion about it.

OnNewReflectanceFrame is pushing down OnNewNormalsFrame, but both functions have been recently added and haven't been released into Gazebo 11.0.0, see:

https://github.com/osrf/gazebo/blob/gazebo11_11.0.0/plugins/DepthCameraPlugin.hh

@chapulina
re-remove tests removed in e4b3095
71299f5 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@scpeters
Copy link
Member

the DepthCameraPlugin v-table has also changed, which is a more significant problem, though for a plugin

I suspect that was considered acceptable when merging this PR into Gazebo 9, although I didn't find any explicit discussion about it.

OnNewReflectanceFrame is pushing down OnNewNormalsFrame, but both functions have been recently added and haven't been released into Gazebo 11.0.0, see:

https://github.com/osrf/gazebo/blob/gazebo11_11.0.0/plugins/DepthCameraPlugin.hh

I think we'll just have to rebuild gazebo_plugins:

@chapulina
Copy link
Contributor

I think we'll just have to rebuild gazebo_plugins:

The ABI report says "Call of any virtual method at higher position in this class or its subclasses may result in crash or incorrect behavior of applications."

But no higher virtual methods have ever been released. So I don't think this should break anyone already compiling against Gazebo 11, right?

@iche033
Copy link
Contributor

iche033 commented Aug 11, 2020 •
edited
Loading

I don't think we've released a new gazebo 11 minor version with the OnNewNormalsFrame function right? So it's position relative to OnNewReflectanceFrame should be fine as long as the two are at the bottom of the vtable.

@scpeters
Copy link
Member

I don't think we've released a new gazebo 11 minor version with the OnNewNormalsFrame function right? So it's position relative to OnNewReflectanceFrame should be fine as long as the two are at the bottom of the vtable.

ok, thanks, I think that makes it ok.

@j-rivero
Copy link
Contributor Author

All the CI looks good to me. Ready to go.

@j-rivero j-rivero merged commit f59bc6f into gazebo11 Aug 12, 2020
@j-rivero j-rivero deleted the gazebo10_to_gazebo11 branch August 12, 2020 11:15
@scpeters scpeters mentioned this pull request Jan 24, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chapulina chapulina chapulina left review comments

Assignees
No one assigned
Labels
11 Gazebo 11
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@j-rivero @iche033 @scpeters @chapulina @ahcorde @jslee02 @blacksoul000 @Samahu @mabelzhang