Skip to content
Snippets Groups Projects
Commit d9f7dd3b authored by Justin Carpentier's avatar Justin Carpentier Committed by Valenza Florian
Browse files

Define SINCOS macro to define the good sincos function regarding the architecture

parent 5060a633
Branches
Tags
No related merge requests found
......@@ -40,6 +40,8 @@ ADD_REQUIRED_DEPENDENCY("urdfdom >= v0.3.0")
SET(HEADERS
exception.hpp
assert.hpp
math/sincos.hpp
tools/timer.hpp
spatial/symmetric3.hpp
spatial/se3.hpp
spatial/motion.hpp
......@@ -60,7 +62,6 @@ SET(HEADERS
multibody/visitor.hpp
multibody/parser/urdf.hpp
multibody/parser/sample-models.hpp
tools/timer.hpp
algorithm/rnea.hpp
algorithm/crba.hpp
algorithm/jacobian.hpp
......@@ -80,6 +81,7 @@ SET(HEADERS
)
MAKE_DIRECTORY("${${PROJECT_NAME}_BINARY_DIR}/include/pinocchio")
MAKE_DIRECTORY("${${PROJECT_NAME}_BINARY_DIR}/include/pinocchio/math")
MAKE_DIRECTORY("${${PROJECT_NAME}_BINARY_DIR}/include/pinocchio/spatial")
MAKE_DIRECTORY("${${PROJECT_NAME}_BINARY_DIR}/include/pinocchio/multibody")
MAKE_DIRECTORY("${${PROJECT_NAME}_BINARY_DIR}/include/pinocchio/multibody/joint")
......
Subproject commit 112f519a2efb0a86f86fac94003be15ea4e8699b
Subproject commit 2ff6e02faf16d06d442b87b680a400f083c101e0
#ifndef __math_sincos_hpp__
#define __math_sincos_hpp__
#include <cmath>
#ifdef __linux__
#define SINCOS sincos
#elif __APPLE__
#define SINCOS __sincos
#endif
#endif //#ifndef __math_sincos_hpp__
......@@ -4,6 +4,7 @@
#include "pinocchio/multibody/joint/joint-base.hpp"
#include "pinocchio/multibody/constraint.hpp"
#include "pinocchio/spatial/inertia.hpp"
#include "pinocchio/math/sincos.hpp"
#include "pinocchio/multibody/force-set.hpp"
namespace se3
......@@ -161,7 +162,7 @@ namespace se3
Eigen::Matrix3d JointRevolute<0>::cartesianRotation(const double & angle)
{
Eigen::Matrix3d R3;
double ca,sa; sincos(angle,&sa,&ca);
double ca,sa; SINCOS (angle,&sa,&ca);
R3 <<
1,0,0,
0,ca,-sa,
......@@ -172,7 +173,7 @@ namespace se3
Eigen::Matrix3d JointRevolute<1>::cartesianRotation(const double & angle)
{
Eigen::Matrix3d R3;
double ca,sa; sincos(angle,&sa,&ca);
double ca,sa; SINCOS (angle,&sa,&ca);
R3 <<
ca, 0, sa,
0, 1, 0,
......@@ -183,7 +184,7 @@ namespace se3
Eigen::Matrix3d JointRevolute<2>::cartesianRotation(const double & angle)
{
Eigen::Matrix3d R3;
double ca,sa; sincos(angle,&sa,&ca);
double ca,sa; SINCOS (angle,&sa,&ca);
R3 <<
ca,-sa,0,
sa,ca,0,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment