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

bullet-featherstone: Use a single contact manifold for each convex decomposed mesh collision #664

Open
wants to merge 31 commits into
base: gz-physics7
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
5a05b5d
Use 1 contact manifold for each convex decomposed mesh collision
iche033 Jul 3, 2024
9117975
fix
iche033 Jul 3, 2024
6a31cd3
style
iche033 Jul 3, 2024
927bf03
remove unused features in test
iche033 Jul 3, 2024
a0ffccc
use 2 separate sets to keep track of manifolds, update logic to find …
iche033 Jul 3, 2024
981f655
Merge branch 'gz-physics7' into bullet_convex_manifold
iche033 Jul 3, 2024
1b93f3f
undo some changes
iche033 Jul 3, 2024
d1a0a87
style
iche033 Jul 3, 2024
0f18722
Merge branch 'gz-physics7' into bullet_convex_manifold
iche033 Jul 10, 2024
5fe67d0
ifdef for windows
iche033 Jul 10, 2024
ba6f4d0
undo changes in simulation features
iche033 Jul 10, 2024
4fb4b57
test with GzCollisionDispatcher
iche033 Jul 11, 2024
51c3b80
testing windows
iche033 Jul 11, 2024
9411c0e
more windows testing
iche033 Jul 11, 2024
93c87eb
more testing on win
iche033 Jul 11, 2024
517efd6
rename var
iche033 Jul 11, 2024
a752843
revert ba6f4d02bdd8a62473f6881b0fe9581dba448024
iche033 Jul 12, 2024
a573ac6
return early
iche033 Jul 12, 2024
a33acf1
debugging
iche033 Jul 12, 2024
bc59916
debugging
iche033 Jul 12, 2024
88ecdad
add more debugging
iche033 Jul 15, 2024
dcca698
check nulls
iche033 Jul 16, 2024
51fa0d3
more debugging
iche033 Jul 16, 2024
e34bffe
test static cast
iche033 Jul 16, 2024
cc9bc62
test static cast
iche033 Jul 16, 2024
c561ee5
enable gz collision dispatcher
iche033 Jul 16, 2024
c992e4e
cleanup
iche033 Jul 17, 2024
e5b8120
more cleanup
iche033 Jul 17, 2024
80ea3c5
Merge branch 'gz-physics7' into bullet_convex_manifold
iche033 Aug 12, 2024
7c04a2f
Merge branch 'gz-physics7' into bullet_convex_manifold
iche033 Oct 12, 2024
24c3cb5
Merge branch 'gz-physics7' into bullet_convex_manifold
iche033 Dec 20, 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
Prev Previous commit
Next Next commit
debugging
Signed-off-by: Ian Chen <ichen@openrobotics.org>
  • Loading branch information
iche033 committed Jul 12, 2024
commit a33acf11cac412c2cc91a55ab7a78dbc66c07dac
5 changes: 5 additions & 0 deletions bullet-featherstone/src/SimulationFeatures.cc
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ void SimulationFeatures::WorldForwardStep(
std::vector<SimulationFeatures::ContactInternal>
SimulationFeatures::GetContactsFromLastStep(const Identity &_worldID) const
{
std::cerr << " get contacts from last step " << std::endl;
std::vector<SimulationFeatures::ContactInternal> outContacts;
auto *const world = this->ReferenceInterface<WorldInfo>(_worldID);
if (!world)
Expand All @@ -67,6 +68,8 @@ SimulationFeatures::GetContactsFromLastStep(const Identity &_worldID) const
}
GzCollisionDispatcher *dispatcher =
dynamic_cast<GzCollisionDispatcher *>(world->world->getDispatcher());
if (!dispatcher)
return;

int numManifolds = world->world->getDispatcher()->getNumManifolds();
for (int i = 0; i < numManifolds; i++)
Expand Down Expand Up @@ -122,6 +125,8 @@ SimulationFeatures::GetContactsFromLastStep(const Identity &_worldID) const
convert(pt.getPositionWorldOnA()), extraData});
}
}

std::cerr << " get contacts from last step done " << std::endl;
return outContacts;
}

Expand Down
1 change: 1 addition & 0 deletions test/common_test/collisions.cc
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,7 @@ TEST_F(CollisionMeshTestFeaturesList, MeshContacts)
EXPECT_LT(contactSize, contacts.size());
}
}
std::cerr << " ======== done with mesh contacts test " << std::endl;
}

using CollisionStaticFeaturesList = gz::physics::FeatureList<
Expand Down