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
ee2d86a9
Commit
ee2d86a9
authored
8 years ago
by
Joseph Mirabel
Committed by
Joseph Mirabel
8 years ago
Browse files
Options
Downloads
Patches
Plain Diff
[C++] Add GeometryModel::addGeometryObject(const Geometry&)
parent
019bb1a5
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/multibody/geometry.hpp
+9
-0
9 additions, 0 deletions
src/multibody/geometry.hpp
src/multibody/geometry.hxx
+11
-6
11 additions, 6 deletions
src/multibody/geometry.hxx
with
20 additions
and
6 deletions
src/multibody/geometry.hpp
+
9
−
0
View file @
ee2d86a9
...
...
@@ -70,6 +70,15 @@ namespace se3
~
GeometryModel
()
{};
/**
* @brief Add a geometry object to a GeometryModel
*
* @param[in] object Object
*
* @return The index of the new added GeometryObject in geometryObjects
*/
inline
GeomIndex
addGeometryObject
(
const
GeometryObject
&
object
);
/**
* @brief Add a geometry object to a GeometryModel
*
...
...
This diff is collapsed.
Click to expand it.
src/multibody/geometry.hxx
+
11
−
6
View file @
ee2d86a9
...
...
@@ -32,6 +32,14 @@
namespace
se3
{
inline
GeomIndex
GeometryModel
::
addGeometryObject
(
const
GeometryObject
&
object
)
{
Index
idx
=
(
Index
)
(
ngeoms
++
);
geometryObjects
.
push_back
(
object
);
addInnerObject
(
object
.
parentJoint
,
idx
);
return
idx
;
}
inline
GeomIndex
GeometryModel
::
addGeometryObject
(
const
Model
&
model
,
const
FrameIndex
parent
,
const
boost
::
shared_ptr
<
fcl
::
CollisionGeometry
>
&
co
,
...
...
@@ -39,14 +47,11 @@ namespace se3
const
std
::
string
&
geom_name
,
const
std
::
string
&
mesh_path
)
throw
(
std
::
invalid_argument
)
{
Index
idx
=
(
Index
)
(
ngeoms
++
);
assert
(
model
.
frames
[
parent
].
type
==
se3
::
BODY
);
JointIndex
parentJoint
=
model
.
frames
[
parent
].
parent
;
geometryObjects
.
push_back
(
GeometryObject
(
geom_name
,
parent
,
parentJoint
,
co
,
placement
,
mesh_path
));
addInnerObject
(
parentJoint
,
idx
);
return
idx
;
GeometryObject
object
(
geom_name
,
parent
,
parentJoint
,
co
,
placement
,
mesh_path
);
return
addGeometryObject
(
object
);
}
...
...
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