Skip to content

Commit

Permalink
Merge pull request #300 from gazebosim/merge_7_8_20221207
Browse files Browse the repository at this point in the history
7 -> 8 2022-12-07
  • Loading branch information
iche033 authored Dec 8, 2022
2 parents bf3354f + b1c9053 commit 920751a
Show file tree
Hide file tree
Showing 61 changed files with 4,179 additions and 518 deletions.
4 changes: 4 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,10 @@ set(GZ_MSGS_VER ${gz-msgs9_VERSION_MAJOR})
gz_find_package(sdformat13 REQUIRED)
set(SDF_VER ${sdformat13_VERSION_MAJOR})

#--------------------------------------
# Find Eigen3
find_package(Eigen3 REQUIRED)

#============================================================================
# Configure the build
#============================================================================
Expand Down
96 changes: 94 additions & 2 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,84 @@

## Gazebo Sensors 7

### Gazebo Sensors 7.0.0 (202X-XX-XX)
### Gazebo Sensors 7.0.0

1. Clear scene before exiting wide_angle_camera_test
* [Pull request #266](https://github.com/gazebosim/ign-sensors/pull/266)

1. Fixed INTEGRATION triggered_camera test
* [Pull request #272](https://github.com/gazebosim/ign-sensors/pull/272)

1. Update README.md
* [Pull request #267](https://github.com/gazebosim/ign-sensors/pull/267)

1. Tutorial and documentation updates
* [Pull request #270](https://github.com/gazebosim/ign-sensors/pull/270)
* [Pull request #269](https://github.com/gazebosim/ign-sensors/pull/269)
* [Pull request #268](https://github.com/gazebosim/ign-sensors/pull/268)
* [Pull request #271](https://github.com/gazebosim/ign-sensors/pull/271)

1. Fix msgs.hh uses
* [Pull request #263](https://github.com/gazebosim/ign-sensors/pull/263)

1. Fix forward-port: use gz_add_component
* [Pull request #253](https://github.com/gazebosim/ign-sensors/pull/253)

1. Add missing msgs include statements
* [Pull request #242](https://github.com/gazebosim/ign-sensors/pull/242)

1. ign -> gz
* [Pull request #245](https://github.com/gazebosim/ign-sensors/pull/245)
* [Pull request #244](https://github.com/gazebosim/ign-sensors/pull/244)
* [Pull request #235](https://github.com/gazebosim/ign-sensors/pull/235)
* [Pull request #240](https://github.com/gazebosim/ign-sensors/pull/240)
* [Pull request #232](https://github.com/gazebosim/ign-sensors/pull/232)
* [Pull request #237](https://github.com/gazebosim/ign-sensors/pull/237)
* [Pull request #226](https://github.com/gazebosim/ign-sensors/pull/226)
* [Pull request #221](https://github.com/gazebosim/ign-sensors/pull/221)
* [Pull request #233](https://github.com/gazebosim/ign-sensors/pull/233)

1. Make sensors' HasConnections function virtual
* [Pull request #234](https://github.com/gazebosim/ign-sensors/pull/234)

1. Disable thermal camera test on MacOS
* [Pull request #243](https://github.com/gazebosim/ign-sensors/pull/243)

1. Update GoogleTest to latest version
* [Pull request #241](https://github.com/gazebosim/ign-sensors/pull/241)

1. [garden] Use anti-aliasing value from <anti_aliasing> SDF element
* [Pull request #210](https://github.com/gazebosim/ign-sensors/pull/210)

1. Use pose multiplication instead of subtraction
* [Pull request #231](https://github.com/gazebosim/ign-sensors/pull/231)

1. Add support for single channel 16 bit grayscale image format
* [Pull request #229](https://github.com/gazebosim/ign-sensors/pull/229)

1. Remove deprecated common/PluginMacros.hh include
* [Pull request #230](https://github.com/gazebosim/ign-sensors/pull/230)

1. Bumps in garden : ign-sensors7
* [Pull request #216](https://github.com/gazebosim/ign-sensors/pull/216)
* [Pull request #168](https://github.com/gazebosim/ign-sensors/pull/168)
* [Pull request #183](https://github.com/gazebosim/ign-sensors/pull/183)
* [Pull request #173](https://github.com/gazebosim/ign-sensors/pull/173)

1. Remove Bionic from future releases (Garden+)
* [Pull request #205](https://github.com/gazebosim/ign-sensors/pull/205)

1. Add API to set next sensor update time
* [Pull request #196](https://github.com/gazebosim/ign-sensors/pull/196)

1. Change to use SuppressWarning from ign-utils
* [Pull request #193](https://github.com/gazebosim/ign-sensors/pull/193)

1. Let derived sensors call Sensor::Update
* [Pull request #187](https://github.com/gazebosim/ign-sensors/pull/187)

1. Add wide angle camera sensor
* [Pull request #171](https://github.com/gazebosim/ign-sensors/pull/171)

## Gazebo Sensors 6

Expand Down Expand Up @@ -252,7 +329,22 @@

## Gazebo Sensors 3

### Gazebo Sensors 3.X.X (202X-XX-XX)
### Gazebo Sensors 3.4.0 (2022-08-16)

1. Remove redundant namespace references
* [Pull request #258](https://github.com/gazebosim/gz-sensors/pull/258)

1. Ignition -> Gazebo
* [Pull request #245](https://github.com/gazebosim/gz-sensors/pull/245)

1. Conform to ros format for header field `frame_id` of sensor msgs
* [Pull request #195](https://github.com/gazebosim/gz-sensors/pull/195)

1. Fix compiler warnings (`CMP0072` and copy elision)
* [Pull request #188](https://github.com/gazebosim/gz-sensors/pull/188)

1. Require ign-transport >= 8.2
* [Pull request #167](https://github.com/gazebosim/gz-sensors/pull/167)

### Gazebo Sensors 3.3.0 (2021-08-26)

Expand Down
10 changes: 1 addition & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,6 @@ designed to generate realistic data from simulation environments. Gazebo Sensors

[Install](#install)

* [Binary Install](#binary-install)

* [Source Install](#source-install)

* [Prerequisites](#prerequisites)

* [Building from Source](#building-from-source)

[Usage](#usage)

[Folder Structure](#folder-structure)
Expand Down Expand Up @@ -65,7 +57,7 @@ Refer to the following table for information about important directories and fil

```
├── examples Example programs.
├── include/gz/sensors Header files that will be installed.
├── include/gz/sensors Header files that will be installed.
├── src Source files and unit tests.
├── test
│   ├── integration Integration tests.
Expand Down
1 change: 1 addition & 0 deletions examples/custom_sensor/Odometer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include <gz/msgs/double.pb.h>

#include <gz/common/Console.hh>
#include <gz/msgs/Utility.hh>
#include <gz/sensors/Noise.hh>
#include <gz/sensors/Util.hh>

Expand Down
12 changes: 2 additions & 10 deletions include/gz/sensors/CameraSensor.hh
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,12 @@
#include <memory>
#include <string>

#include <gz/msgs/image.pb.h>

#include <sdf/sdf.hh>

#include <gz/utils/SuppressWarning.hh>

#ifdef _WIN32
#pragma warning(push)
#pragma warning(disable: 4005)
#pragma warning(disable: 4251)
#endif
#include <gz/msgs.hh>
#ifdef _WIN32
#pragma warning(pop)
#endif

// TODO(louise) Remove these pragmas once gz-rendering is disabling the
// warnings
#ifdef _WIN32
Expand Down
10 changes: 1 addition & 9 deletions include/gz/sensors/DepthCameraSensor.hh
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,7 @@
#include <gz/common/Event.hh>
#include <gz/utils/SuppressWarning.hh>

#ifdef _WIN32
#pragma warning(push)
#pragma warning(disable: 4005)
#pragma warning(disable: 4251)
#endif
#include <gz/msgs.hh>
#ifdef _WIN32
#pragma warning(pop)
#endif
#include <gz/msgs/image.pb.h>

// TODO(louise) Remove these pragmas once gz-rendering is disabling the
// warnings
Expand Down
Loading

0 comments on commit 920751a

Please sign in to comment.