Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

parse plane geom for URDF files (not just SDF)

Browse Source
This commit is contained in:
erwincoumans
2018-01-13 13:41:46 -08:00
parent 1b569c0701
commit e961800278
1 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
examples/Importers/ImportURDFDemo/UrdfParser.cpp
View File

@@ -493,30 +493,43 @@ bool UrdfParser::parseGeometry(UrdfGeometry& geom, TiXmlElement* g, ErrorLogger*
} }
else else
{ {
if (this->m_parseSDF) if (type_name == "plane")
{ {
if (type_name == "plane") geom.m_type = URDF_GEOM_PLANE;
{ if (this->m_parseSDF)
geom.m_type = URDF_GEOM_PLANE; {
TiXmlElement *n = shape->FirstChildElement("normal");
TiXmlElement *s = shape->FirstChildElement("size");
TiXmlElement *n = shape->FirstChildElement("normal"); if ((0==n)||(0==s))
TiXmlElement *s = shape->FirstChildElement("size"); {
logger->reportError("Plane shape must have both normal and size attributes");
return false;
}
if ((0==n)||(0==s)) parseVector3(geom.m_planeNormal,n->GetText(),logger);
{ } else
logger->reportError("Plane shape must have both normal and size attributes"); {
return false; if (!shape->Attribute("normal"))
} {
logger->reportError("plane requires a normal attribute");
return false;
} else
{
parseVector3(geom.m_planeNormal,shape->Attribute("normal"),logger);
parseVector3(geom.m_planeNormal,n->GetText(),logger); }
}
} else }
{
logger->reportError("Unknown geometry type:"); }
logger->reportError(type_name.c_str()); else
return false; {
} logger->reportError("Unknown geometry type:");
} logger->reportError(type_name.c_str());
return false;
}
}
return true; return true;
} }