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

Merge pull request #664 from YunfeiBai/master

Browse Source 
Check diffuse field in sdf.
This commit is contained in:
erwincoumans
2016-06-17 16:15:47 -07:00
committed by GitHub
parent 7d5dea1bac d51320be2c
commit 6369e3e12a
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -496,15 +496,17 @@ bool UrdfParser::parseVisual(UrdfModel& model, UrdfVisual& visual, TiXmlElement*
{ {
UrdfMaterial* matPtr = new UrdfMaterial; UrdfMaterial* matPtr = new UrdfMaterial;
matPtr->m_name = "mat"; matPtr->m_name = "mat";
std::string diffuseText = mat->FirstChildElement("diffuse")->GetText(); TiXmlElement *diffuse = mat->FirstChildElement("diffuse");
if (diffuse) {
std::string diffuseText = diffuse->GetText();
btVector4 rgba(1,0,0,1); btVector4 rgba(1,0,0,1);
parseVector4(rgba,diffuseText); parseVector4(rgba,diffuseText);
matPtr->m_rgbaColor = rgba; matPtr->m_rgbaColor = rgba;
matPtr->m_textureFilename = "textureTest.png";
model.m_materials.insert(matPtr->m_name.c_str(),matPtr); model.m_materials.insert(matPtr->m_name.c_str(),matPtr);
visual.m_materialName = "mat"; visual.m_materialName = "mat";
visual.m_hasLocalMaterial = true; visual.m_hasLocalMaterial = true;
} }
}
else else
{ {
// get material name // get material name