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

Update test configuration to use ogre2 #83

Merged
merged 12 commits into from
Jun 29, 2020
Merged

Update test configuration to use ogre2 #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
17af7b8
use ogre2 test
iche033 May 8, 2020
52299a4
changelog
iche033 May 20, 2020
4bbd43d
run test
iche033 May 21, 2020
ed7d3f5
testing
iche033 May 21, 2020
377c659
revert changes
iche033 May 21, 2020
9ec83bb
testing
iche033 Jun 9, 2020
27a1e30
add ifdefs
iche033 Jun 23, 2020
bbbf691
debugging homebrew
iche033 Jun 23, 2020
0c1b1c0
more debugging
iche033 Jun 24, 2020
39b1d3a
debugging depth cam mat and comp
iche033 Jun 26, 2020
d77e3e4
fix build
iche033 Jun 26, 2020
9638b8e
cleanup
iche033 Jun 26, 2020
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
4 changes: 4 additions & 0 deletions Changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
## Ignition Rendering


### Ignition Rendering 3.X.X

1. Update test configuration to use ogre2
* [Pull request 83](https://github.com/ignitionrobotics/ign-rendering/pull/83)

1. Ogre2 GPU Ray: Cleanup all resources on destruction
* [BitBucket pull request 258](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-rendering/pull-requests/258)

Expand Down
1 change: 1 addition & 0 deletions ogre2/src/Ogre2DepthCamera.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,7 @@ void Ogre2DepthCamera::CreateDepthTexture()
// {
// material DepthCamera // Use copy instead of original
// input 0 depthTexture
// input 1 colorTexture
// quad_normals camera_far_corners_view_space
// }
// }
Expand Down
6 changes: 5 additions & 1 deletion test/integration/depth_camera.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ void DepthCameraTest::DepthCameraBoxes(

// Verify Depth
{
// box not detected so all should return max val
// all points should have the same depth value
EXPECT_FLOAT_EQ(expectedRange, scan[mid]);
EXPECT_FLOAT_EQ(expectedRange, scan[left]);
EXPECT_FLOAT_EQ(expectedRange, scan[right]);
Expand Down Expand Up @@ -434,7 +434,11 @@ void DepthCameraTest::DepthCameraBoxes(
ignition::rendering::unloadEngine(engine->Name());
}

#ifdef __APPLE__
TEST_P(DepthCameraTest, DISABLED_DepthCameraBoxes)
#else
TEST_P(DepthCameraTest, DepthCameraBoxes)
#endif
{
DepthCameraBoxes(GetParam());
}
Expand Down
2 changes: 1 addition & 1 deletion test/test_config.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#define RENDER_ENGINE_VALUES ::testing::ValuesIn(\
ignition::rendering::TestValues())

static const std::vector<const char *> kRenderEngineTestValues{"ogre", "optix"};
static const std::vector<const char *> kRenderEngineTestValues{"ogre2", "optix"};

#include <vector>
#include <ignition/common/Util.hh>
Expand Down