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.

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

gazebo10 -> gazebo11 forward port #2816

Merged
merged 86 commits into from
Aug 12, 2020
Merged
Show file tree
Hide file tree
Changes from 81 commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
8263c01
including reflectance
ahcorde Feb 10, 2020
0f2193e
removed some debug traces
ahcorde Feb 10, 2020
40de940
included ReflectancePlugin in CMakelists.txt
ahcorde Feb 10, 2020
5fc2f67
Added reflectance TEST
ahcorde Feb 10, 2020
3d9c73e
fixed cppcheck reflections
ahcorde Feb 11, 2020
7e84b5a
Fixed depthCameraTEST
ahcorde Feb 11, 2020
9eb8e00
Gazebo reflectance added feedback
ahcorde Feb 13, 2020
3a6ce67
Fixed DepthCameraSensor_TEST, destroying objects in the right place
ahcorde Feb 17, 2020
bc237d7
added reflectance to depth camera sensor in changelog.md
ahcorde Feb 17, 2020
7389984
added reflectance to depth camera sensor in changelog.md
ahcorde Feb 17, 2020
6b3448a
NULL to nullptr and Style fixes
Feb 20, 2020
a7ec5c3
nullptrptr to nullptr
Feb 24, 2020
a9c9a74
isnullptr to isNull
Feb 24, 2020
158c51e
fix bbox for visual that has link offset
iche033 Feb 24, 2020
099a1ec
changelog
iche033 Feb 24, 2020
41da996
Adding some feedback to reflectance map
ahcorde Feb 28, 2020
028bf0e
fixed cpp checks
ahcorde Feb 28, 2020
c7e13c0
Use target based compile options to specify C++ standard
jslee02 Mar 1, 2020
acc3b97
adding map to avoid ABI break and minor fixes in DepthCameraSensor TEST
ahcorde Mar 2, 2020
3dd413d
merge with normals branch to resolve conflicts
ahcorde Mar 3, 2020
d4b66c6
modified changelog normals and reflectance to gazebo 9.XX.X
Mar 3, 2020
8d655e4
merge with gazebo9
ahcorde Mar 3, 2020
6a735b9
Adding more doc to reflectance plugin and minor fixes
ahcorde Mar 5, 2020
7f1ffb9
Build gazebomsgs_out with C++11
jslee02 Mar 9, 2020
a74c7fd
Add comment why C++11 is not specified for MSVC
jslee02 Mar 9, 2020
038a4ec
Merged osrf/gazebo:gazebo9 into jlee02/gazebo:gazebo9
jslee02 Mar 9, 2020
79a4612
Build tests with C++11
jslee02 Mar 9, 2020
4480cf7
Use target_compile_features for CMake >= 3.8.2
jslee02 Mar 9, 2020
8237eab
Use target_compile_features for CMake >= 3.8.2 (for msgs)
jslee02 Mar 9, 2020
0d0201b
Fix copy and paste errors
jslee02 Mar 9, 2020
2686dec
Fix another copy and paste errors
jslee02 Mar 9, 2020
fa6e248
Build gzqtpropertybrowser with C++11
jslee02 Mar 9, 2020
2545c0a
merge from gazebo9
iche033 Mar 10, 2020
f669072
Added absolute paths to reflectance map
ahcorde Mar 17, 2020
ba2e58c
Improved how to include images to the reflectance plugin
ahcorde Mar 18, 2020
dffe899
variables in reflectance plugin to camelCase
ahcorde Mar 18, 2020
97cbdef
Updating reflectance tags
ahcorde Mar 18, 2020
b141d33
fixed cppcheck and minor fix in Reflectancde plugin
Mar 18, 2020
be4d72e
merged from gazebo9
ahcorde Mar 25, 2020
655a96e
Merged in ahcorde/gazebo/ahcorde/gazebo9_reflections (pull request #3…
chapulina Mar 26, 2020
8a48d84
Fix automoc problem with cmake 3.17 in gui plugin examples
scpeters Mar 27, 2020
5e4938c
fix moc compilation error in some gui plugins, using fix from #2681
scpeters Mar 27, 2020
313e853
merge from gazebo9
iche033 Mar 27, 2020
558ebba
changelog
scpeters Mar 30, 2020
0c57ebd
Close branch examples_automoc_cmake_317
scpeters Mar 30, 2020
a07f429
Merged in examples_automoc_cmake_317 (pull request #3209)
scpeters Mar 30, 2020
9fd7ccc
Close branch visual_offset_bbox
iche033 Mar 31, 2020
abdb110
Merged in visual_offset_bbox (pull request #3196)
iche033 Mar 31, 2020
ce0865d
Add SetHeight method to HeightmapShape class
Mar 31, 2020
eef209e
Added GAZEBO_VISIBLE for WheelTrackedVehiclePlugin
blacksoul000 Apr 1, 2020
c8526e4
Merged in blacksoul000/gazebo/gazebo9 (pull request #3211)
iche033 Apr 1, 2020
9e9c701
Conform to coding style guidlines
Samahu Apr 1, 2020
b5000db
Merge
jslee02 Apr 2, 2020
9f56baf
Add back variable UNFILTERED_FLAGS
jslee02 Apr 3, 2020
c7ecafa
Merged in Samahu/gazebo/gazebo9 (pull request #3210)
chapulina Apr 3, 2020
f7963bf
Merged in jlee02/gazebo/gazebo9 (pull request #3199)
iche033 Apr 3, 2020
491ef2b
bump gazebo9 version to 9.13 and update changelog
iche033 Apr 3, 2020
ce14000
Close branch bump_9.13
iche033 Apr 3, 2020
222dc1f
Merged in bump_9.13 (pull request #3212)
iche033 Apr 3, 2020
b50156a
Added tag gazebo9_9.13.0 for changeset 05ed9a675a0e
iche033 Apr 3, 2020
0dac635
[gazebo9] Update BitBucket links (#2714)
chapulina May 6, 2020
8086276
Fix multiple reflectance maps and improve performance (#2742)
iche033 May 28, 2020
d9f480e
bump versioif it's lookingn to 9.13.1 (#2743)
iche033 May 28, 2020
821739a
Fixes or ARM: FindSSE, TrackedVehiclePlugin and PluginInterfaceTest (…
j-rivero Jun 10, 2020
2008106
Port pr #2748 to gazebo9 branch
j-rivero Jun 10, 2020
7318ed2
Merge pull request #2754 from osrf/tracked_plugin_fix_arm_gazebo9_static
j-rivero Jun 17, 2020
378310a
LensFlare: initialize OGRE compositors during plugin initialization (…
scpeters Jun 27, 2020
11034c9
Fixed crash when collision size is zero
ahcorde Jun 29, 2020
9c64d55
Added include math.h
ahcorde Jul 3, 2020
1b3e1ee
Using ignition::math::isnan
ahcorde Jul 3, 2020
303bf34
Improved error message
ahcorde Jul 3, 2020
a640b5f
removed include math.h
ahcorde Jul 7, 2020
899af42
Merge pull request #2768 from ahcorde/ahcorde/fix/crash_collision_zero_9
mabelzhang Jul 9, 2020
28a4af5
Fixed else brackets introduced in #2768 (#2786)
ahcorde Jul 13, 2020
fbf99a2
Fix sensor update rate throttling when new sensors are spawned (#2784)
iche033 Jul 13, 2020
01a89a5
Fix pkg-config boost entries for Ubuntu Focal (gazebo9) (#2751)
j-rivero Jul 15, 2020
7dc6453
[Gazebo 9] Added test to check collisions equal to zero (#2788)
ahcorde Jul 23, 2020
a56fede
Merge branch 'gazebo9' of github.com:osrf/gazebo into gazebo9_gazebo1…
j-rivero Jul 23, 2020
a42f269
Merge pull request #2796 from osrf/gazebo9_gazebo10_forward
j-rivero Aug 6, 2020
cbbc04a
gazebo10 -> gazebo11 forward port
j-rivero Aug 6, 2020
f2fa5a2
Missing changes in merge
j-rivero Aug 6, 2020
6292704
Revert parts of bad merge
j-rivero Aug 10, 2020
86cab1a
Remove Visual code imported by error in merge
j-rivero Aug 11, 2020
580b504
Unneded cmake code
j-rivero Aug 11, 2020
7eda92b
[Gazebo9] Fixed fails for OSX: Added using namespace boost::placehold…
ahcorde Aug 11, 2020
71299f5
re-remove tests removed in e4b30950df5ce8cbc8c5f617660d18065e4939ce
chapulina Aug 11, 2020
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
45 changes: 44 additions & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -352,11 +352,54 @@

## Gazebo 9

## Gazebo 9.XX.X (2020-XX-XX)
## Gazebo 9.xx.x (202x-xx-xx)

## Gazebo 9.13.2 (202x-xx-xx)

1. Fix sensor update rate throttling when new sensors are spawned
* [Pull request #2784](https://github.com/osrf/gazebo/pull/2784)

1. Fix crash when collision size is zero
* [Pull request #2768](https://github.com/osrf/gazebo/pull/2768)

1. LensFlare: initialize OGRE compositors during plugin initialization
* [Pull request #2764](https://github.com/osrf/gazebo/pull/2764)

1. Fix pkg-config boost entries for Ubuntu Focal
* [Pull request #2751](https://github.com/osrf/gazebo/pull/2751)

1. Fixes for ARM: FindSSE, TrackedVehiclePlugin and PluginInterfaceTest
* [Pull request #2754](https://github.com/osrf/gazebo/pull/2754)
* [Pull request #2748](https://github.com/osrf/gazebo/pull/2748)

## Gazebo 9.13.1 (2020-05-28)

1. Fix multiple reflectance maps and improve performance
* [Pull request #2742](https://github.com/osrf/gazebo/pull/2742)

## Gazebo 9.13.0 (2020-04-03)

1. Use target based compile options to specify C++ standard
* [BitBucket pull request 3199](https://osrf-migration.github.io/gazebo-gh-pages/#!/osrf/gazebo/pull-requests/3199)

1. Add SetHeight method to HeightmapShape class
* [BitBucket pull request 3210](https://osrf-migration.github.io/gazebo-gh-pages/#!/osrf/gazebo/pull-requests/3210)

1. Added GAZEBO\_VISIBLE for WheelTrackedVehiclePlugin
* [BitBucket pull request 3211](https://osrf-migration.github.io/gazebo-gh-pages/#!/osrf/gazebo/pull-requests/3211)

1. Fix bounding box calculation for visuals that have links with pose offset
* [BitBucket pull request 3196](https://osrf-migration.github.io/gazebo-gh-pages/#!/osrf/gazebo/pull-requests/3196)

1. Added reflectance to depth camera sensor
* [BitBucket pull request 3194](https://osrf-migration.github.io/gazebo-gh-pages/#!/osrf/gazebo/pull-requests/3194/)

1. Fix problem with automoc in CMake 3.17
* [BitBucket pull request 3206](https://osrf-migration.github.io/gazebo-gh-pages/#!/osrf/gazebo/pull-requests/3206/)

1. Fix macOS gui examples compilation
* [BitBucket pull request 3209](https://osrf-migration.github.io/gazebo-gh-pages/#!/osrf/gazebo/pull-requests/3209/)

1. Added normals to depth camera sensor
* [BitBucket pull request 3193](https://osrf-migration.github.io/gazebo-gh-pages/#!/osrf/gazebo/pull-requests/3193/)

Expand Down
2 changes: 1 addition & 1 deletion Migration.md
Original file line number Diff line number Diff line change
Expand Up @@ -1521,7 +1521,7 @@ New optional dependencies: `ign-fuel-tools`,`ign-common1`

1. **gz log**
Gazebo log files no longer store velocity data and have reduced floating point precision.
See [BitBucket pull request 2715](https://osrf-migration.github.io/gazebo-gh-pages/#!/osrf/gazebo/pull-requests/2715/)
See [BitBucket pull request 2715](https://osrf-migration.github.io/gazebo-gh-pages/#!/osrf/gazebo/pull-requests/2715/add-log-record-filter-options)
for further details.

## Gazebo 7.3.1 to 7.X
Expand Down
8 changes: 8 additions & 0 deletions cmake/GazeboTestUtils.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,14 @@ macro (gz_build_tests)
# gtest uses pthread on UNIX
target_link_libraries(${BINARY_NAME} pthread)
endif()
# Visual Studio enables c++11 support by default
if (NOT MSVC)
if(CMAKE_VERSION VERSION_LESS 3.8.2)
target_compile_options(${BINARY_NAME} PRIVATE -std=c++11)
else()
target_compile_features(${BINARY_NAME} PRIVATE cxx_std_11)
endif()
endif()

add_test(${BINARY_NAME} ${CMAKE_CURRENT_BINARY_DIR}/${BINARY_NAME}
--gtest_output=xml:${CMAKE_BINARY_DIR}/test_results/${BINARY_NAME}.xml)
Expand Down
16 changes: 16 additions & 0 deletions cmake/GazeboUtils.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,28 @@ macro (gz_add_library _name)
# Not defining STATIC or SHARED will use BUILD_SHARED_LIBS variable
add_library(${_name} ${ARGN})
target_link_libraries (${_name} ${general_libraries})
# Visual Studio enables c++11 support by default
if (NOT MSVC)
if(CMAKE_VERSION VERSION_LESS 3.8.2)
target_compile_options(${_name} PUBLIC -std=c++11)
else()
target_compile_features(${_name} PUBLIC cxx_std_11)
endif()
endif()
endmacro ()

#################################################
macro (gz_add_executable _name)
add_executable(${_name} ${ARGN})
target_link_libraries (${_name} ${general_libraries})
# Visual Studio enables c++11 support by default
if (NOT MSVC)
if(CMAKE_VERSION VERSION_LESS 3.8.2)
target_compile_options(${_name} PRIVATE -std=c++11)
else()
target_compile_features(${_name} PRIVATE cxx_std_11)
endif()
endif()
endmacro ()


Expand Down
5 changes: 5 additions & 0 deletions examples/plugins/gui_overlay_plugin_spawn/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)

if(POLICY CMP0100)
cmake_policy(SET CMP0100 NEW)
endif()

set (CMAKE_AUTOMOC ON)

find_package (Qt5Widgets REQUIRED)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@

#include <gazebo/common/Plugin.hh>
#include <gazebo/gui/GuiPlugin.hh>
// moc parsing error of tbb headers
#ifndef Q_MOC_RUN
#include <gazebo/transport/transport.hh>
#endif

namespace gazebo
{
Expand Down
5 changes: 5 additions & 0 deletions examples/plugins/gui_overlay_plugin_time/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)

if(POLICY CMP0100)
cmake_policy(SET CMP0100 NEW)
endif()

set (CMAKE_AUTOMOC ON)

find_package (Qt5Widgets REQUIRED)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@

#include <gazebo/common/Plugin.hh>
#include <gazebo/gui/GuiPlugin.hh>
// moc parsing error of tbb headers
#ifndef Q_MOC_RUN
#include <gazebo/transport/transport.hh>
#endif

namespace gazebo
{
Expand Down
4 changes: 4 additions & 0 deletions examples/plugins/mainwindow_example/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)

if(POLICY CMP0100)
cmake_policy(SET CMP0100 NEW)
endif()

find_package (Qt5Core REQUIRED)
find_package (Qt5Widgets REQUIRED)
set (CMAKE_AUTOMOC ON)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@

#include <gazebo/common/Plugin.hh>
#include <gazebo/gui/GuiPlugin.hh>
// moc parsing error of tbb headers
#ifndef Q_MOC_RUN
#include <gazebo/transport/transport.hh>
#endif

namespace gazebo
{
Expand Down
5 changes: 5 additions & 0 deletions examples/plugins/movable_text_demo/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)

if(POLICY CMP0100)
cmake_policy(SET CMP0100 NEW)
endif()

set (CMAKE_AUTOMOC ON)

find_package(Qt5Widgets REQUIRED)
Expand Down
3 changes: 1 addition & 2 deletions gazebo/gui/GuiIface.cc
Original file line number Diff line number Diff line change
Expand Up @@ -427,8 +427,7 @@ bool gui::run(int _argc, char **_argv)

// The following was added in
// https://osrf-migration.github.io/gazebo-gh-pages/#!/osrf/gazebo/pull-requests/2923,
// but it is causing
// shutdown issues when gazebo is used with ros.
// but it is causing shutdown issues when gazebo is used with ros.
// if (sigaction(SIGTERM, &sigact, NULL))
// {
// std::cerr << "sigaction(15) failed while setting up for SIGTERM"
Expand Down
8 changes: 8 additions & 0 deletions gazebo/gui/qtpropertybrowser/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,14 @@ QT5_ADD_RESOURCES(resources_RCC ${resources})

add_library(gzqtpropertybrowser STATIC ${sources} ${resources_RCC})
set_target_properties(gzqtpropertybrowser PROPERTIES POSITION_INDEPENDENT_CODE ON)
# Visual Studio enables c++11 support by default
if (NOT MSVC)
if(CMAKE_VERSION VERSION_LESS 3.8.2)
target_compile_options(gzqtpropertybrowser PUBLIC -std=c++11)
else()
target_compile_features(gzqtpropertybrowser PUBLIC cxx_std_11)
endif()
endif()
#set(CMAKE_PACKAGE_QTGUI TRUE)
#
#add_definitions( ${QT_DEFINITIONS} )
Expand Down
8 changes: 8 additions & 0 deletions gazebo/msgs/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,14 @@ target_link_libraries(gazebomsgs_out ${GZ_PROTOBUF_LIBRARY} ${GZ_PROTOBUF_PROTOC
if (UNIX)
target_link_libraries(gazebomsgs_out pthread)
endif()
# Visual Studio enables c++11 support by default
if (NOT MSVC)
if(CMAKE_VERSION VERSION_LESS 3.8.2)
target_compile_options(gazebomsgs_out PRIVATE -std=c++11)
else()
target_compile_features(gazebomsgs_out PRIVATE cxx_std_11)
endif()
endif()

set (sources msgs.cc MsgFactory.cc)
set (headers msgs.hh MsgFactory.hh)
Expand Down
5 changes: 5 additions & 0 deletions gazebo/physics/HeightmapShape.hh
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,11 @@ namespace gazebo
/// \return The height at a the specified location.
public: HeightType GetHeight(int _x, int _y) const;

/// \brief Sets a height value at a position.
/// \param[in] _x X position.
/// \param[in] _y Y position.
public: void SetHeight(int _x, int _y, float _value);

/// \brief Fill a geometry message with this shape's data. Raw height
/// data are not packed in this message to minimize packet size.
/// \param[in] _msg Message to fill.
Expand Down
Loading