From f9c48112294958e6c5b6a4f5ad62085a3421e7c6 Mon Sep 17 00:00:00 2001 From: John Hsu Date: Wed, 16 Mar 2011 20:52:57 -0700 Subject: [PATCH] fix multiple visuals. --- urdf_parser/src/link.cpp | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/urdf_parser/src/link.cpp b/urdf_parser/src/link.cpp index 870ff88..2b78ea8 100644 --- a/urdf_parser/src/link.cpp +++ b/urdf_parser/src/link.cpp @@ -268,6 +268,14 @@ bool Visual::initXml(TiXmlElement *config) } } + // Group Tag (optional) + // collision blocks without a group tag are designated to the "default" group + const char *group_name_char = config->Attribute("group"); + if (!group_name_char) + group_name = std::string("default"); + else + group_name = std::string(group_name_char); + return true; } @@ -440,18 +448,6 @@ bool Link::initXml(TiXmlElement* config) } } - // Visual (optional) - TiXmlElement *v = config->FirstChildElement("visual"); - if (v) - { - visual.reset(new Visual); - if (!visual->initXml(v)) - { - ROS_ERROR("Could not parse visual element for Link '%s'", this->name.c_str()); - return false; - } - } - // Multiple Visuals (optional) for (TiXmlElement* vis_xml = config->FirstChildElement("visual"); vis_xml; vis_xml = vis_xml->NextSiblingElement("visual")) {