Skip to content

Commit

Permalink
Merge branch 'bullet-featherstone-collisions' of https://github.com/g…
Browse files Browse the repository at this point in the history
…azebosim/gz-physics into bullet-featherstone-collisions
  • Loading branch information
ahcorde committed Jul 20, 2022
2 parents 2c19f08 + 862411b commit bf8f0f0
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions bullet-featherstone/src/SDFFeatures.cc
Original file line number Diff line number Diff line change
Expand Up @@ -639,13 +639,9 @@ bool SDFFeatures::AddSdfCollision(
return false;
}

// double mu = 1.0;
// double mu2 = 1.0;
// double restitution = 0.0;

double mu = 0.5;
double mu2 = 0.5;
double restitution = 0.5;
double mu = 1.0;
double mu2 = 1.0;
double restitution = 0.0;

double rollingFriction = 0.0;
if (const auto *surface = _collision.Surface())
Expand Down

0 comments on commit bf8f0f0

Please sign in to comment.