Skip to content
Snippets Groups Projects
Verified Commit 86699284 authored by Justin Carpentier's avatar Justin Carpentier Committed by Justin Carpentier
Browse files

[Parsers/URDF] Move .cpp file as .hxx files

The parsers will be templatized
parent 33093283
No related branches found
No related tags found
No related merge requests found
......@@ -314,6 +314,8 @@ SET(${PROJECT_NAME}_PARSERS_HEADERS
IF(URDFDOM_FOUND)
LIST(APPEND ${PROJECT_NAME}_PARSERS_HEADERS
parsers/urdf.hpp
parsers/urdf/model.hxx
parsers/urdf/geometry.hxx
parsers/urdf/utils.hpp
parsers/urdf/types.hpp
)
......
......@@ -32,16 +32,6 @@ SET(${PROJECT_NAME}_PARSERS_SOURCES
parsers/srdf.cpp
)
IF(URDFDOM_FOUND)
LIST(APPEND ${PROJECT_NAME}_PARSERS_SOURCES
parsers/urdf/model.cpp
)
LIST(APPEND ${PROJECT_NAME}_PARSERS_SOURCES
parsers/urdf/geometry.cpp
)
ENDIF(URDFDOM_FOUND)
IF(LUA5_FOUND)
LIST(APPEND ${PROJECT_NAME}_PARSERS_SOURCES
parsers/lua/lua_tables.cpp
......
//
// Copyright (c) 2015-2016 CNRS
// Copyright (c) 2015-2018 CNRS
//
// This file is part of Pinocchio
// Pinocchio is free software: you can redistribute it
......
......@@ -575,7 +575,10 @@ namespace se3
details::parseRootTree(m_root_link,m_model,root_joint,m_verbose);
}
static void run(::urdf::LinkConstSharedPtr root_link, Model & model, const JointModelVariant & root_joint, const bool verbose)
static void run(::urdf::LinkConstSharedPtr root_link,
Model & model,
const JointModelVariant & root_joint,
const bool verbose)
{
boost::apply_visitor(ParseRootTreeVisitor(root_link,model,verbose),root_joint);
}
......@@ -601,7 +604,9 @@ namespace se3
return model;
}
Model& buildModel(const std::string & filename, Model& model,const bool verbose)
Model & buildModel(const std::string & filename,
Model & model,
const bool verbose)
throw (std::invalid_argument)
{
::urdf::ModelInterfaceSharedPtr urdfTree = ::urdf::parseURDFFile (filename);
......@@ -653,7 +658,7 @@ namespace se3
return model;
}
Model& buildModel(const ::urdf::ModelInterfaceSharedPtr & urdfTree,
Model & buildModel(const ::urdf::ModelInterfaceSharedPtr & urdfTree,
const JointModelVariant & root_joint,
Model & model,
const bool verbose)
......@@ -664,7 +669,7 @@ namespace se3
return model;
}
Model& buildModel(const ::urdf::ModelInterfaceSharedPtr & urdfTree,
Model & buildModel(const ::urdf::ModelInterfaceSharedPtr & urdfTree,
Model& model,
const bool verbose)
{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment