From f07bb23278a6116f806da677f35c02c52414f089 Mon Sep 17 00:00:00 2001 From: sehoonha Date: Sat, 1 Oct 2016 20:55:03 -0400 Subject: [PATCH 1/7] read material from sdf --- dart/utils/sdf/SdfParser.cpp | 37 ++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dart/utils/sdf/SdfParser.cpp b/dart/utils/sdf/SdfParser.cpp index 5dcbd7ef0e6af..116fd537bb170 100644 --- a/dart/utils/sdf/SdfParser.cpp +++ b/dart/utils/sdf/SdfParser.cpp @@ -167,6 +167,13 @@ dynamics::ShapeNode* readShapeNode( const std::string& skelPath, const common::ResourceRetrieverPtr& retriever); + +void readMaterial( + tinyxml2::XMLElement* materialEle, + dynamics::ShapeNode* shapeNode, + const std::string& skelPath, + const common::ResourceRetrieverPtr& retriever); + void readVisualizationShapeNode( dynamics::BodyNode* bodyNode, tinyxml2::XMLElement* vizShapeNodeEle, @@ -981,6 +988,29 @@ dynamics::ShapeNode* readShapeNode( return shapeNode; } + +//============================================================================== +void readMaterial( + tinyxml2::XMLElement* materialEle, + dynamics::ShapeNode* shapeNode, + const std::string& skelPath, + const common::ResourceRetrieverPtr& retriever) { + + auto visualAspect = shapeNode->getVisualAspect(); + Eigen::VectorXd color = getValueVectorXd(materialEle, "diffuse"); + if (color.size() == 3) { + Eigen::Vector3d color3d = color; + visualAspect->setColor(color3d); + } else if (color.size() == 4) { + Eigen::Vector4d color4d = color; + visualAspect->setColor(color4d); + } else { + dterr << "[SdfParse::readMaterial] Unsupported color vector size: " + << color.size() << "\n"; + } +} + + //============================================================================== void readVisualizationShapeNode( dynamics::BodyNode* bodyNode, @@ -994,6 +1024,13 @@ void readVisualizationShapeNode( skelPath, retriever); newShapeNode->createVisualAspect(); + + // Material + if (hasElement(vizShapeNodeEle, "material")) + { + tinyxml2::XMLElement* materialEle = getElement(vizShapeNodeEle, "material"); + readMaterial(materialEle, newShapeNode, skelPath, retriever); + } } //============================================================================== From 21b8cd5af21e60337badcb333fe9a529372787c5 Mon Sep 17 00:00:00 2001 From: sehoonha Date: Sat, 1 Oct 2016 21:04:53 -0400 Subject: [PATCH 2/7] read WeldJoint from "fixed" type as in SDF specification --- dart/utils/sdf/SdfParser.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dart/utils/sdf/SdfParser.cpp b/dart/utils/sdf/SdfParser.cpp index 116fd537bb170..facfa474323dd 100644 --- a/dart/utils/sdf/SdfParser.cpp +++ b/dart/utils/sdf/SdfParser.cpp @@ -641,6 +641,10 @@ std::pair createJointAndNodePair( return skeleton->createJointAndBodyNodePair(parent, static_cast(*joint.properties), static_cast(*node.properties)); + else if (std::string("fixed") == type) + return skeleton->createJointAndBodyNodePair(parent, + static_cast(*joint.properties), + static_cast(*node.properties)); else if (std::string("free") == type) return skeleton->createJointAndBodyNodePair(parent, static_cast(*joint.properties), @@ -1030,7 +1034,7 @@ void readVisualizationShapeNode( { tinyxml2::XMLElement* materialEle = getElement(vizShapeNodeEle, "material"); readMaterial(materialEle, newShapeNode, skelPath, retriever); - } + } } //============================================================================== From 7a4ca025ca298fcfe3e67af1f7d5b3e88c610c86 Mon Sep 17 00:00:00 2001 From: sehoonha Date: Sat, 1 Oct 2016 21:56:44 -0400 Subject: [PATCH 3/7] minor error safe statements on readMaterial --- dart/utils/sdf/SdfParser.cpp | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/dart/utils/sdf/SdfParser.cpp b/dart/utils/sdf/SdfParser.cpp index facfa474323dd..94002abc0a934 100644 --- a/dart/utils/sdf/SdfParser.cpp +++ b/dart/utils/sdf/SdfParser.cpp @@ -1001,16 +1001,18 @@ void readMaterial( const common::ResourceRetrieverPtr& retriever) { auto visualAspect = shapeNode->getVisualAspect(); - Eigen::VectorXd color = getValueVectorXd(materialEle, "diffuse"); - if (color.size() == 3) { - Eigen::Vector3d color3d = color; - visualAspect->setColor(color3d); - } else if (color.size() == 4) { - Eigen::Vector4d color4d = color; - visualAspect->setColor(color4d); - } else { - dterr << "[SdfParse::readMaterial] Unsupported color vector size: " - << color.size() << "\n"; + if (hasElement(materialEle, "diffuse")) { + Eigen::VectorXd color = getValueVectorXd(materialEle, "diffuse"); + if (color.size() == 3) { + Eigen::Vector3d color3d = color; + visualAspect->setColor(color3d); + } else if (color.size() == 4) { + Eigen::Vector4d color4d = color; + visualAspect->setColor(color4d); + } else { + dterr << "[SdfParse::readMaterial] Unsupported color vector size: " + << color.size() << "\n"; + } } } From cc16b1c5125985594f615c16d38493f5877b7dfe Mon Sep 17 00:00:00 2001 From: sehoonha Date: Sat, 1 Oct 2016 22:16:00 -0400 Subject: [PATCH 4/7] remove unused parameters --- dart/utils/sdf/SdfParser.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dart/utils/sdf/SdfParser.cpp b/dart/utils/sdf/SdfParser.cpp index 94002abc0a934..c546de53575c1 100644 --- a/dart/utils/sdf/SdfParser.cpp +++ b/dart/utils/sdf/SdfParser.cpp @@ -170,9 +170,7 @@ dynamics::ShapeNode* readShapeNode( void readMaterial( tinyxml2::XMLElement* materialEle, - dynamics::ShapeNode* shapeNode, - const std::string& skelPath, - const common::ResourceRetrieverPtr& retriever); + dynamics::ShapeNode* shapeNode); void readVisualizationShapeNode( dynamics::BodyNode* bodyNode, @@ -996,9 +994,7 @@ dynamics::ShapeNode* readShapeNode( //============================================================================== void readMaterial( tinyxml2::XMLElement* materialEle, - dynamics::ShapeNode* shapeNode, - const std::string& skelPath, - const common::ResourceRetrieverPtr& retriever) { + dynamics::ShapeNode* shapeNode) { auto visualAspect = shapeNode->getVisualAspect(); if (hasElement(materialEle, "diffuse")) { @@ -1035,7 +1031,7 @@ void readVisualizationShapeNode( if (hasElement(vizShapeNodeEle, "material")) { tinyxml2::XMLElement* materialEle = getElement(vizShapeNodeEle, "material"); - readMaterial(materialEle, newShapeNode, skelPath, retriever); + readMaterial(materialEle, newShapeNode); } } From c19dea87172388c65b1a323c651e5eece198057a Mon Sep 17 00:00:00 2001 From: sehoonha Date: Sun, 2 Oct 2016 00:51:49 -0400 Subject: [PATCH 5/7] add readMaterial test with a new quadruped sdf file. --- data/sdf/quad.sdf | 867 ++++++++++++++++++++++++++++++++++++ unittests/testSdfParser.cpp | 18 + 2 files changed, 885 insertions(+) create mode 100644 data/sdf/quad.sdf diff --git a/data/sdf/quad.sdf b/data/sdf/quad.sdf new file mode 100644 index 0000000000000..3134d55a079fc --- /dev/null +++ b/data/sdf/quad.sdf @@ -0,0 +1,867 @@ + + + + + 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 + + 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 + 7.200000 + + 0.870000 + 0.000000 + 0.000000 + 0.222000 + 0.000000 + 1.080000 + + + + 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 + + + 0.600000 1.200000 0.100000 + + + + + 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 + + + 0.600000 1.200000 0.100000 + + + + 0.500000 0.600000 0.800000 + + + + + -0.300000 0.600000 -0.060000 0.000000 0.000000 0.000000 + + 0.000000 0.000000 -0.025000 + 0.012500 + + 0.000005 + 0.000000 + 0.000000 + 0.000005 + 0.000000 + 0.000005 + + + + 0.000000 0.000000 -0.025000 + + + 0.050000 0.050000 0.050000 + + + + + 0.000000 0.000000 -0.025000 + + + 0.050000 0.050000 0.050000 + + + + 0.500000 0.600000 0.800000 + + + + + -0.300000 0.600000 -0.120000 0.000000 0.000000 0.000000 + + 0.000000 0.000000 -0.200000 + 0.400000 + + 0.005667 + 0.000000 + 0.000000 + 0.005667 + 0.000000 + 0.000667 + + + + 0.000000 0.000000 -0.200000 + + + 0.100000 0.100000 0.400000 + + + + + 0.000000 0.000000 -0.200000 + + + 0.100000 0.100000 0.400000 + + + + 0.500000 0.600000 0.800000 + + + + + -0.300000 0.600000 -0.520000 0.000000 0.000000 0.000000 + + 0.000000 0.000000 -0.200000 + 0.400000 + + 0.005667 + 0.000000 + 0.000000 + 0.005667 + 0.000000 + 0.000667 + + + + 0.000000 0.000000 -0.200000 + + + 0.100000 0.100000 0.400000 + + + + + 0.000000 0.000000 -0.200000 + + + 0.100000 0.100000 0.400000 + + + + 0.500000 0.600000 0.800000 + + + + + -0.300000 0.600000 -0.920000 0.000000 0.000000 0.000000 + + 0.000000 0.000000 -0.150000 + 0.300000 + + 0.002500 + 0.000000 + 0.000000 + 0.002500 + 0.000000 + 0.000500 + + + + 0.000000 0.000000 -0.150000 + + + 0.100000 0.100000 0.300000 + + + + + 0.000000 0.000000 -0.150000 + + + 0.100000 0.100000 0.300000 + + + + 1.000000 0.900000 0.800000 + + + + 0.000000 0.000000 -0.300000 0.000000 0.000000 0.000000 + + + 0.020000 + + + + 1.000000 0.000000 0.000000 + + + + + 0.300000 0.600000 -0.060000 0.000000 0.000000 0.000000 + + 0.000000 0.000000 -0.025000 + 0.012500 + + 0.000005 + 0.000000 + 0.000000 + 0.000005 + 0.000000 + 0.000005 + + + + 0.000000 0.000000 -0.025000 + + + 0.050000 0.050000 0.050000 + + + + + 0.000000 0.000000 -0.025000 + + + 0.050000 0.050000 0.050000 + + + + 0.500000 0.600000 0.800000 + + + + + 0.300000 0.600000 -0.120000 0.000000 0.000000 0.000000 + + 0.000000 0.000000 -0.200000 + 0.400000 + + 0.005667 + 0.000000 + 0.000000 + 0.005667 + 0.000000 + 0.000667 + + + + 0.000000 0.000000 -0.200000 + + + 0.100000 0.100000 0.400000 + + + + + 0.000000 0.000000 -0.200000 + + + 0.100000 0.100000 0.400000 + + + + 0.500000 0.600000 0.800000 + + + + + 0.300000 0.600000 -0.520000 0.000000 0.000000 0.000000 + + 0.000000 0.000000 -0.200000 + 0.400000 + + 0.005667 + 0.000000 + 0.000000 + 0.005667 + 0.000000 + 0.000667 + + + + 0.000000 0.000000 -0.200000 + + + 0.100000 0.100000 0.400000 + + + + + 0.000000 0.000000 -0.200000 + + + 0.100000 0.100000 0.400000 + + + + 0.500000 0.600000 0.800000 + + + + + 0.300000 0.600000 -0.920000 0.000000 0.000000 0.000000 + + 0.000000 0.000000 -0.150000 + 0.300000 + + 0.002500 + 0.000000 + 0.000000 + 0.002500 + 0.000000 + 0.000500 + + + + 0.000000 0.000000 -0.150000 + + + 0.100000 0.100000 0.300000 + + + + + 0.000000 0.000000 -0.150000 + + + 0.100000 0.100000 0.300000 + + + + 0.300000 0.400000 0.900000 + + + + 0.000000 0.000000 -0.300000 0.000000 0.000000 0.000000 + + + 0.020000 + + + + 1.000000 0.000000 0.000000 + + + + + -0.300000 -0.600000 -0.060000 0.000000 0.000000 0.000000 + + 0.000000 0.000000 -0.025000 + 0.012500 + + 0.000005 + 0.000000 + 0.000000 + 0.000005 + 0.000000 + 0.000005 + + + + 0.000000 0.000000 -0.025000 + + + 0.050000 0.050000 0.050000 + + + + + 0.000000 0.000000 -0.025000 + + + 0.050000 0.050000 0.050000 + + + + 0.500000 0.600000 0.800000 + + + + + -0.300000 -0.600000 -0.120000 0.000000 0.000000 0.000000 + + 0.000000 0.000000 -0.200000 + 0.400000 + + 0.005667 + 0.000000 + 0.000000 + 0.005667 + 0.000000 + 0.000667 + + + + 0.000000 0.000000 -0.200000 + + + 0.100000 0.100000 0.400000 + + + + + 0.000000 0.000000 -0.200000 + + + 0.100000 0.100000 0.400000 + + + + 0.500000 0.600000 0.800000 + + + + + -0.300000 -0.600000 -0.520000 0.000000 0.000000 0.000000 + + 0.000000 0.000000 -0.200000 + 0.400000 + + 0.005667 + 0.000000 + 0.000000 + 0.005667 + 0.000000 + 0.000667 + + + + 0.000000 0.000000 -0.200000 + + + 0.100000 0.100000 0.400000 + + + + + 0.000000 0.000000 -0.200000 + + + 0.100000 0.100000 0.400000 + + + + 0.500000 0.600000 0.800000 + + + + + -0.300000 -0.600000 -0.920000 0.000000 0.000000 0.000000 + + 0.000000 0.000000 -0.150000 + 0.300000 + + 0.002500 + 0.000000 + 0.000000 + 0.002500 + 0.000000 + 0.000500 + + + + 0.000000 0.000000 -0.150000 + + + 0.100000 0.100000 0.300000 + + + + + 0.000000 0.000000 -0.150000 + + + 0.100000 0.100000 0.300000 + + + + 0.300000 0.400000 0.900000 + + + + 0.000000 0.000000 -0.300000 0.000000 0.000000 0.000000 + + + 0.020000 + + + + 1.000000 0.000000 0.000000 + + + + + 0.300000 -0.600000 -0.060000 0.000000 0.000000 0.000000 + + 0.000000 0.000000 -0.025000 + 0.012500 + + 0.000005 + 0.000000 + 0.000000 + 0.000005 + 0.000000 + 0.000005 + + + + 0.000000 0.000000 -0.025000 + + + 0.050000 0.050000 0.050000 + + + + + 0.000000 0.000000 -0.025000 + + + 0.050000 0.050000 0.050000 + + + + 0.500000 0.600000 0.800000 + + + + + 0.300000 -0.600000 -0.120000 0.000000 0.000000 0.000000 + + 0.000000 0.000000 -0.200000 + 0.400000 + + 0.005667 + 0.000000 + 0.000000 + 0.005667 + 0.000000 + 0.000667 + + + + 0.000000 0.000000 -0.200000 + + + 0.100000 0.100000 0.400000 + + + + + 0.000000 0.000000 -0.200000 + + + 0.100000 0.100000 0.400000 + + + + 0.500000 0.600000 0.800000 + + + + + 0.300000 -0.600000 -0.520000 0.000000 0.000000 0.000000 + + 0.000000 0.000000 -0.200000 + 0.400000 + + 0.005667 + 0.000000 + 0.000000 + 0.005667 + 0.000000 + 0.000667 + + + + 0.000000 0.000000 -0.200000 + + + 0.100000 0.100000 0.400000 + + + + + 0.000000 0.000000 -0.200000 + + + 0.100000 0.100000 0.400000 + + + + 0.500000 0.600000 0.800000 + + + + + 0.300000 -0.600000 -0.920000 0.000000 0.000000 0.000000 + + 0.000000 0.000000 -0.150000 + 0.300000 + + 0.002500 + 0.000000 + 0.000000 + 0.002500 + 0.000000 + 0.000500 + + + + 0.000000 0.000000 -0.150000 + + + 0.100000 0.100000 0.300000 + + + + + 0.000000 0.000000 -0.150000 + + + 0.100000 0.100000 0.300000 + + + + 0.300000 0.400000 0.900000 + + + + 0.000000 0.000000 -0.300000 0.000000 0.000000 0.000000 + + + 0.020000 + + + + 1.000000 0.000000 0.000000 + + + + + 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 + 0 + Body + 00FLHip + + 0.000000 1.000000 0.000000 + + -3.141593 + 3.141593 + 200.000000 + 12.000000 + + + + + 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 + 0 + 00FLHip + 01FLThigh + + 1.000000 0.000000 0.000000 + + -3.141593 + 3.141593 + 200.000000 + 12.000000 + + + + + 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 + 0 + 01FLThigh + 02FLShin + + 1.000000 0.000000 0.000000 + + -3.141593 + 3.141593 + 200.000000 + 12.000000 + + + + + 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 + 0 + 02FLShin + 03FLFoot + + 1.000000 0.000000 0.000000 + + -3.141593 + 3.141593 + 200.000000 + 12.000000 + + + + + 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 + 0 + Body + 04FRHip + + 0.000000 1.000000 0.000000 + + -3.141593 + 3.141593 + 200.000000 + 12.000000 + + + + + 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 + 0 + 04FRHip + 05FRThigh + + 1.000000 0.000000 0.000000 + + -3.141593 + 3.141593 + 200.000000 + 12.000000 + + + + + 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 + 0 + 05FRThigh + 06FRShin + + 1.000000 0.000000 0.000000 + + -3.141593 + 3.141593 + 200.000000 + 12.000000 + + + + + 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 + 0 + 06FRShin + 07FRFoot + + 1.000000 0.000000 0.000000 + + -3.141593 + 3.141593 + 200.000000 + 12.000000 + + + + + 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 + 0 + Body + 08BLHip + + 0.000000 1.000000 0.000000 + + -3.141593 + 3.141593 + 200.000000 + 12.000000 + + + + + 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 + 0 + 08BLHip + 09BLThigh + + 1.000000 0.000000 0.000000 + + -3.141593 + 3.141593 + 200.000000 + 12.000000 + + + + + 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 + 0 + 09BLThigh + 10BLShin + + 1.000000 0.000000 0.000000 + + -3.141593 + 3.141593 + 200.000000 + 12.000000 + + + + + 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 + 0 + 10BLShin + 11BLFoot + + 1.000000 0.000000 0.000000 + + -3.141593 + 3.141593 + 200.000000 + 12.000000 + + + + + 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 + 0 + Body + 12BRHip + + 0.000000 1.000000 0.000000 + + -3.141593 + 3.141593 + 200.000000 + 12.000000 + + + + + 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 + 0 + 12BRHip + 13BRThigh + + 1.000000 0.000000 0.000000 + + -3.141593 + 3.141593 + 200.000000 + 12.000000 + + + + + 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 + 0 + 13BRThigh + 14BRShin + + 1.000000 0.000000 0.000000 + + -3.141593 + 3.141593 + 200.000000 + 12.000000 + + + + + 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 + 0 + 14BRShin + 15BRFoot + + 1.000000 0.000000 0.000000 + + -3.141593 + 3.141593 + 200.000000 + 12.000000 + + + + + diff --git a/unittests/testSdfParser.cpp b/unittests/testSdfParser.cpp index f11086368045d..ec84f9bcf4dc1 100644 --- a/unittests/testSdfParser.cpp +++ b/unittests/testSdfParser.cpp @@ -119,6 +119,24 @@ TEST(SdfParser, ParsingSDFFiles) } } +//============================================================================== +TEST(SdfParser, ReadMaterial) +{ + std::string sdf_filename = DART_DATA_PATH"sdf/quad.sdf"; + SkeletonPtr skeleton = SdfParser::readSkeleton(sdf_filename); + EXPECT_TRUE(nullptr != skeleton); auto bodynode = skeleton->getBodyNode(0); + + for (auto shapenode : bodynode->getShapeNodes()) { + if (shapenode->has()) { + Eigen::Vector4d color = shapenode->getVisualAspect()->getRGBA(); + Eigen::Vector4d expected_color(0.5, 0.6, 0.8, 1.0); + double diff = (color - expected_color).norm(); + EXPECT_LT(diff, 1e-4); + } + } + +} + //============================================================================== int main(int argc, char* argv[]) { From 8b83059221bbf5ee81cd266b4af1ac551c88167b Mon Sep 17 00:00:00 2001 From: sehoonha Date: Sun, 2 Oct 2016 01:40:37 -0400 Subject: [PATCH 6/7] update quad... -_- --- data/sdf/quad.sdf | 128 +++++++++++++++++++++++----------------------- 1 file changed, 64 insertions(+), 64 deletions(-) diff --git a/data/sdf/quad.sdf b/data/sdf/quad.sdf index 3134d55a079fc..244ec6ad93df0 100644 --- a/data/sdf/quad.sdf +++ b/data/sdf/quad.sdf @@ -38,7 +38,7 @@ -0.300000 0.600000 -0.060000 0.000000 0.000000 0.000000 - 0.000000 0.000000 -0.025000 + 0.000000 0.000000 -0.025000 0.000000 0.000000 0.000000 0.012500 0.000005 @@ -50,7 +50,7 @@ - 0.000000 0.000000 -0.025000 + 0.000000 0.000000 -0.025000 0.000000 0.000000 0.000000 0.050000 0.050000 0.050000 @@ -58,7 +58,7 @@ - 0.000000 0.000000 -0.025000 + 0.000000 0.000000 -0.025000 0.000000 0.000000 0.000000 0.050000 0.050000 0.050000 @@ -72,7 +72,7 @@ -0.300000 0.600000 -0.120000 0.000000 0.000000 0.000000 - 0.000000 0.000000 -0.200000 + 0.000000 0.000000 -0.200000 0.000000 0.000000 0.000000 0.400000 0.005667 @@ -84,7 +84,7 @@ - 0.000000 0.000000 -0.200000 + 0.000000 0.000000 -0.200000 0.000000 0.000000 0.000000 0.100000 0.100000 0.400000 @@ -92,7 +92,7 @@ - 0.000000 0.000000 -0.200000 + 0.000000 0.000000 -0.200000 0.000000 0.000000 0.000000 0.100000 0.100000 0.400000 @@ -106,7 +106,7 @@ -0.300000 0.600000 -0.520000 0.000000 0.000000 0.000000 - 0.000000 0.000000 -0.200000 + 0.000000 0.000000 -0.200000 0.000000 0.000000 0.000000 0.400000 0.005667 @@ -118,7 +118,7 @@ - 0.000000 0.000000 -0.200000 + 0.000000 0.000000 -0.200000 0.000000 0.000000 0.000000 0.100000 0.100000 0.400000 @@ -126,7 +126,7 @@ - 0.000000 0.000000 -0.200000 + 0.000000 0.000000 -0.200000 0.000000 0.000000 0.000000 0.100000 0.100000 0.400000 @@ -140,7 +140,7 @@ -0.300000 0.600000 -0.920000 0.000000 0.000000 0.000000 - 0.000000 0.000000 -0.150000 + 0.000000 0.000000 -0.150000 0.000000 0.000000 0.000000 0.300000 0.002500 @@ -152,7 +152,7 @@ - 0.000000 0.000000 -0.150000 + 0.000000 0.000000 -0.150000 0.000000 0.000000 0.000000 0.100000 0.100000 0.300000 @@ -160,7 +160,7 @@ - 0.000000 0.000000 -0.150000 + 0.000000 0.000000 -0.150000 0.000000 0.000000 0.000000 0.100000 0.100000 0.300000 @@ -185,7 +185,7 @@ 0.300000 0.600000 -0.060000 0.000000 0.000000 0.000000 - 0.000000 0.000000 -0.025000 + 0.000000 0.000000 -0.025000 0.000000 0.000000 0.000000 0.012500 0.000005 @@ -197,7 +197,7 @@ - 0.000000 0.000000 -0.025000 + 0.000000 0.000000 -0.025000 0.000000 0.000000 0.000000 0.050000 0.050000 0.050000 @@ -205,7 +205,7 @@ - 0.000000 0.000000 -0.025000 + 0.000000 0.000000 -0.025000 0.000000 0.000000 0.000000 0.050000 0.050000 0.050000 @@ -219,7 +219,7 @@ 0.300000 0.600000 -0.120000 0.000000 0.000000 0.000000 - 0.000000 0.000000 -0.200000 + 0.000000 0.000000 -0.200000 0.000000 0.000000 0.000000 0.400000 0.005667 @@ -231,7 +231,7 @@ - 0.000000 0.000000 -0.200000 + 0.000000 0.000000 -0.200000 0.000000 0.000000 0.000000 0.100000 0.100000 0.400000 @@ -239,7 +239,7 @@ - 0.000000 0.000000 -0.200000 + 0.000000 0.000000 -0.200000 0.000000 0.000000 0.000000 0.100000 0.100000 0.400000 @@ -253,7 +253,7 @@ 0.300000 0.600000 -0.520000 0.000000 0.000000 0.000000 - 0.000000 0.000000 -0.200000 + 0.000000 0.000000 -0.200000 0.000000 0.000000 0.000000 0.400000 0.005667 @@ -265,7 +265,7 @@ - 0.000000 0.000000 -0.200000 + 0.000000 0.000000 -0.200000 0.000000 0.000000 0.000000 0.100000 0.100000 0.400000 @@ -273,7 +273,7 @@ - 0.000000 0.000000 -0.200000 + 0.000000 0.000000 -0.200000 0.000000 0.000000 0.000000 0.100000 0.100000 0.400000 @@ -287,7 +287,7 @@ 0.300000 0.600000 -0.920000 0.000000 0.000000 0.000000 - 0.000000 0.000000 -0.150000 + 0.000000 0.000000 -0.150000 0.000000 0.000000 0.000000 0.300000 0.002500 @@ -299,7 +299,7 @@ - 0.000000 0.000000 -0.150000 + 0.000000 0.000000 -0.150000 0.000000 0.000000 0.000000 0.100000 0.100000 0.300000 @@ -307,7 +307,7 @@ - 0.000000 0.000000 -0.150000 + 0.000000 0.000000 -0.150000 0.000000 0.000000 0.000000 0.100000 0.100000 0.300000 @@ -332,7 +332,7 @@ -0.300000 -0.600000 -0.060000 0.000000 0.000000 0.000000 - 0.000000 0.000000 -0.025000 + 0.000000 0.000000 -0.025000 0.000000 0.000000 0.000000 0.012500 0.000005 @@ -344,7 +344,7 @@ - 0.000000 0.000000 -0.025000 + 0.000000 0.000000 -0.025000 0.000000 0.000000 0.000000 0.050000 0.050000 0.050000 @@ -352,7 +352,7 @@ - 0.000000 0.000000 -0.025000 + 0.000000 0.000000 -0.025000 0.000000 0.000000 0.000000 0.050000 0.050000 0.050000 @@ -366,7 +366,7 @@ -0.300000 -0.600000 -0.120000 0.000000 0.000000 0.000000 - 0.000000 0.000000 -0.200000 + 0.000000 0.000000 -0.200000 0.000000 0.000000 0.000000 0.400000 0.005667 @@ -378,7 +378,7 @@ - 0.000000 0.000000 -0.200000 + 0.000000 0.000000 -0.200000 0.000000 0.000000 0.000000 0.100000 0.100000 0.400000 @@ -386,7 +386,7 @@ - 0.000000 0.000000 -0.200000 + 0.000000 0.000000 -0.200000 0.000000 0.000000 0.000000 0.100000 0.100000 0.400000 @@ -400,7 +400,7 @@ -0.300000 -0.600000 -0.520000 0.000000 0.000000 0.000000 - 0.000000 0.000000 -0.200000 + 0.000000 0.000000 -0.200000 0.000000 0.000000 0.000000 0.400000 0.005667 @@ -412,7 +412,7 @@ - 0.000000 0.000000 -0.200000 + 0.000000 0.000000 -0.200000 0.000000 0.000000 0.000000 0.100000 0.100000 0.400000 @@ -420,7 +420,7 @@ - 0.000000 0.000000 -0.200000 + 0.000000 0.000000 -0.200000 0.000000 0.000000 0.000000 0.100000 0.100000 0.400000 @@ -434,7 +434,7 @@ -0.300000 -0.600000 -0.920000 0.000000 0.000000 0.000000 - 0.000000 0.000000 -0.150000 + 0.000000 0.000000 -0.150000 0.000000 0.000000 0.000000 0.300000 0.002500 @@ -446,7 +446,7 @@ - 0.000000 0.000000 -0.150000 + 0.000000 0.000000 -0.150000 0.000000 0.000000 0.000000 0.100000 0.100000 0.300000 @@ -454,7 +454,7 @@ - 0.000000 0.000000 -0.150000 + 0.000000 0.000000 -0.150000 0.000000 0.000000 0.000000 0.100000 0.100000 0.300000 @@ -479,7 +479,7 @@ 0.300000 -0.600000 -0.060000 0.000000 0.000000 0.000000 - 0.000000 0.000000 -0.025000 + 0.000000 0.000000 -0.025000 0.000000 0.000000 0.000000 0.012500 0.000005 @@ -491,7 +491,7 @@ - 0.000000 0.000000 -0.025000 + 0.000000 0.000000 -0.025000 0.000000 0.000000 0.000000 0.050000 0.050000 0.050000 @@ -499,7 +499,7 @@ - 0.000000 0.000000 -0.025000 + 0.000000 0.000000 -0.025000 0.000000 0.000000 0.000000 0.050000 0.050000 0.050000 @@ -513,7 +513,7 @@ 0.300000 -0.600000 -0.120000 0.000000 0.000000 0.000000 - 0.000000 0.000000 -0.200000 + 0.000000 0.000000 -0.200000 0.000000 0.000000 0.000000 0.400000 0.005667 @@ -525,7 +525,7 @@ - 0.000000 0.000000 -0.200000 + 0.000000 0.000000 -0.200000 0.000000 0.000000 0.000000 0.100000 0.100000 0.400000 @@ -533,7 +533,7 @@ - 0.000000 0.000000 -0.200000 + 0.000000 0.000000 -0.200000 0.000000 0.000000 0.000000 0.100000 0.100000 0.400000 @@ -547,7 +547,7 @@ 0.300000 -0.600000 -0.520000 0.000000 0.000000 0.000000 - 0.000000 0.000000 -0.200000 + 0.000000 0.000000 -0.200000 0.000000 0.000000 0.000000 0.400000 0.005667 @@ -559,7 +559,7 @@ - 0.000000 0.000000 -0.200000 + 0.000000 0.000000 -0.200000 0.000000 0.000000 0.000000 0.100000 0.100000 0.400000 @@ -567,7 +567,7 @@ - 0.000000 0.000000 -0.200000 + 0.000000 0.000000 -0.200000 0.000000 0.000000 0.000000 0.100000 0.100000 0.400000 @@ -581,7 +581,7 @@ 0.300000 -0.600000 -0.920000 0.000000 0.000000 0.000000 - 0.000000 0.000000 -0.150000 + 0.000000 0.000000 -0.150000 0.000000 0.000000 0.000000 0.300000 0.002500 @@ -593,7 +593,7 @@ - 0.000000 0.000000 -0.150000 + 0.000000 0.000000 -0.150000 0.000000 0.000000 0.000000 0.100000 0.100000 0.300000 @@ -601,7 +601,7 @@ - 0.000000 0.000000 -0.150000 + 0.000000 0.000000 -0.150000 0.000000 0.000000 0.000000 0.100000 0.100000 0.300000 @@ -623,7 +623,7 @@ - + 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0 Body @@ -638,7 +638,7 @@ - + 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0 00FLHip @@ -653,7 +653,7 @@ - + 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0 01FLThigh @@ -668,7 +668,7 @@ - + 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0 02FLShin @@ -683,7 +683,7 @@ - + 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0 Body @@ -698,7 +698,7 @@ - + 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0 04FRHip @@ -713,7 +713,7 @@ - + 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0 05FRThigh @@ -728,7 +728,7 @@ - + 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0 06FRShin @@ -743,7 +743,7 @@ - + 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0 Body @@ -758,7 +758,7 @@ - + 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0 08BLHip @@ -773,7 +773,7 @@ - + 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0 09BLThigh @@ -788,7 +788,7 @@ - + 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0 10BLShin @@ -803,7 +803,7 @@ - + 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0 Body @@ -818,7 +818,7 @@ - + 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0 12BRHip @@ -833,7 +833,7 @@ - + 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0 13BRThigh @@ -848,7 +848,7 @@ - + 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0 14BRShin From 46c81092fe4aac7232c87604370fbeb677409301 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Sun, 2 Oct 2016 11:08:27 -0400 Subject: [PATCH 7/7] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 069d94c6b43c1..6f73cb994ae54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ * Parsers + * Added `sdf` parsing for `fixed` joint and `material` tag of visual shape: [#775](https://github.com/dartsim/dart/pull/775) * Added support of urdfdom_headers 1.0: [#766](https://github.com/dartsim/dart/pull/766) * Misc improvements and bug fixes