From 17b197a0350ca3cc6371ceed70a0ec95382f4d60 Mon Sep 17 00:00:00 2001 From: Rohan Budhiraja <budhiraja@laas.fr> Date: Wed, 5 Oct 2016 11:56:40 +0200 Subject: [PATCH] [wip/sot-dynamic-pinocchio-v3] remove patches --- sot-dynamic-pinocchio-v3/patches/patch-aa | 13 ------------- sot-dynamic-pinocchio-v3/patches/patch-ab | 14 -------------- 2 files changed, 27 deletions(-) delete mode 100644 sot-dynamic-pinocchio-v3/patches/patch-aa delete mode 100644 sot-dynamic-pinocchio-v3/patches/patch-ab diff --git a/sot-dynamic-pinocchio-v3/patches/patch-aa b/sot-dynamic-pinocchio-v3/patches/patch-aa deleted file mode 100644 index 43183b73..00000000 --- a/sot-dynamic-pinocchio-v3/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -diff --git unitTesting/CMakeLists.txt unitTesting/CMakeLists.txt -index af2cdb9..f9b4595 100644 ---- unitTesting/CMakeLists.txt -+++ unitTesting/CMakeLists.txt -@@ -59,7 +59,7 @@ FOREACH(test ${tests}) - TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} - zmpreffromcom - force-compensation -- integrator-force-exact -+ #integrator-force-exact - mass-apparent - integrator-force-rk4 - integrator-force diff --git a/sot-dynamic-pinocchio-v3/patches/patch-ab b/sot-dynamic-pinocchio-v3/patches/patch-ab deleted file mode 100644 index 0d895ce3..00000000 --- a/sot-dynamic-pinocchio-v3/patches/patch-ab +++ /dev/null @@ -1,14 +0,0 @@ -Hack: Take the root joint as freeflyer. -(This patch assumes that the robot being loaded has no fixed root joint.) - ---- src/sot-dynamic.cpp 2016-04-15 15:25:59.000000000 +0200 -+++ src/sot-dynamic.cpp 2016-09-08 17:30:26.605146524 +0200 -@@ -410,7 +410,7 @@ - void Dynamic::parseUrdfFile() { - sotDEBUGIN(15); - if (m_urdfPath.empty()) std::cerr<<"Set input file first"<<std::endl; -- m_model = se3::urdf::buildModel(this->m_urdfPath, false); -+ m_model = se3::urdf::buildModel(this->m_urdfPath, se3::JointModelFreeFlyer(), false); - if (m_data) delete m_data; - m_data = new se3::Data(m_model); - init=true; -- GitLab