From 2755753e43d99fda878a8cb9e981afdc77d928a5 Mon Sep 17 00:00:00 2001 From: Chris Lalancette Date: Tue, 14 Feb 2017 11:23:52 -0500 Subject: [PATCH] Remove old gazebo settings. Based on an initial patch from YoheiKakiuchi, just totally remove old Gazebo 1.0 settings, as they are never used and almost certainly will never be used. Signed-off-by: Chris Lalancette --- collada_urdf/src/collada_to_urdf.cpp | 40 +--------------------------- 1 file changed, 1 insertion(+), 39 deletions(-) diff --git a/collada_urdf/src/collada_to_urdf.cpp b/collada_urdf/src/collada_to_urdf.cpp index 14e9741..616f58a 100644 --- a/collada_urdf/src/collada_to_urdf.cpp +++ b/collada_urdf/src/collada_to_urdf.cpp @@ -31,10 +31,8 @@ #include #include -#undef GAZEBO_1_0 #undef GAZEBO_1_3 -//#define GAZEBO_1_0 #define GAZEBO_1_3 using namespace urdf; @@ -385,17 +383,6 @@ void addChildLinkNamesXML(urdf::LinkConstSharedPtr link, ofstream& os) } os << " " << endl; -#ifdef GAZEBO_1_0 - if ( add_gazebo_description ) { - os << " name << "\">" << endl; - os << " Gazebo/Grey" << endl; - //os << " 0.9" << endl; - //os << " 0.9" << endl; - os << " false" << endl; - os << " " << endl; - } -#endif - #ifdef GAZEBO_1_3 if ( add_gazebo_description ) { os << " name << "\">" << endl; @@ -507,37 +494,12 @@ void printTreeXML(urdf::LinkConstSharedPtr link, string name, string file) os.open(file.c_str()); os << "" << endl; os << "" << endl; + os << " xmlns:xi=\"http://www.w3.org/2001/XInclude\">" << endl; addChildLinkNamesXML(link, os); addChildJointNamesXML(link, os); - if ( add_gazebo_description ) { -#ifdef GAZEBO_1_0 - // old gazebo (gazebo on ROS Fuerte) - os << " " << endl; - os << " " << endl; - os << " true" << endl; - os << " 1000.0" << endl; - os << " " << endl; - os << " " << endl; -#endif - } - os << "" << endl; os.close(); }