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

Exposing gjk utils #302

Merged
merged 25 commits into from
Jun 3, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
dcabc6c
collision queries: exposing GJK tolerance & max_iterations
lmontaut Jun 1, 2022
c6438a0
misc: removing set functions in GJKSolver & better naming for converg…
lmontaut Jun 1, 2022
21cba6c
python: exposing gjk_variant & convergence_criterion to query requests
lmontaut Jun 1, 2022
6ffadbd
misc: removing set/get in GJK class for variant and cv related attrib…
lmontaut Jun 2, 2022
da3aa19
core: adding enum for initial guess in GJKSolver
lmontaut Jun 2, 2022
381ec6a
core: introducing initialize_gjk function for GJKSolver
lmontaut Jun 2, 2022
8f6fa85
core: using initialize_gjk in GJKSolver
lmontaut Jun 2, 2022
bfd2e5d
queries: adding gjk_initial_guess
lmontaut Jun 2, 2022
99310ab
col/dist api: gjk_initial_guess in collide/distance functions and fun…
lmontaut Jun 2, 2022
db25e42
core: removing setting gjk related stuff (already set by collide/dist…
lmontaut Jun 2, 2022
7650fd6
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 2, 2022
8a69c97
col/dist api: adding gjk_variant and cv criterion in functors
lmontaut Jun 2, 2022
bafec21
misc: moving the deprecated flag
lmontaut Jun 2, 2022
492f0ff
core: concatenating enable_cached_guess and gjk_initial_guess
lmontaut Jun 2, 2022
1d92924
core: check in initialize_gjk in GJKSolver
lmontaut Jun 3, 2022
d5e9da6
python: fix exception type
jcarpent Jun 3, 2022
7f33182
core: add HPP_FCL_COMPILER_DIAGNOSTIC helper macros
jcarpent Jun 3, 2022
6d9945d
core: move header includes to correct location
jcarpent Jun 3, 2022
3b0edce
cmake: add missing files to the list
jcarpent Jun 3, 2022
8a44d80
test: fix type to remove warning
jcarpent Jun 3, 2022
4ed789a
cmake: sync submodule
jcarpent Jun 3, 2022
03d4f5f
core: use HPP_FCL_DEPRECATED_MESSAGE
jcarpent Jun 3, 2022
cf0c45b
core: fix deprecated warnings
jcarpent Jun 3, 2022
4b3f810
python: fix exposition of enable_cached_gjk_guess
jcarpent Jun 3, 2022
2c37457
test: fix warnings
jcarpent Jun 3, 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: 6 additions & 0 deletions src/collision.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,12 @@ std::size_t ComputeCollision::operator()(const Transform3f& tf1,
}

solver.distance_upper_bound = request.distance_upper_bound;
solver.gjk_tolerance = request.gjk_tolerance;
solver.gjk_max_iterations = request.gjk_max_iterations;
solver.gjk_variant = request.gjk_variant;
solver.gjk_convergence_criterion = request.gjk_convergence_criterion;
solver.gjk_convergence_criterion_type =
request.gjk_convergence_criterion_type;
lmontaut marked this conversation as resolved.
Show resolved Hide resolved

std::size_t res;
if (request.enable_timings) {
Expand Down
7 changes: 7 additions & 0 deletions src/distance.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,13 @@ FCL_REAL ComputeDistance::operator()(const Transform3f& tf1,
solver.support_func_cached_guess = request.cached_support_func_guess;
}

solver.gjk_tolerance = request.gjk_tolerance;
solver.gjk_max_iterations = request.gjk_max_iterations;
solver.gjk_variant = request.gjk_variant;
solver.gjk_convergence_criterion = request.gjk_convergence_criterion;
solver.gjk_convergence_criterion_type =
request.gjk_convergence_criterion_type;

FCL_REAL res;
if (request.enable_timings) {
Timer timer;
Expand Down