Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
pinocchio
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Stack Of Tasks
pinocchio
Commits
26a61ac1
Commit
26a61ac1
authored
8 years ago
by
Joseph Mirabel
Committed by
Joseph Mirabel
8 years ago
Browse files
Options
Downloads
Patches
Plain Diff
[C++] GeometryData stores fcl::CollisionResult (not se3::CollisionResult)
parent
43a46e1f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/algorithm/geometry.hxx
+2
-2
2 additions, 2 deletions
src/algorithm/geometry.hxx
src/multibody/geometry.hpp
+1
-1
1 addition, 1 deletion
src/multibody/geometry.hpp
src/multibody/geometry.hxx
+2
-2
2 additions, 2 deletions
src/multibody/geometry.hxx
with
5 additions
and
5 deletions
src/algorithm/geometry.hxx
+
2
−
2
View file @
26a61ac1
...
...
@@ -62,8 +62,8 @@ namespace se3
{
if
(
data_geom
.
activeCollisionPairs
[
cpt
])
{
data_geom
.
computeCollision
(
geomModel
.
collisionPairs
[
cpt
],
data_geom
.
collision_results
[
cpt
]
.
fcl_collision_result
);
isColliding
|=
data_geom
.
collision_results
[
cpt
].
fcl_collision_result
.
isCollision
();
data_geom
.
computeCollision
(
geomModel
.
collisionPairs
[
cpt
],
data_geom
.
collision_results
[
cpt
]);
isColliding
|=
data_geom
.
collision_results
[
cpt
].
isCollision
();
if
(
isColliding
&&
stopAtFirstCollision
)
return
true
;
}
...
...
This diff is collapsed.
Click to expand it.
src/multibody/geometry.hpp
+
1
−
1
View file @
26a61ac1
...
...
@@ -234,7 +234,7 @@ namespace se3
///
/// \brief Vector gathering the result of the collision computation for all the collision pairs.
///
std
::
vector
<
CollisionResult
>
collision_results
;
std
::
vector
<
fcl
::
CollisionResult
>
collision_results
;
///
/// \brief Radius of the bodies, i.e. distance of the further point of the geometry model
...
...
This diff is collapsed.
Click to expand it.
src/multibody/geometry.hxx
+
2
−
2
View file @
26a61ac1
...
...
@@ -225,7 +225,7 @@ namespace se3
for
(
size_t
i
=
0
;
i
<
model_geom
.
collisionPairs
.
size
();
++
i
)
{
if
(
activeCollisionPairs
[
i
])
computeCollision
(
model_geom
.
collisionPairs
[
i
],
collision_results
[
i
]
.
fcl_collision_result
);
computeCollision
(
model_geom
.
collisionPairs
[
i
],
collision_results
[
i
]);
}
}
...
...
@@ -234,7 +234,7 @@ namespace se3
for
(
i
=
0
;
i
<
model_geom
.
collisionPairs
.
size
();
++
i
)
{
if
(
activeCollisionPairs
[
i
]
&&
computeCollision
(
model_geom
.
collisionPairs
[
i
],
collision_results
[
i
]
.
fcl_collision_result
))
&&
computeCollision
(
model_geom
.
collisionPairs
[
i
],
collision_results
[
i
]))
return
true
;
}
return
false
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment