summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorerwincoumans <erwincoumans@google.com>2020-11-13 10:04:33 -0800
committerGitHub <noreply@github.com>2020-11-13 10:04:33 -0800
commit9344606e5d370655f61c6a7d43ce8af34e83323e (patch)
tree5f9c01390733ad108503b9d7d2685af2b4cb69cd
parent2a0f811c3bb3c65810eb2c095724b20b2f8b8dd4 (diff)
parent6a9cd4615cca148c1e4d9d1ed06a7a82298e9d50 (diff)
downloadbullet3-9344606e5d370655f61c6a7d43ce8af34e83323e.tar.gz
Merge pull request #3086 from ManifoldFR/urdfparser-patch
UrdfParser: make unspecifed axis warning print single line
-rw-r--r--examples/Importers/ImportURDFDemo/UrdfParser.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/examples/Importers/ImportURDFDemo/UrdfParser.cpp b/examples/Importers/ImportURDFDemo/UrdfParser.cpp
index 2765dff27..3348665d5 100644
--- a/examples/Importers/ImportURDFDemo/UrdfParser.cpp
+++ b/examples/Importers/ImportURDFDemo/UrdfParser.cpp
@@ -1517,8 +1517,9 @@ bool UrdfParser::parseJoint(UrdfJoint& joint, XMLElement* config, ErrorLogger* l
XMLElement* axis_xml = config->FirstChildElement("axis");
if (!axis_xml)
{
- logger->reportWarning("urdfdom: no axis elemement for Joint, defaulting to (1,0,0) axis");
- logger->reportWarning(joint.m_name.c_str());
+ std::string msg("urdfdom: no axis element for Joint, defaulting to (1,0,0) axis");
+ msg = msg + " " + joint.m_name + "\n";
+ logger->reportWarning(msg.c_str());
joint.m_localJointAxis.setValue(1, 0, 0);
}
else
@@ -1584,8 +1585,9 @@ bool UrdfParser::parseJoint(UrdfJoint& joint, XMLElement* config, ErrorLogger* l
XMLElement* axis_xml = config->FirstChildElement("axis");
if (!axis_xml)
{
- logger->reportWarning("urdfdom: no axis elemement for Joint, defaulting to (1,0,0) axis");
- logger->reportWarning(joint.m_name.c_str());
+ std::string msg("urdfdom: no axis element for Joint, defaulting to (1,0,0) axis");
+ msg = msg + " " + joint.m_name + "\n";
+ logger->reportWarning(msg.c_str());
joint.m_localJointAxis.setValue(1, 0, 0);
}
else