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

Fork update #1

Merged
merged 85 commits into from
Jan 11, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
0aca10d
Initial commit
mcres Jun 4, 2020
222d65b
Added plugin files
mcres Jun 4, 2020
7be1771
Initial .sdf file
mcres Jun 8, 2020
c3d91fb
Pipeline for getting sensor contacts
mcres Jun 8, 2020
16a268e
Added visualization of postion and forces
mcres Jun 9, 2020
5cd5d5f
Added plugin for Transform Control
mcres Jun 9, 2020
cd58ae6
Added initial interpolation
mcres Jun 10, 2020
40a87ef
Code check
mcres Jun 11, 2020
5b85a48
Update info after specified milliseconds
mcres Jun 12, 2020
93918eb
Set marker lifetime for better performance
mcres Jun 15, 2020
d480c54
Added Depth Camera
mcres Jun 17, 2020
3774efc
Added callback and unpacking to Depth Camera messages
mcres Jun 17, 2020
2bab9c8
Compute and visualize normal forces
mcres Jun 25, 2020
6c32ba0
Merge master
mcres Jun 26, 2020
badd572
PR Feedback 1
mcres Jul 9, 2020
70774f4
Update sdf example to a more realistic environment
mcres Jul 9, 2020
1652081
Allow moving Depth Camera from model origin
mcres Jul 9, 2020
4bccc6c
Make markers dimensions available as parameters
mcres Jul 9, 2020
16732f6
Visualize sensor as a marker instead of <visual> and filter out norma…
mcres Jul 13, 2020
2a45a84
PR Feedback 2
mcres Jul 31, 2020
6050673
Merge 'master'
mcres Aug 7, 2020
e216bb2
PR Feedback 3
mcres Aug 13, 2020
b321a00
Minor fixes for sdf, sensor marker and profiler
mcres Aug 20, 2020
886f904
PR Feedback 4
mcres Aug 25, 2020
5331ec5
Merge branch 'master' into mcres/optical_tactile_plugin
mcres Aug 26, 2020
bfce5ee
Merge branch 'master' into optical_tactile_plugin
chapulina Sep 1, 2020
7dd644e
Merge branch 'master' into optical_tactile_plugin
chapulina Sep 14, 2020
ee80a3d
Merge branch 'master' into optical_tactile_plugin
chapulina Sep 23, 2020
b17e904
Merge branch 'ign-gazebo4' into optical_tactile_plugin
chapulina Oct 14, 2020
16807b6
fix mac warning
mabelzhang Nov 5, 2020
632d774
Helper function to set component data (#436)
chapulina Nov 17, 2020
f02c5e4
Remove unneeded if statement (#432)
Nov 18, 2020
08b6c42
Fixes flaky RecordAndPlayback test in INTEGRATION_log_system (#463)
azeey Nov 20, 2020
2f76de8
Make PeerTracker test more robust (#452)
chapulina Nov 23, 2020
4a47c92
Merge pull request #2 from ignitionrobotics/mabelzhang/patch_optical_…
mcres Dec 1, 2020
703a916
Merge branch 'ign-gazebo4' into optical_tactile_plugin
mabelzhang Dec 1, 2020
6817a52
Clarify how sim time is interpreted in a System's step (#467)
adlarkin Nov 30, 2020
74c6dd4
3 ➡️ 4
chapulina Dec 2, 2020
2a25fc7
3 ➡️ 4: fixes for #463 (#469)
chapulina Dec 2, 2020
92c2cf7
Link link tutrial (#472)
chapulina Dec 4, 2020
8c4f7e1
3 ➡️ 4 (#469)
chapulina Dec 10, 2020
4341bb2
Switch to async state service request (#461)
iche033 Dec 10, 2020
b81fc34
Use a std::promise/std::future to avoid busy waiting the step ack mes…
ivanpauno Dec 10, 2020
db45e15
Fix tests that use Fuel paths with uppercase letters (#480)
azeey Dec 10, 2020
af74f4c
Merge branch 'ign-gazebo4' into optical_tactile_plugin
mabelzhang Dec 11, 2020
05e2ff6
Merge pull request #229 from mcres/optical_tactile_plugin
mabelzhang Dec 12, 2020
65b4b78
4.1.0 (#485)
adlarkin Dec 12, 2020
6d1582f
Update key event handling (#466)
Dec 15, 2020
2f7f33d
Fix slot in Plotting plugin (#490)
ahcorde Dec 15, 2020
3a09c86
Tape Measure Plugin (#456)
Dec 16, 2020
a220a90
Satisfy make codecheck (#491)
chapulina Dec 16, 2020
128e29d
Move deselect and preview termination to render thread (#493)
Dec 17, 2020
1672d2b
Fix codecheck (#499)
nkoenig Dec 18, 2020
1a9f5d0
Logical Audio Sensor Plugin (#401)
adlarkin Oct 9, 2020
4017554
Codecheck - initialize primitive in LogicalAudio component (#502)
adlarkin Dec 18, 2020
054d1e2
3 to 4
adlarkin Dec 18, 2020
096c5e8
3 to 4: fix codecheck for ign-gazebo4
adlarkin Dec 18, 2020
d963ec1
3 to 4: resolve codecheck warnings
adlarkin Dec 18, 2020
7643e7b
add frame_id and child_frame_id attribute support for DiffDrive (#361)
doisyg Dec 19, 2020
71990fb
Require ign-gui 4.1.0 (#505)
chapulina Dec 21, 2020
4fab757
3 to 4 (#505)
adlarkin Dec 21, 2020
efe8ea1
Fix shadow artifacts by disabling double sided rendering (#446)
iche033 Dec 21, 2020
478dea6
Add ability to record video based on sim time (#414)
iche033 Dec 21, 2020
d9195c4
2 ➡️ 3
chapulina Dec 23, 2020
bea0879
Add lockstep mode to video recording (#419)
iche033 Dec 23, 2020
ae2a1da
2 ➡️ 3 (#512)
chapulina Dec 23, 2020
a830b44
Kinetic energy monitor plugin (#492)
gonzodepedro Dec 28, 2020
43412b5
Disable right click menu when using measuring tool (#458)
Dec 29, 2020
6fafc96
Bump to 3.6.0 (#524)
chapulina Dec 31, 2020
88481d2
Don't make docs on macOS (#528)
scpeters Jan 4, 2021
1655d47
Updates to ardupilot migration tutorial (#525)
chapulina Jan 4, 2021
9c0a0ab
Update gtest to 1.10.0 for Windows compilation (ign-gazebo3) (#506)
j-rivero Jan 5, 2021
e893044
Merge branch 'ign-gazebo4' into ports/3_to_4
mjcarroll Jan 7, 2021
80e7934
Apply suggestions from code review
mjcarroll Jan 7, 2021
f05166e
change nullptr to a int ptr for qt 5.15.2 bug (#527)
acxz Jan 7, 2021
d18026e
Generate valid topics everywhere (support names with spaces) (#522)
chapulina Jan 7, 2021
a0aa10c
One more tutorial version bump
mjcarroll Jan 7, 2021
eec149d
Fix bad merge
mjcarroll Jan 7, 2021
7db62e6
change nullptr to a int ptr for qt 5.15.2 bug (#527)
acxz Jan 7, 2021
3ea769e
Generate valid topics everywhere (support names with spaces) (#522)
chapulina Jan 7, 2021
320f0c9
Change deprecated test case->suite
mjcarroll Jan 7, 2021
0d2278e
Merge branch 'ign-gazebo4' into ports/3_to_4
mjcarroll Jan 7, 2021
dfb97f4
3 ➡️ 4 (#533)
mjcarroll Jan 8, 2021
8ab2b7b
Merge branch 'ports/3_to_4' into ign-gazebo4
mjcarroll Jan 8, 2021
9255e18
Add support for topic statistics on breadcrumb deployments (#532)
nkoenig Jan 8, 2021
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
37 changes: 21 additions & 16 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5.1 FATAL_ERROR)
#============================================================================
# Initialize the project
#============================================================================
project(ignition-gazebo4 VERSION 4.0.0)
project(ignition-gazebo4 VERSION 4.1.0)

#============================================================================
# Find ignition-cmake
Expand Down Expand Up @@ -48,7 +48,7 @@ set(IGN_PLUGIN_VER ${ignition-plugin1_VERSION_MAJOR})

#--------------------------------------
# Find ignition-transport
ign_find_package(ignition-transport9 REQUIRED COMPONENTS log)
ign_find_package(ignition-transport9 REQUIRED COMPONENTS log VERSION 9.1)
set(IGN_TRANSPORT_VER ${ignition-transport9_VERSION_MAJOR})

#--------------------------------------
Expand All @@ -75,7 +75,7 @@ set(IGN_FUEL_TOOLS_VER ${ignition-fuel_tools5_VERSION_MAJOR})

#--------------------------------------
# Find ignition-gui
ign_find_package(ignition-gui4 REQUIRED)
ign_find_package(ignition-gui4 REQUIRED VERSION 4.1.1)
set(IGN_GUI_VER ${ignition-gui4_VERSION_MAJOR})
ign_find_package (Qt5
COMPONENTS
Expand Down Expand Up @@ -158,19 +158,24 @@ ign_create_packages()
configure_file(${CMAKE_SOURCE_DIR}/api.md.in ${CMAKE_BINARY_DIR}/api.md)
configure_file(${CMAKE_SOURCE_DIR}/tutorials.md.in ${CMAKE_BINARY_DIR}/tutorials.md)

ign_create_docs(
API_MAINPAGE_MD "${CMAKE_BINARY_DIR}/api.md"
TUTORIALS_MAINPAGE_MD "${CMAKE_BINARY_DIR}/tutorials.md"
ADDITIONAL_INPUT_DIRS "${CMAKE_SOURCE_DIR}/src/systems ${CMAKE_SOURCE_DIR}/src/gui/plugins"
TAGFILES
"${IGNITION-MATH_DOXYGEN_TAGFILE} = ${IGNITION-MATH_API_URL}"
"${IGNITION-MSGS_DOXYGEN_TAGFILE} = ${IGNITION-MSGS_API_URL}"
"${IGNITION-PHYSICS_DOXYGEN_TAGFILE} = ${IGNITION-PHYSICS_API_URL}"
"${IGNITION-PLUGIN_DOXYGEN_TAGFILE} = ${IGNITION-PLUGIN_API_URL}"
"${IGNITION-TRANSPORT_DOXYGEN_TAGFILE} = ${IGNITION-TRANSPORT_API_URL}"
"${IGNITION-SENSORS_DOXYGEN_TAGFILE} = ${IGNITION-SENSORS_API_URL}"
"${IGNITION-COMMON_DOXYGEN_TAGFILE} = ${IGNITION-COMMON_API_URL}"
)
# disable doxygen on macOS due to issues with doxygen 1.9.0
# there is an unreleased fix; revert this when 1.9.1 is released
# https://github.com/ignitionrobotics/ign-gazebo/issues/520
if (NOT APPLE)
ign_create_docs(
API_MAINPAGE_MD "${CMAKE_BINARY_DIR}/api.md"
TUTORIALS_MAINPAGE_MD "${CMAKE_BINARY_DIR}/tutorials.md"
ADDITIONAL_INPUT_DIRS "${CMAKE_SOURCE_DIR}/src/systems ${CMAKE_SOURCE_DIR}/src/gui/plugins"
TAGFILES
"${IGNITION-MATH_DOXYGEN_TAGFILE} = ${IGNITION-MATH_API_URL}"
"${IGNITION-MSGS_DOXYGEN_TAGFILE} = ${IGNITION-MSGS_API_URL}"
"${IGNITION-PHYSICS_DOXYGEN_TAGFILE} = ${IGNITION-PHYSICS_API_URL}"
"${IGNITION-PLUGIN_DOXYGEN_TAGFILE} = ${IGNITION-PLUGIN_API_URL}"
"${IGNITION-TRANSPORT_DOXYGEN_TAGFILE} = ${IGNITION-TRANSPORT_API_URL}"
"${IGNITION-SENSORS_DOXYGEN_TAGFILE} = ${IGNITION-SENSORS_API_URL}"
"${IGNITION-COMMON_DOXYGEN_TAGFILE} = ${IGNITION-COMMON_API_URL}"
)
endif()

if(TARGET doc)
file(COPY ${CMAKE_SOURCE_DIR}/tutorials/files/ DESTINATION ${CMAKE_BINARY_DIR}/doxygen/html/files/)
Expand Down
120 changes: 120 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,64 @@

### Ignition Gazebo 4.X.X (20XX-XX-XX)

### Ignition Gazebo 4.1.0 (2020-12-11)

1. Update Dockerfiles to use focal images
* [pull request 388](https://github.com/ignitionrobotics/ign-gazebo/pull/388)

1. Updated source build instructions for ign-gazebo4
* [pull request 404](https://github.com/ignitionrobotics/ign-gazebo/pull/404)

1. Add tests for the AnimationTime component
* [pull request 433](https://github.com/ignitionrobotics/ign-gazebo/pull/433)

1. Fix pose msg conversion when msg is missing orientation
* [pull request 450](https://github.com/ignitionrobotics/ign-gazebo/pull/450)
* [pull request 459](https://github.com/ignitionrobotics/ign-gazebo/pull/459)

1. Resolved updated codecheck issues
* [pull request 443](https://github.com/ignitionrobotics/ign-gazebo/pull/443)
* [pull request 457](https://github.com/ignitionrobotics/ign-gazebo/pull/457)
* [pull request 459](https://github.com/ignitionrobotics/ign-gazebo/pull/459)

1. Use new backpack version in tests
* [pull request 455](https://github.com/ignitionrobotics/ign-gazebo/pull/455)
* [pull request 457](https://github.com/ignitionrobotics/ign-gazebo/pull/457)
* [pull request 459](https://github.com/ignitionrobotics/ign-gazebo/pull/459)

1. Fix segfault in the Breadcrumb system when associated model is unloaded
* [pull request 454](https://github.com/ignitionrobotics/ign-gazebo/pull/454)
* [pull request 457](https://github.com/ignitionrobotics/ign-gazebo/pull/457)
* [pull request 459](https://github.com/ignitionrobotics/ign-gazebo/pull/459)

1. Added user commands to example thermal camera world
* [pull request 442](https://github.com/ignitionrobotics/ign-gazebo/pull/442)
* [pull request 459](https://github.com/ignitionrobotics/ign-gazebo/pull/459)

1. Helper function to set component data
* [pull request 436](https://github.com/ignitionrobotics/ign-gazebo/pull/436)
* [pull request 469](https://github.com/ignitionrobotics/ign-gazebo/pull/469)

1. Remove unneeded if statement
* [pull request 432](https://github.com/ignitionrobotics/ign-gazebo/pull/432)
* [pull request 469](https://github.com/ignitionrobotics/ign-gazebo/pull/469)

1. Fix flaky RecordAndPlayback test in INTEGRATION_log_system
* [pull request 463](https://github.com/ignitionrobotics/ign-gazebo/pull/463)
* [pull request 469](https://github.com/ignitionrobotics/ign-gazebo/pull/469)

1. Make PeerTracker test more robust
* [pull request 452](https://github.com/ignitionrobotics/ign-gazebo/pull/452)
* [pull request 469](https://github.com/ignitionrobotics/ign-gazebo/pull/469)

1. Use a [std::promise](https://en.cppreference.com/w/cpp/thread/promise)/[std::future](https://en.cppreference.com/w/cpp/thread/future) mechanism to avoid waiting in a looop until all `stepAck` messages are received
* [pull request 470](https://github.com/ignitionrobotics/ign-gazebo/pull/470)

1. Optical Tactile Sensor Plugin
* [pull request 229](https://github.com/ignitionrobotics/ign-gazebo/pull/229)

1. All changes up to and including those in version 3.5.0 and version 2.25.0

### Ignition Gazebo 4.0.0 (2020-09-30)

1. Names with spaces: add string serializer
Expand Down Expand Up @@ -99,6 +157,68 @@

### Ignition Gazebo 3.X.X (20XX-XX-XX)

### Ignition Gazebo 3.6.0 (2020-12-30)

1. Fix pose msg conversion when msg is missing orientation
* [Pull Request 450](https://github.com/ignitionrobotics/ign-gazebo/pull/450)

1. Address code checker warnings
* [Pull Request 443](https://github.com/ignitionrobotics/ign-gazebo/pull/443)
* [Pull Request 491](https://github.com/ignitionrobotics/ign-gazebo/pull/491)
* [Pull Request 499](https://github.com/ignitionrobotics/ign-gazebo/pull/499)
* [Pull Request 502](https://github.com/ignitionrobotics/ign-gazebo/pull/502)

1. Test fixes
* [Pull Request 455](https://github.com/ignitionrobotics/ign-gazebo/pull/455)
* [Pull Request 463](https://github.com/ignitionrobotics/ign-gazebo/pull/463)
* [Pull Request 452](https://github.com/ignitionrobotics/ign-gazebo/pull/452)
* [Pull Request 480](https://github.com/ignitionrobotics/ign-gazebo/pull/480)

1. Documentation updates
* [Pull Request 472](https://github.com/ignitionrobotics/ign-gazebo/pull/472)

1. Fix segfault in the Breadcrumb system when associated model is unloaded
* [Pull Request 454](https://github.com/ignitionrobotics/ign-gazebo/pull/454)

1. Added user commands to example thermal camera world
* [Pull Request 442](https://github.com/ignitionrobotics/ign-gazebo/pull/442)

1. Helper function to set component data
* [Pull Request 436](https://github.com/ignitionrobotics/ign-gazebo/pull/436)

1. Remove unneeded if statement in EntityComponentManager
* [Pull Request 432](https://github.com/ignitionrobotics/ign-gazebo/pull/432)

1. Clarify how time is represented in each phase of a System step
* [Pull Request 467](https://github.com/ignitionrobotics/ign-gazebo/pull/467)

1. Switch to async state service request
* [Pull Request 461](https://github.com/ignitionrobotics/ign-gazebo/pull/461)

1. Update key event handling
* [Pull Request 466](https://github.com/ignitionrobotics/ign-gazebo/pull/466)

1. Tape Measure Plugin
* [Pull Request 456](https://github.com/ignitionrobotics/ign-gazebo/pull/456)

1. Move deselect and preview termination to render thread
* [Pull Request 493](https://github.com/ignitionrobotics/ign-gazebo/pull/493)

1. Logical audio sensor plugin
* [Pull Request 401](https://github.com/ignitionrobotics/ign-gazebo/pull/401)

1. add frame_id and child_frame_id attribute support for DiffDrive
* [Pull Request 361](https://github.com/ignitionrobotics/ign-gazebo/pull/361)

1. Add ability to record video based on sim time
* [Pull Request 414](https://github.com/ignitionrobotics/ign-gazebo/pull/414)

1. Add lockstep mode to video recording
* [Pull Request 419](https://github.com/ignitionrobotics/ign-gazebo/pull/419)

1. Disable right click menu when using measuring tool
* [Pull Request 458](https://github.com/ignitionrobotics/ign-gazebo/pull/458)

### Ignition Gazebo 3.5.0 (2020-11-03)

1. Updated source build instructions
Expand Down
7 changes: 7 additions & 0 deletions Migration.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ Deprecated code produces compile-time warnings. These warning serve as
notification to users that their code should be upgraded. The next major
release will remove the deprecated code.

## Ignition Gazebo 4.0.0 to 4.X.X

* Ignition Gazebo 4.0.0 enabled double sided material by default but this
caused shadow artifacts to appear on some meshes. Double sided material is
now disabled and made an opt-in feature. Users can configure this property
in SDF by setting the `<visual><material><double_sided>` SDF element.

## Ignition Gazebo 3.x to 4.x

* The `RenderUtil::SetEnabledSensors` callback in gazebo rendering has a new
Expand Down
116 changes: 116 additions & 0 deletions examples/worlds/kinetic_energy_monitor.sdf
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
<?xml version="1.0" ?>
<!--
Ignition Gazebo kinetic energy monitory plugin demo

Monitor output using:

ign topic -et "/model/sphere/kinetic_energy"
-->
<sdf version="1.6">
<world name="kinetic_energy_monitor">

<physics name="1ms" type="ignored">
<max_step_size>0.001</max_step_size>
<real_time_factor>1.0</real_time_factor>
</physics>
<plugin
filename="ignition-gazebo-physics-system"
name="ignition::gazebo::systems::Physics">
</plugin>
<plugin
filename="ignition-gazebo-user-commands-system"
name="ignition::gazebo::systems::UserCommands">
</plugin>
<plugin
filename="ignition-gazebo-scene-broadcaster-system"
name="ignition::gazebo::systems::SceneBroadcaster">
</plugin>

<light type="directional" name="sun">
<cast_shadows>true</cast_shadows>
<pose>0 0 10 0 0 0</pose>
<diffuse>1 1 1 1</diffuse>
<specular>0.5 0.5 0.5 1</specular>
<attenuation>
<range>1000</range>
<constant>0.9</constant>
<linear>0.01</linear>
<quadratic>0.001</quadratic>
</attenuation>
<direction>-0.5 0.1 -0.9</direction>
</light>

<model name="ground_plane">
<static>true</static>
<link name="link">
<collision name="collision">
<geometry>
<plane>
<normal>0 0 1</normal>
</plane>
</geometry>
</collision>
<visual name="visual">
<geometry>
<plane>
<normal>0 0 1</normal>
<size>100 100</size>
</plane>
</geometry>
<material>
<ambient>0.8 0.8 0.8 1</ambient>
<diffuse>0.8 0.8 0.8 1</diffuse>
<specular>0.8 0.8 0.8 1</specular>
</material>
</visual>
</link>
</model>

<model name="sphere">
<pose>0 0 5 0 0 0</pose>
<link name="sphere_link">
<inertial>
<inertia>
<ixx>3</ixx>
<ixy>0</ixy>
<ixz>0</ixz>
<iyy>3</iyy>
<iyz>0</iyz>
<izz>3</izz>
</inertia>
<mass>3.0</mass>
</inertial>
<collision name="sphere_collision">
<geometry>
<sphere>
<radius>0.5</radius>
</sphere>
</geometry>
</collision>

<visual name="sphere_visual">
<geometry>
<sphere>
<radius>0.5</radius>
</sphere>
</geometry>
<material>
<ambient>0 0 1 1</ambient>
<diffuse>0 0 1 1</diffuse>
<specular>0 0 1 1</specular>
</material>
</visual>
</link>

<plugin
filename="ignition-gazebo-kinetic-energy-monitor-system"
name="ignition::gazebo::systems::KineticEnergyMonitor">
<link_name>sphere_link</link_name>
<kinetic_energy_threshold>100</kinetic_energy_threshold>
</plugin>

</model>

</world>
</sdf>

Loading