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

Merge gz-sim7 ➡️ gz-sim8 #2293

Merged
merged 31 commits into from
Jan 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
4f8fcda
Bump Fuel model version in test (#2190)
azeey Oct 3, 2023
85cbf82
Merge ign-gazebo3 into ign-gazebo6
azeey Oct 3, 2023
8511623
fix INTEGRATION_save_world's SdfGeneratorFixture.ModelWithNestedInclu…
iche033 Sep 27, 2023
eaad78f
Merge pull request #2191 from azeey/3_to_6
azeey Oct 5, 2023
14b0f3b
backport component inspector Vector3d width fix (#2195)
iche033 Oct 9, 2023
2fd1b23
Fix another deadlock in sensors system (#2141) (#2200)
iche033 Oct 11, 2023
e7bc54e
merge and fix conflicts
iche033 Oct 16, 2023
d7381e5
Merge pull request #2210 from gazebosim/backport_sensors_fix
iche033 Oct 18, 2023
28728c9
Fix for sensor pointer null when navsat plugin in included in sdf (#2…
ashBabu Oct 30, 2023
f818301
Update github issue template (#2222)
iche033 Nov 1, 2023
20ee4df
Fix macOS test failures by registering components in the core library…
azeey Nov 1, 2023
97450b6
Relax pose check in actor no mesh test (#2196)
iche033 Oct 10, 2023
2a9d86c
Merge pull request #2225 from gazebosim/backport_actor_no_mesh_fix
iche033 Nov 3, 2023
e0e02c4
Update friction parameters for skid steer example (#2235)
azeey Nov 14, 2023
c73c12b
EnvironmentPreload: ignerr -> gzerr (#2245)
scpeters Nov 14, 2023
7c786b2
Update github action workflows (#2237)
azeey Nov 14, 2023
81850ce
environment_preload: fix windows compiler warnings (#2246)
scpeters Nov 16, 2023
3a21904
mecanum_drive: use mesh wheels in example world (#2250)
scpeters Nov 21, 2023
a88340b
Fix DLL linkage/visibility issues (#2254)
mjcarroll Nov 22, 2023
8ec622d
Fix incorrect light direction in tunnel.sdf example (#2264)
serkanMzlm Dec 13, 2023
4eb9484
Default CMA in LiftDrag pluginto zero (#2272)
arjo129 Dec 27, 2023
6548aac
Merge ign-gazebo3 into ign-gazebo6
azeey Jan 5, 2024
5d34efe
Merge pull request #2277 from gazebosim/azeey/3_to_6
azeey Jan 5, 2024
2bba478
Revert to use of cos^2 in LiftDrag plugin (#2273)
arjo129 Jan 8, 2024
926923f
Added tutorial for Gazebo joint controller plugin (#2263)
yaswanth1701 Jan 8, 2024
45a01a8
Allow using plugin file names and environment variables compatible wi…
azeey Jan 12, 2024
a00e377
Prepare for 6.16.0 Release (#2284)
azeey Jan 13, 2024
5a76b28
Merge 6 into 7
azeey Jan 16, 2024
c6cd6ed
Merge pull request #2288 from azeey/6_to_7
azeey Jan 17, 2024
f2c2da9
Prepare for 7.7.0 Release (#2292)
azeey Jan 18, 2024
ab18888
Merge 7 into 8
azeey Jan 18, 2024
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
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ labels: bug
---

<!-- If you're not sure whether your problem is a bug, please ask a question at
http://answers.gazebosim.org instead.-->
https://robotics.stackexchange.com instead.-->

## Environment
* OS Version: <!-- e.g, Ubuntu 20.04 -->
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ labels: enhancement

<!-- If you're not sure on the specifics of the feature or would like a broader
discussion, please consider posting a proposal to
http://community.gazebosim.org/ instead.-->
https://robotics.stackexchange.com instead.-->

## Desired behavior
<!-- Describe the current problem and the feature you want implemented.-->
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@ on:
pull_request:
push:
branches:
- 'gz-sim8'
- 'ign-gazebo[0-9]'
- 'gz-sim[0-9]?'
- 'main'

# Every time you make a push to your PR, it cancel immediately the previous checks,
# and start a new one. The other runner will be available more quickly to your PR.
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
Expand All @@ -19,7 +18,7 @@ jobs:
name: Ubuntu Jammy CI
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- uses: actions/setup-python@v3
- uses: pre-commit/[email protected]
with:
Expand Down
106 changes: 106 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,83 @@

## Gazebo Sim 7.x

### Gazebo Sim 7.7.0 (2024-01-17)

1. Allow using plugin file names and environment variables compatible with Garden and later
* [Pull request #2275](https://github.com/gazebosim/gz-sim/pull/2275)

1. Added tutorial for Gazebo joint controller plugin
* [Pull request #2263](https://github.com/gazebosim/gz-sim/pull/2263)

1. Fix incorrect light direction in tunnel.sdf example
* [Pull request #2264](https://github.com/gazebosim/gz-sim/pull/2264)

1. Fix DLL linkage/visibility issues
* [Pull request #2254](https://github.com/gazebosim/gz-sim/pull/2254)

1. mecanum_drive: use mesh wheels in example world
* [Pull request #2250](https://github.com/gazebosim/gz-sim/pull/2250)

1. environment_preload: fix windows compiler warnings
* [Pull request #2246](https://github.com/gazebosim/gz-sim/pull/2246)

1. EnvironmentPreload: ignerr -> gzerr
* [Pull request #2245](https://github.com/gazebosim/gz-sim/pull/2245)

1. Update friction parameters for skid steer example
* [Pull request #2235](https://github.com/gazebosim/gz-sim/pull/2235)

1. Use sdf FindElement API to avoid const_cast
* [Pull request #2236](https://github.com/gazebosim/gz-sim/pull/2236)

1. Use `GZ_PI` instead of `M_PI` to fix windows builds
* [Pull request #2230](https://github.com/gazebosim/gz-sim/pull/2230)

1. Add note about elevator example
* [Pull request #2227](https://github.com/gazebosim/gz-sim/pull/2227)

1. Porting Advanced Lift Drag Plugin to Gazebo
* [Pull request #2185](https://github.com/gazebosim/gz-sim/pull/2185)
* [Pull request #2226](https://github.com/gazebosim/gz-sim/pull/2226)

1. Fix macOS test failures by registering components in the core library
* [Pull request #2220](https://github.com/gazebosim/gz-sim/pull/2220)

1. Fix for sensor pointer null when navsat plugin in included in sdf
* [Pull request #2176](https://github.com/gazebosim/gz-sim/pull/2176)

1. Fix another deadlock in sensors system
* [Pull request #2200](https://github.com/gazebosim/gz-sim/pull/2200)

1. Fix sensors system parallel updates
* [Pull request #2201](https://github.com/gazebosim/gz-sim/pull/2201)

1. Relax pose check in actor no mesh test
* [Pull request #2196](https://github.com/gazebosim/gz-sim/pull/2196)

1. backport component inspector Vector3d width fix
* [Pull request #2195](https://github.com/gazebosim/gz-sim/pull/2195)

1. fix INTEGRATION_save_world's SdfGeneratorFixture.ModelWithNestedIncludes test
* [Pull request #2197](https://github.com/gazebosim/gz-sim/pull/2197)

1. Lift Drag Bug Fix
* [Pull request #2189](https://github.com/gazebosim/gz-sim/pull/2189)
* [Pull request #2272](https://github.com/gazebosim/gz-sim/pull/2272)
* [Pull request #2273](https://github.com/gazebosim/gz-sim/pull/2273)
* [Issue #2188](https://github.com/gazebosim/gz-sim/issues/2188)

1. Bump Fuel model version in test
* [Pull request #2190](https://github.com/gazebosim/gz-sim/pull/2190)

1. Fix enviroment system loading mechanism
* [Pull request #1842](https://github.com/gazebosim/gz-sim/pull/1842)

1. Infrastructure
* [Pull request #2237](https://github.com/gazebosim/gz-sim/pull/2237)
* [Pull request #2222](https://github.com/gazebosim/gz-sim/pull/2222)


### Gazebo Sim 7.6.0 (2023-09-26)

1. Documentation updates
Expand Down Expand Up @@ -1018,6 +1095,35 @@

## Gazebo Sim 6.x

### Gazebo Sim 6.16.0 (2024-01-12)

1. Allow using plugin file names and environment variables compatible with Garden and later
* [Pull request #2275](https://github.com/gazebosim/gz-sim/pull/2275)

1. Update friction parameters for skid steer example
* [Pull request #2235](https://github.com/gazebosim/gz-sim/pull/2235)

1. Relax pose check in actor no mesh test
* [Pull request #2196](https://github.com/gazebosim/gz-sim/pull/2196)

1. Fix macOS test failures by registering components in the core library
* [Pull request #2220](https://github.com/gazebosim/gz-sim/pull/2220)

1. Fix for sensor pointer null when navsat plugin in included in sdf
* [Pull request #2176](https://github.com/gazebosim/gz-sim/pull/2176)

1. Fix another deadlock in sensors system
* [Pull request #2200](https://github.com/gazebosim/gz-sim/pull/2200)

1. Backport component inspector Vector3d width fix
* [Pull request #2195](https://github.com/gazebosim/gz-sim/pull/2195)

1. Bump Fuel model version in test
* [Pull request #2190](https://github.com/gazebosim/gz-sim/pull/2190)

1. Infrastructure
* [Pull request #2237](https://github.com/gazebosim/gz-sim/pull/2237)
* [Pull request #2222](https://github.com/gazebosim/gz-sim/pull/2222)

### Gazebo Sim 6.15.0 (2023-08-16)

Expand Down
24 changes: 16 additions & 8 deletions examples/worlds/diff_drive_skid.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,10 @@
<surface>
<friction>
<ode>
<mu>0.5</mu>
<mu2>1.0</mu2>
<mu>1</mu>
<mu2>1</mu2>
<slip1>0.035</slip1>
<slip2>0</slip2>
<fdir1>0 0 1</fdir1>
</ode>
<bullet>
Expand Down Expand Up @@ -203,8 +205,10 @@
<surface>
<friction>
<ode>
<mu>0.5</mu>
<mu2>1.0</mu2>
<mu>1</mu>
<mu2>1</mu2>
<slip1>0.035</slip1>
<slip2>0</slip2>
<fdir1>0 0 1</fdir1>
</ode>
<bullet>
Expand Down Expand Up @@ -251,8 +255,10 @@
<surface>
<friction>
<ode>
<mu>0.5</mu>
<mu2>1.0</mu2>
<mu>1</mu>
<mu2>1</mu2>
<slip1>0.035</slip1>
<slip2>0</slip2>
<fdir1>0 0 1</fdir1>
</ode>
<bullet>
Expand Down Expand Up @@ -299,8 +305,10 @@
<surface>
<friction>
<ode>
<mu>0.5</mu>
<mu2>1.0</mu2>
<mu>1</mu>
<mu2>1</mu2>
<slip1>0.035</slip1>
<slip2>0</slip2>
<fdir1>0 0 1</fdir1>
</ode>
<bullet>
Expand Down
6 changes: 2 additions & 4 deletions examples/worlds/joint_controller.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,7 @@
</geometry>
<material>
<ambient>0.2 0.8 0.2 1</ambient>
<diffuse>0.2 0.8 0.2 1</diffuse>
<specular>0.2 0.8 0.2 1</specular>
<diffuse>0.8 0 0 1</diffuse>
</material>
</visual>
<collision name="collision">
Expand Down Expand Up @@ -179,8 +178,7 @@
</geometry>
<material>
<ambient>0.2 0.8 0.2 1</ambient>
<diffuse>0.2 0.8 0.2 1</diffuse>
<specular>0.2 0.8 0.2 1</specular>
<diffuse>0.8 0 0 1</diffuse>
</material>
</visual>
<collision name="collision">
Expand Down
1 change: 1 addition & 0 deletions examples/worlds/joint_position_controller.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
</geometry>
<material>
<ambient>0.2 0.8 0.2 1</ambient>
<diffuse>0.8 0 0 1</diffuse>
</material>
</visual>
<collision name="collision">
Expand Down
44 changes: 24 additions & 20 deletions examples/worlds/mecanum_drive.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -128,15 +128,13 @@
</inertia>
</inertial>
<visual name='visual'>
<pose>0 0 0 1.5707 0 0</pose>
<geometry>
<sphere>
<radius>0.3</radius>
</sphere>
<!--box><size>0.6 0.6 0.6</size></box-->
<!--mesh>
<uri>https://raw.githubusercontent.com/robomaster-oss/rmoss_ign_resources/main/models/rmua19_standard_robot/meshes/wheel_left.dae</uri>
<scale>2.4 2.4 2.4</scale>
</mesh-->
<!-- scale mesh to radius == 0.3 -->
<mesh>
<uri>https://fuel.gazebosim.org/1.0/OpenRobotics/models/Mecanum lift/tip/files/meshes/mecanum_wheel_left.STL</uri>
<scale>0.006 0.006 0.006</scale>
</mesh>
</geometry>
<material>
<ambient>0.2 0.2 0.2 1</ambient>
Expand Down Expand Up @@ -176,11 +174,13 @@
</inertia>
</inertial>
<visual name='visual'>
<pose>0 0 0 1.5707 0 0</pose>
<geometry>
<sphere>
<radius>0.3</radius>
</sphere>
<!--box><size>0.6 0.6 0.6</size></box-->
<!-- scale mesh to radius == 0.3 -->
<mesh>
<uri>https://fuel.gazebosim.org/1.0/OpenRobotics/models/Mecanum lift/tip/files/meshes/mecanum_wheel_right.STL</uri>
<scale>0.006 0.006 0.006</scale>
</mesh>
</geometry>
<material>
<ambient>0.2 0.2 0.2 1</ambient>
Expand Down Expand Up @@ -220,11 +220,13 @@
</inertia>
</inertial>
<visual name='visual'>
<pose>0 0 0 1.5707 0 0</pose>
<geometry>
<sphere>
<radius>0.3</radius>
</sphere>
<!--box><size>0.6 0.6 0.6</size></box-->
<!-- scale mesh to radius == 0.3 -->
<mesh>
<uri>https://fuel.gazebosim.org/1.0/OpenRobotics/models/Mecanum lift/tip/files/meshes/mecanum_wheel_right.STL</uri>
<scale>0.006 0.006 0.006</scale>
</mesh>
</geometry>
<material>
<ambient>0.2 0.2 0.2 1</ambient>
Expand Down Expand Up @@ -264,11 +266,13 @@
</inertia>
</inertial>
<visual name='visual'>
<pose>0 0 0 1.5707 0 0</pose>
<geometry>
<sphere>
<radius>0.3</radius>
</sphere>
<!--box><size>0.6 0.6 0.6</size></box-->
<!-- scale mesh to radius == 0.3 -->
<mesh>
<uri>https://fuel.gazebosim.org/1.0/OpenRobotics/models/Mecanum lift/tip/files/meshes/mecanum_wheel_left.STL</uri>
<scale>0.006 0.006 0.006</scale>
</mesh>
</geometry>
<material>
<ambient>0.2 0.2 0.2 1</ambient>
Expand Down
2 changes: 1 addition & 1 deletion examples/worlds/tunnel.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -1165,7 +1165,7 @@
<outer_angle>1.1</outer_angle>
<falloff>1</falloff>
</spot>
<direction>0 -1 0</direction>
<direction>0 0 -1</direction>
<cast_shadows>1</cast_shadows>
</light>
<sensor name="camera" type="camera">
Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ target_link_libraries(${gz_lib_target}
)

# Executable target that runs the GUI without ruby for debugging purposes.
add_executable(runGui gz.cc)
add_executable(runGui cmd/runGui_main.cc)
target_link_libraries(runGui PRIVATE ${gz_lib_target})

# Create the library target
Expand Down
39 changes: 37 additions & 2 deletions src/Conversions.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1363,6 +1363,41 @@

out.SetCameraSensor(sensor);
}
else if (out.Type() == sdf::SensorType::GPS ||
out.Type() == sdf::SensorType::NAVSAT)
{
sdf::NavSat sensor;
if (_in.has_gps())

Check warning on line 1370 in src/Conversions.cc

View check run for this annotation

Codecov / codecov/patch

src/Conversions.cc#L1369-L1370

Added lines #L1369 - L1370 were not covered by tests
{
if (_in.gps().position().has_horizontal_noise())

Check warning on line 1372 in src/Conversions.cc

View check run for this annotation

Codecov / codecov/patch

src/Conversions.cc#L1372

Added line #L1372 was not covered by tests
{
sensor.SetHorizontalPositionNoise(sim::convert<sdf::Noise>(
_in.gps().position().horizontal_noise()));

Check warning on line 1375 in src/Conversions.cc

View check run for this annotation

Codecov / codecov/patch

src/Conversions.cc#L1374-L1375

Added lines #L1374 - L1375 were not covered by tests
}
if (_in.gps().position().has_vertical_noise())

Check warning on line 1377 in src/Conversions.cc

View check run for this annotation

Codecov / codecov/patch

src/Conversions.cc#L1377

Added line #L1377 was not covered by tests
{
sensor.SetVerticalPositionNoise(sim::convert<sdf::Noise>(
_in.gps().position().vertical_noise()));

Check warning on line 1380 in src/Conversions.cc

View check run for this annotation

Codecov / codecov/patch

src/Conversions.cc#L1379-L1380

Added lines #L1379 - L1380 were not covered by tests
}
if (_in.gps().velocity().has_horizontal_noise())

Check warning on line 1382 in src/Conversions.cc

View check run for this annotation

Codecov / codecov/patch

src/Conversions.cc#L1382

Added line #L1382 was not covered by tests
{
sensor.SetHorizontalVelocityNoise(sim::convert<sdf::Noise>(
_in.gps().velocity().horizontal_noise()));

Check warning on line 1385 in src/Conversions.cc

View check run for this annotation

Codecov / codecov/patch

src/Conversions.cc#L1384-L1385

Added lines #L1384 - L1385 were not covered by tests
}
if (_in.gps().velocity().has_vertical_noise())

Check warning on line 1387 in src/Conversions.cc

View check run for this annotation

Codecov / codecov/patch

src/Conversions.cc#L1387

Added line #L1387 was not covered by tests
{
sensor.SetVerticalVelocityNoise(sim::convert<sdf::Noise>(
_in.gps().velocity().vertical_noise()));

Check warning on line 1390 in src/Conversions.cc

View check run for this annotation

Codecov / codecov/patch

src/Conversions.cc#L1389-L1390

Added lines #L1389 - L1390 were not covered by tests
}
}
else
{
gzerr << "Attempting to convert a navsat sensor message, but the "
<< "message does not have a navsat nested message.\n";

Check warning on line 1396 in src/Conversions.cc

View check run for this annotation

Codecov / codecov/patch

src/Conversions.cc#L1395-L1396

Added lines #L1395 - L1396 were not covered by tests
}

out.SetNavSatSensor(sensor);
}

Check warning on line 1400 in src/Conversions.cc

View check run for this annotation

Codecov / codecov/patch

src/Conversions.cc#L1399-L1400

Added lines #L1399 - L1400 were not covered by tests
else if (out.Type() == sdf::SensorType::ALTIMETER)
{
sdf::Altimeter sensor;
Expand Down Expand Up @@ -1637,8 +1672,8 @@
std::string path = asFullPath(_in.ColorRangeImage(), _in.FilePath());

common::SystemPaths systemPaths;
systemPaths.SetFilePathEnv(kResourcePathEnv);
std::string absolutePath = systemPaths.FindFile(path);
std::string absolutePath =
common::SystemPaths::LocateLocalFile(path, sim::resourcePaths());

if (!absolutePath.empty())
{
Expand Down
Loading