AuroraMiddleware/bullet3
1
0
Fork 0
mirror of https://github.com/bulletphysics/bullet3 synced 2024-12-12 12:50:08 +00:00
Code Issues Releases Wiki Activity

clean up urdf mesh input names

Browse Source
This commit is contained in:
jingyuc 2021-11-22 13:26:46 -05:00
parent 4c9d6275aa
commit bc8adf7bd1
4 changed files with 9924 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/reduced_torus/reduced_torus.urdf
View File

@ -9,6 +9,6 @@
<cfm value= "0.2"/>
<friction value= "0.5"/>
<damping_coefficient value="0.00001"/>
<visual filename="torus_mesh.vtk"/>
<visual filename="torus_mesh_visual.vtk"/>
</reduced_deformable>
</robot>

9917
data/reduced_torus/torus_mesh_visual.vtk Normal file
View File

File diff suppressed because it is too large Load Diff

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

@ -1288,7 +1288,7 @@ bool UrdfParser::parseReducedDeformable(UrdfModel& model, tinyxml2::XMLElement*
const char* name = config->Attribute("name");
if (!name)
{
logger->reportError("Deformable with no name");
logger->reportError("Reduced deformable with no name");
return false;
}
reduced_deformable.m_name = name;
@ -1422,6 +1422,7 @@ bool UrdfParser::parseReducedDeformable(UrdfModel& model, tinyxml2::XMLElement*
return false;
}
// collision mesh is optional
XMLElement* col_xml = config->FirstChildElement("collision");
if (col_xml)
{
@ -1430,9 +1431,9 @@ bool UrdfParser::parseReducedDeformable(UrdfModel& model, tinyxml2::XMLElement*
logger->reportError("expected a filename for collision geoemtry");
return false;
}
fn = vis_xml->Attribute("filename");
fn = col_xml->Attribute("filename");
success = UrdfFindMeshFile(m_fileIO,
model.m_sourceFile, fn, sourceFileLocation(vis_xml),
model.m_sourceFile, fn, sourceFileLocation(col_xml),
&reduced_deformable.m_simFileName, &out_type);
if (!success)

4
examples/Importers/ImportURDFDemo/UrdfParser.h
View File

@ -264,11 +264,11 @@ struct UrdfReducedDeformable
UrdfReducedDeformable()
: m_numModes(1),
m_mass(1),
m_stiffnessScale(100),
m_erp(0.2), // generally, 0.2 is a good value for erp and cfm
m_cfm(0.2),
m_friction(0),
m_mass(1),
m_stiffnessScale(100),
m_collisionMargin(0.02),
m_damping(0),
m_visualFileName(""),