Joseph Mirabel authored 7 years ago and Joseph Mirabel committed 7 years ago

Conflicts:
	CMakeLists.txt
	include/hpp/fcl/ccd/interval_matrix.h
	include/hpp/fcl/ccd/interval_vector.h
	include/hpp/fcl/ccd/motion.h
	include/hpp/fcl/ccd/taylor_matrix.h
	include/hpp/fcl/ccd/taylor_vector.h
	include/hpp/fcl/collision_data.h
	include/hpp/fcl/math/vec_3fx.h
	include/hpp/fcl/traversal/traversal_node_bvhs.h
	src/CMakeLists.txt
	src/ccd/interval_matrix.cpp
	src/ccd/motion.cpp
	src/ccd/taylor_matrix.cpp
	src/narrowphase/gjk_libccd.cpp
	src/traversal/traversal_node_bvhs.cpp
	test/CMakeLists.txt
	test/test_fcl_geometric_shapes.cpp

  - this feature is implemented in a more general way in HPP.

Fix assimp version lower than 2.9.0 + add missing linkage

Continue work of fvalenza for mac #14

Added functions to convert an assimp scene to a mesh. hpp-fcl is compatible with 2.0 < assimp < 3.0.0

Sync devel branch with master + update test to properly work with boost python