Skip to content

Add support for wide angle camera in sensors system #1215

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

Merged
merged 25 commits into from
Mar 14, 2022
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
403dffd
bump version
iche033 Nov 2, 2021
063d6fb
wide angle camera working in sensors system, add example world
iche033 Nov 3, 2021
80cffc5
revert sdformat bump
iche033 Nov 10, 2021
043f5ef
Bumps in garden : ign-gazebo7
scpeters Nov 10, 2021
0a60c20
Merge remote-tracking branch 'origin/bump_garden_ign-gazebo7' into wi…
iche033 Nov 18, 2021
398df0a
update wide angle camera example world
iche033 Nov 18, 2021
ccabe35
use wide_angle_camera
iche033 Nov 19, 2021
18f200e
merge from main
iche033 Dec 2, 2021
85cc57b
Merge branch 'main' into wide_angle_camera
iche033 Dec 7, 2021
74093f6
Merge branch 'main' into wide_angle_camera
iche033 Dec 9, 2021
4ea89c1
Merge branch 'main' into wide_angle_camera
scpeters Dec 14, 2021
c0657e5
revert a couple of 6->7 changes
iche033 Dec 15, 2021
f8a562e
Merge branch 'main' into wide_angle_camera
scpeters Jan 4, 2022
7153461
Added integration test for wide angle camera
WilliamLewww Jan 12, 2022
5612cb6
Merge branch 'main' into wide_angle_camera
scpeters Jan 12, 2022
303a6e8
Merge branch 'main' into wide_angle_camera
scpeters Jan 19, 2022
d6a39d0
Fixed wide angle camera SDF world for integration test
WilliamLewww Jan 24, 2022
cc1fa5a
Merge branch 'wide_angle_camera' of github.com:ignitionrobotics/ign-g…
WilliamLewww Jan 24, 2022
6e24146
Merge branch 'main' into wide_angle_camera
scpeters Jan 24, 2022
ea11eb9
Fixed unsupported image format
WilliamLewww Jan 24, 2022
c694237
Updated buffer size for wide angle camera image
WilliamLewww Jan 25, 2022
43c121c
Merge branch 'main' into wide_angle_camera
WilliamLewww Jan 25, 2022
2292c0f
Merge branch 'main' into wide_angle_camera
chapulina Mar 1, 2022
1400e04
Merge branch 'main' into wide_angle_camera
WilliamLewww Mar 2, 2022
5f4587b
Merge branch 'main' into wide_angle_camera
chapulina Mar 12, 2022
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
6 changes: 3 additions & 3 deletions .github/ci/packages.apt
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ libfreeimage-dev
libglew-dev
libignition-cmake2-dev
libignition-common4-dev
libignition-gui6-dev
libignition-gui7-dev
libignition-fuel-tools7-dev
libignition-math6-eigen3-dev
libignition-msgs8-dev
libignition-physics5-dev
libignition-plugin-dev
libignition-rendering6-dev
libignition-sensors6-dev
libignition-rendering7-dev
libignition-sensors7-dev
libignition-tools-dev
libignition-transport11-dev
libignition-utils1-cli-dev
Expand Down
13 changes: 7 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ set(IGN_FUEL_TOOLS_VER ${ignition-fuel_tools7_VERSION_MAJOR})

#--------------------------------------
# Find ignition-gui
ign_find_package(ignition-gui6 REQUIRED)
set(IGN_GUI_VER ${ignition-gui6_VERSION_MAJOR})
ign_find_package(ignition-gui7 REQUIRED)
set(IGN_GUI_VER ${ignition-gui7_VERSION_MAJOR})
ign_find_package (Qt5
COMPONENTS
Core
Expand All @@ -107,7 +107,7 @@ set(IGN_PHYSICS_VER ${ignition-physics5_VERSION_MAJOR})

#--------------------------------------
# Find ignition-sensors
ign_find_package(ignition-sensors6 REQUIRED
ign_find_package(ignition-sensors7 REQUIRED
# component order is important
COMPONENTS
# non-rendering
Expand All @@ -129,13 +129,14 @@ ign_find_package(ignition-sensors6 REQUIRED
depth_camera
rgbd_camera
thermal_camera
wide_angle_camera
)
set(IGN_SENSORS_VER ${ignition-sensors6_VERSION_MAJOR})
set(IGN_SENSORS_VER ${ignition-sensors7_VERSION_MAJOR})

#--------------------------------------
# Find ignition-rendering
ign_find_package(ignition-rendering6 REQUIRED)
set(IGN_RENDERING_VER ${ignition-rendering6_VERSION_MAJOR})
ign_find_package(ignition-rendering7 REQUIRED)
set(IGN_RENDERING_VER ${ignition-rendering7_VERSION_MAJOR})

#--------------------------------------
# Find ignition-math
Expand Down
6 changes: 3 additions & 3 deletions docker/Dockerfile.nightly
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ RUN apt-get update \
libignition-math6-eigen3-dev \
libignition-plugin-dev \
libignition-physics5-dev \
libignition-rendering6-dev \
libignition-rendering7-dev \
libignition-tools-dev \
libignition-transport11-dev \
libignition-gui6-dev \
libignition-gui7-dev \
libignition-msgs8-dev \
libignition-sensors6-dev \
libignition-sensors7-dev \
libsdformat12-dev

COPY . ign-gazebo
Expand Down
4 changes: 2 additions & 2 deletions examples/plugin/custom_sensor_system/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ set(IGN_PLUGIN_VER ${ignition-plugin1_VERSION_MAJOR})
ign_find_package(ignition-gazebo7 REQUIRED)
set(IGN_GAZEBO_VER ${ignition-gazebo7_VERSION_MAJOR})

find_package(ignition-sensors6 REQUIRED)
set(IGN_SENSORS_VER ${ignition-sensors6_VERSION_MAJOR})
find_package(ignition-sensors7 REQUIRED)
set(IGN_SENSORS_VER ${ignition-sensors7_VERSION_MAJOR})

# Fetch the custom sensor example from ign-sensors
# Users won't commonly use this to fetch their sensors. The sensor may be part
Expand Down
10 changes: 5 additions & 5 deletions examples/plugin/rendering_plugins/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ endif()
project(RenderingPlugins)

# Common to both plugins
find_package(ignition-rendering6 REQUIRED)
find_package(ignition-rendering7 REQUIRED)

# GUI plugin
set(GUI_PLUGIN RenderingGuiPlugin)

set(CMAKE_AUTOMOC ON)

find_package(ignition-gui6 REQUIRED)
find_package(ignition-gui7 REQUIRED)

QT5_ADD_RESOURCES(resources_RCC ${GUI_PLUGIN}.qrc)

Expand All @@ -24,8 +24,8 @@ add_library(${GUI_PLUGIN} SHARED
)
target_link_libraries(${GUI_PLUGIN}
PRIVATE
ignition-gui6::ignition-gui6
ignition-rendering6::ignition-rendering6
ignition-gui7::ignition-gui7
ignition-rendering7::ignition-rendering7
)

# Server plugin
Expand All @@ -40,5 +40,5 @@ target_link_libraries(${SERVER_PLUGIN}
PRIVATE
ignition-plugin1::ignition-plugin1
ignition-gazebo7::ignition-gazebo7
ignition-rendering6::ignition-rendering6
ignition-rendering7::ignition-rendering7
)
2 changes: 1 addition & 1 deletion examples/worlds/multi_lrauv_race.sdf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" ?>

<!-- Run demo with ign-gazebo examples/standalone/multi_lrauv_race
(example is provided in ign-gazebo6+). -->
(example is provided in ign-gazebo7+). -->

<sdf version="1.6">
<world name="multi_lrauv">
Expand Down
1 change: 0 additions & 1 deletion examples/worlds/sensors_demo.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,6 @@
</link>
</model>


<include>
<pose>0 1 3 0.0 0.0 1.57</pose>
<uri>
Expand Down
Loading