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.

Sign up for GitHub

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

👩‍🌾 5 ➡️ 6 #125

Merged
merged 9 commits into from
Apr 24, 2021
Merged

👩‍🌾 5 ➡️ 6 #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3e486b4
🎈 5.0.0 (#118)
chapulina Mar 31, 2021
06c9de6
👩‍🌾 Disable tests that consistently fail on macOS (#121)
chapulina Apr 20, 2021
072ff49
3 ➡️ 4
chapulina Apr 20, 2021
8a99c52
👩‍🌾 3 ➡️ 4 (#122)
chapulina Apr 22, 2021
3300f07
Disable macOS workflow (#124)
scpeters Apr 22, 2021
26bf26e
4 ➡️ 5
chapulina Apr 22, 2021
36e5308
👩‍🌾 4 ➡️ 5 (#123)
chapulina Apr 23, 2021
bb16d12
Changelog fix (#126)
chapulina Apr 23, 2021
837fb20
5 ➡️ 6
chapulina Apr 23, 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
0 .github/workflows/macos.yml → .github/disabled_workflows/macos.yml
View file
Open in desktop
File renamed without changes.
5 changes: 4 additions & 1 deletion Changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

### Ignition Sensors 5.X.X

### Ignition Sensors 5.0.0 (20XX-XX-XX)
### Ignition Sensors 5.0.0 (2021-03-30)

1. Bump in edifice: ign-common4
* [Pull request #85](https://github.com/ignitionrobotics/ign-sensors/pull/85)
Expand All @@ -22,6 +22,9 @@
1. Bump in edifice: ign-rendering5
* [Pull request #55](https://github.com/ignitionrobotics/ign-sensors/pull/55)

1. Documentation updates
* [Pull request #116](https://github.com/ignitionrobotics/ign-sensors/pull/116)

## Ignition Sensors 4

### Ignition Sensors 4.X.X
Expand Down
12 changes: 12 additions & 0 deletions test/integration/gpu_lidar_sensor_plugin.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,10 @@ void GpuLidarSensorTest::TestThreeBoxes(const std::string &_renderEngine)
// Sensor 1 should see box01 and box02
EXPECT_NEAR(sensor1->Range(0), expectedRangeAtMidPointBox2, LASER_TOL);
EXPECT_NEAR(sensor1->Range(mid), expectedRangeAtMidPointBox1, LASER_TOL);
#ifndef __APPLE__
// See https://github.com/ignitionrobotics/ign-sensors/issues/66
EXPECT_DOUBLE_EQ(sensor1->Range(last), ignition::math::INF_D);
#endif

// Only box01 should be visible to sensor 2
EXPECT_DOUBLE_EQ(sensor2->Range(0), ignition::math::INF_D);
Expand Down Expand Up @@ -653,8 +656,11 @@ void GpuLidarSensorTest::VerticalLidar(const std::string &_renderEngine)
{
double expectedRange = expectedRangeAtMidPoint / cos(angleStep);

#ifndef __APPLE__
// See https://github.com/ignitionrobotics/ign-sensors/issues/66
EXPECT_NEAR(sensor->Range(i * horzSamples + mid),
expectedRange, VERTICAL_LASER_TOL);
#endif

angleStep += vAngleStep;

Expand Down Expand Up @@ -791,12 +797,18 @@ void GpuLidarSensorTest::ManualUpdate(const std::string &_renderEngine)
// Sensor 1 should see box01 in front of it
EXPECT_DOUBLE_EQ(sensor1->Range(0), ignition::math::INF_D);
EXPECT_NEAR(sensor1->Range(mid), expectedRangeAtMidPointBox1, LASER_TOL);
#ifndef __APPLE__
// See https://github.com/ignitionrobotics/ign-sensors/issues/66
EXPECT_DOUBLE_EQ(sensor1->Range(last), ignition::math::INF_D);
#endif

// Sensor 2 should see box01 to the right of it
EXPECT_NEAR(sensor2->Range(0), expectedRangeAtMidPointBox1, LASER_TOL);
EXPECT_DOUBLE_EQ(sensor2->Range(mid), ignition::math::INF_D);
#ifndef __APPLE__
// See https://github.com/ignitionrobotics/ign-sensors/issues/66
EXPECT_DOUBLE_EQ(sensor2->Range(last), ignition::math::INF_D);
#endif

// Clean up
//
Expand Down
6 changes: 6 additions & 0 deletions test/integration/rgbd_camera_plugin.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,10 @@ void RgbdCameraSensorTest::ImagesWithBuiltinSDF(
unsigned int mb = g_imgBuffer[imgMid + 2];
EXPECT_EQ(0u, mr);
EXPECT_EQ(0u, mg);
#ifndef __APPLE__
// See https://github.com/ignitionrobotics/ign-sensors/issues/66
EXPECT_GT(mb, 0u);
#endif

unsigned int lr = g_imgBuffer[imgLeft];
unsigned int lg = g_imgBuffer[imgLeft + 1];
Expand Down Expand Up @@ -437,7 +440,10 @@ void RgbdCameraSensorTest::ImagesWithBuiltinSDF(
unsigned int mb = g_pointsRGBBuffer[imgMid + 2];
EXPECT_EQ(0u, mr);
EXPECT_EQ(0u, mg);
#ifndef __APPLE__
// See https://github.com/ignitionrobotics/ign-sensors/issues/66
EXPECT_GT(mb, 0u);
#endif

// Far left and right points should be red (background color)
unsigned int lr = g_pointsRGBBuffer[imgLeft];
Expand Down