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

Added Simulation features common test #362

Merged
merged 35 commits into from
Jul 8, 2022
Merged

Added Simulation features common test #362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
0992cb8
Add more common test and refactor helper class
ahcorde Jun 20, 2022
0ecea70
Add feedback and more tests
ahcorde Jun 21, 2022
110ddf3
Merge branch 'main' into ahcorde/6/refactor_common_test
ahcorde Jun 21, 2022
7ebed3f
Added Simulation features common test
ahcorde Jun 21, 2022
55029e5
Fix windows build
ahcorde Jun 21, 2022
ef59f8f
try to fix windows build
ahcorde Jun 21, 2022
323970c
try to fix windows build
ahcorde Jun 21, 2022
1b99a98
try to fix windows build
ahcorde Jun 21, 2022
f9b9a18
Fix windows build
ahcorde Jun 21, 2022
cc2abe0
Fix windows build
ahcorde Jun 22, 2022
28b981d
Fix windows build
ahcorde Jun 22, 2022
75b834f
Merge branch 'ahcorde/6/refactor_common_test' into ahcorde/6/simulati…
ahcorde Jun 22, 2022
edf9540
Added joinpaths
ahcorde Jun 22, 2022
821d5bc
Fixed windows build
ahcorde Jun 23, 2022
b4e7c92
Remove old gtest version
mjcarroll Jun 27, 2022
62f4ca1
Add new vendored Googletest version
mjcarroll Jun 28, 2022
0bd6fd2
CMake updates for new googletest version
mjcarroll Jun 28, 2022
7776dd6
Test updates for new googletest version
mjcarroll Jun 28, 2022
cacc9f8
Remove unnecessary gtest_main functions
mjcarroll Jun 28, 2022
e9e377c
Update test/CMakeLists.txt
mjcarroll Jun 28, 2022
c6bef9d
Merge branch 'main' into ahcorde/6/refactor_common_test
ahcorde Jun 28, 2022
a53ac45
Merge branch 'ahcorde/6/refactor_common_test' into ahcorde/6/simulati…
ahcorde Jun 28, 2022
327a775
Fixed merge
ahcorde Jun 28, 2022
b173393
Merge branch 'main' into ahcorde/6/refactor_common_test
ahcorde Jun 28, 2022
73d7bac
Merge branch 'main' into bump_gtest
ahcorde Jun 28, 2022
7cc773d
Merge remote-tracking branch 'origin/bump_gtest' into ahcorde/6/refac…
ahcorde Jun 29, 2022
685fb75
Merge remote-tracking branch 'origin/main' into ahcorde/6/refactor_co…
ahcorde Jun 29, 2022
f435488
remove todo - skip test
ahcorde Jun 29, 2022
21a4dec
Merge branch 'main' into ahcorde/6/refactor_common_test
ahcorde Jun 29, 2022
0a36b2a
Merge remote-tracking branch 'origin/ahcorde/6/refactor_common_test' …
ahcorde Jun 30, 2022
1d5f7e7
Merge branch 'main' into ahcorde/6/refactor_common_test
ahcorde Jul 6, 2022
660c430
Merge remote-tracking branch 'origin/ahcorde/6/refactor_common_test' …
ahcorde Jul 6, 2022
1a76e1e
GTEST_SKIP
ahcorde Jul 6, 2022
9de2eef
Merge branch 'main' into ahcorde/6/simulation_features
ahcorde Jul 7, 2022
693a109
removed link_directories
ahcorde Jul 8, 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 dartsim/src/ShapeFeatures.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,11 +241,11 @@ Vector3d ShapeFeatures::GetEllipsoidShapeRadii(
{
const auto *shapeInfo = this->ReferenceInterface<ShapeInfo>(_ellipsoidID);

dart::dynamics::EllipsoidShape *ellipsoid =
static_cast<dart::dynamics::EllipsoidShape *>(
dart::dynamics::MeshShape *ellipsoid =
static_cast<dart::dynamics::MeshShape *>(
shapeInfo->node->getShape().get());

return ellipsoid->getRadii();
return ellipsoid->getBoundingBox().getMax();
}

/////////////////////////////////////////////////
Expand Down
8 changes: 6 additions & 2 deletions test/common_test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ set(TEST_TYPE "COMMON_TEST")
set(tests
basic_test
construct_empty_world
simulation_features
)

link_directories(${PROJECT_BINARY_DIR}/test)

function(configure_common_test PHYSICS_ENGINE_NAME test_name)
add_test(NAME ${test_name}_${PHYSICS_ENGINE_NAME}
COMMAND
Expand All @@ -23,11 +22,16 @@ foreach(test ${tests})
gz-plugin${GZ_PLUGIN_VER}::loader
gz-common${GZ_COMMON_VER}::gz-common${GZ_COMMON_VER}
${PROJECT_LIBRARY_TARGET_NAME}
${PROJECT_LIBRARY_TARGET_NAME}-sdf
gtest
gtest_main
${PROJECT_NAME}_test_lib_loader
)

target_compile_definitions(${TEST_TYPE}_${test} PRIVATE
"TEST_WORLD_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}/worlds/\""
)

if (${BULLET_FOUND})
configure_common_test("bullet" ${TEST_TYPE}_${test})
endif()
Expand Down
Loading