Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Gabriele Buondonno
pinocchio
Commits
21bdf01e
Commit
21bdf01e
authored
Mar 26, 2015
by
Valenza Florian
Browse files
[Major] Now handle fixed joint if it has no children joint
parent
c64732f9
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/multibody/parser/urdf.hpp
View file @
21bdf01e
...
...
@@ -78,9 +78,6 @@ namespace se3
if
(
joint
!=
NULL
)
{
assert
(
link
->
getParent
()
!=
NULL
);
if
(
joint
->
type
!=
::
urdf
::
Joint
::
FIXED
)
{
// This is a bypass to be corrected later. TODO
Model
::
Index
parent
=
(
link
->
getParent
()
->
parent_joint
==
NULL
)
?
...
...
@@ -150,8 +147,9 @@ namespace se3
}
case
::
urdf
::
Joint
::
FIXED
:
{
/* To fixed this, "spot" point should be added. TODO. */
//std::cerr << "For now, fixed joint are not accepted. " << std::endl;
model
.
mergeFixedBody
(
parent
,
jointPlacement
,
Y
);
assert
(
(
link
->
child_links
.
empty
())
&&
"Fixed body has joint child. Shouldn't happen"
);
// For the moment, fixed bodies are handled only if end of chain (and only once)
break
;
}
...
...
@@ -162,7 +160,7 @@ namespace se3
break
;
}
}
}
}
}
else
if
(
freeFlyer
)
{
/* The link is the root of the body. */
model
.
addBody
(
0
,
JointModelFreeFlyer
(),
SE3
::
Identity
(),
Y
,
"root"
,
link
->
name
,
true
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment