Commit 08176129 authored by Joseph Mirabel's avatar Joseph Mirabel
Browse files

[Doc] Fix generation of documentation.

parent fdbffe99
...@@ -48,6 +48,7 @@ ENDIF() ...@@ -48,6 +48,7 @@ ENDIF()
# Do not support CMake older than 2.8.12 # Do not support CMake older than 2.8.12
CMAKE_POLICY(SET CMP0022 NEW) CMAKE_POLICY(SET CMP0022 NEW)
SET(PROJECT_USE_KEYWORD_LINK_LIBRARIES TRUE) SET(PROJECT_USE_KEYWORD_LINK_LIBRARIES TRUE)
SET(DOXYGEN_USE_TEMPLATE_CSS TRUE)
# Check if the submodule cmake have been initialized # Check if the submodule cmake have been initialized
IF(NOT EXISTS "${CMAKE_SOURCE_DIR}/cmake/base.cmake") IF(NOT EXISTS "${CMAKE_SOURCE_DIR}/cmake/base.cmake")
......
FILE_PATTERNS = *.h *.hh *.hxx FILE_PATTERNS = *.h *.hh *.hxx
GENERATE_XML = YES GENERATE_XML = YES
EXPAND_ONLY_PREDEF = NO
...@@ -232,7 +232,7 @@ class MemberDef(Reference): ...@@ -232,7 +232,7 @@ class MemberDef(Reference):
return ", ".join([ d['type'] + " " + d['name'] for d in self.template_params ]) return ", ".join([ d['type'] + " " + d['name'] for d in self.template_params ])
def s_rettype (self): def s_rettype (self):
assert not self.special assert not self.special, "Member {} ({}) is a special function and no return type".format(self.name, self.id)
return self.xmlToType(self.rettype) return self.xmlToType(self.rettype)
def s_name (self): def s_name (self):
......
...@@ -461,39 +461,33 @@ namespace fcl ...@@ -461,39 +461,33 @@ namespace fcl
const Vec3f& P3, const Transform3f& tf2, FCL_REAL& distance, const Vec3f& P3, const Transform3f& tf2, FCL_REAL& distance,
Vec3f& p1, Vec3f& p2, Vec3f& normal) const; Vec3f& p1, Vec3f& p2, Vec3f& normal) const;
#define HPP_FCL_DECLARE_SHAPE_DISTANCE(Shape1,Shape2) \ #define HPP_FCL_DECLARE_SHAPE_DISTANCE(Shape1,Shape2,doc) \
/** @brief Fast implementation for Shape1-Shape2 distance. doc */ \
template<> \ template<> \
bool GJKSolver::shapeDistance<Shape1, Shape2> \ bool GJKSolver::shapeDistance<Shape1, Shape2> \
(const Shape1& s1, const Transform3f& tf1, \ (const Shape1& s1, const Transform3f& tf1, \
const Shape2& s2, const Transform3f& tf2, \ const Shape2& s2, const Transform3f& tf2, \
FCL_REAL& dist, Vec3f& p1, Vec3f& p2, Vec3f& normal) const FCL_REAL& dist, Vec3f& p1, Vec3f& p2, Vec3f& normal) const
#define HPP_FCL_DECLARE_SHAPE_DISTANCE_SELF(Shape) \ #define HPP_FCL_DECLARE_SHAPE_DISTANCE_SELF(Shape,doc) \
HPP_FCL_DECLARE_SHAPE_DISTANCE(Shape,Shape) HPP_FCL_DECLARE_SHAPE_DISTANCE(Shape,Shape,doc)
#define HPP_FCL_DECLARE_SHAPE_DISTANCE_PAIR(Shape1,Shape2) \ #define HPP_FCL_DECLARE_SHAPE_DISTANCE_PAIR(Shape1,Shape2,doc) \
HPP_FCL_DECLARE_SHAPE_DISTANCE(Shape1,Shape2); \ HPP_FCL_DECLARE_SHAPE_DISTANCE(Shape1,Shape2,doc); \
HPP_FCL_DECLARE_SHAPE_DISTANCE(Shape2,Shape1) HPP_FCL_DECLARE_SHAPE_DISTANCE(Shape2,Shape1,doc)
/// @brief Fast implementation for sphere-box distance HPP_FCL_DECLARE_SHAPE_DISTANCE_PAIR(Sphere, Box,);
HPP_FCL_DECLARE_SHAPE_DISTANCE_PAIR(Sphere, Box); HPP_FCL_DECLARE_SHAPE_DISTANCE_PAIR(Sphere, Capsule,);
HPP_FCL_DECLARE_SHAPE_DISTANCE_PAIR(Sphere, Cylinder,);
/// @brief Fast implementation for sphere-capsule distance HPP_FCL_DECLARE_SHAPE_DISTANCE_SELF(Sphere,);
HPP_FCL_DECLARE_SHAPE_DISTANCE_PAIR(Sphere, Capsule);
HPP_FCL_DECLARE_SHAPE_DISTANCE_SELF(Capsule,
/// @brief Fast implementation for sphere-cylinder distance Closest points are based on two line-segments.);
HPP_FCL_DECLARE_SHAPE_DISTANCE_PAIR(Sphere, Cylinder);
HPP_FCL_DECLARE_SHAPE_DISTANCE_SELF(TriangleP,
/// @brief Fast implementation for sphere-sphere distance Do not run EPA algorithm to compute penetration depth, use a dedicated method.);
HPP_FCL_DECLARE_SHAPE_DISTANCE_SELF(Sphere);
#undef HPP_FCL_DECLARE_SHAPE_DISTANCE
/// @brief Computation of the distance result for capsule capsule. #undef HPP_FCL_DECLARE_SHAPE_DISTANCE_SELF
/// Closest points are based on two line-segments. #undef HPP_FCL_DECLARE_SHAPE_DISTANCE_PAIR
HPP_FCL_DECLARE_SHAPE_DISTANCE_SELF(Capsule);
/// Distance computation between two triangles
///
/// Do not run EPA algorithm to compute penetration depth, use a dedicated
/// method.
HPP_FCL_DECLARE_SHAPE_DISTANCE_SELF(TriangleP);
} }
} // namespace hpp } // namespace hpp
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment