Verified Commit bbd52779 authored by Justin Carpentier's avatar Justin Carpentier
Browse files

python: fix rebasing

parent c8088f71
......@@ -92,13 +92,8 @@ void exposeBVHModel (const std::string& bvname)
std::string type = "BVHModel" + bvname;
class_ <BVHModel_t, bases<BVHModelBase>, shared_ptr<BVHModel_t> >
<<<<<<< HEAD
(type.c_str(), doxygen::class_doc<BVHModel_t>(), no_init)
.def (dv::init<BVHModel_t>())
=======
(type.c_str(), doxygen::class_doc<BVHModel_t>(),
init<>(boost::python::arg("self"),doxygen::constructor_doc<BVHModel_t>()))
>>>>>>> python/doc: add missing 'self"
;
}
......@@ -141,22 +136,22 @@ void exposeShapes ()
class_ <Box, bases<ShapeBase>, shared_ptr<Box> >
("Box", doxygen::class_doc<ShapeBase>(), no_init)
.def (dv::init<Box>(arg("self")))
.def (dv::init<Box, FCL_REAL,FCL_REAL,FCL_REAL>(args("self","x","y","z")))
.def (dv::init<Box, const Vec3f&>(args("self","side")))
.def (dv::init<Box>())
.def (dv::init<Box, FCL_REAL,FCL_REAL,FCL_REAL>())
.def (dv::init<Box, const Vec3f&>())
.DEF_RW_CLASS_ATTRIB(Box,halfSide)
;
class_ <Capsule, bases<ShapeBase>, shared_ptr<Capsule> >
("Capsule", doxygen::class_doc<Capsule>(), no_init)
.def (dv::init<Capsule, FCL_REAL, FCL_REAL>(args("self","radius","length")))
.def (dv::init<Capsule, FCL_REAL, FCL_REAL>())
.DEF_RW_CLASS_ATTRIB (Capsule, radius)
.DEF_RW_CLASS_ATTRIB (Capsule, halfLength)
;
class_ <Cone, bases<ShapeBase>, shared_ptr<Cone> >
("Cone", doxygen::class_doc<Cone>(), no_init)
.def (dv::init<Cone, FCL_REAL, FCL_REAL>(args("self","radius","length")))
.def (dv::init<Cone, FCL_REAL, FCL_REAL>())
.DEF_RW_CLASS_ATTRIB (Cone, radius)
.DEF_RW_CLASS_ATTRIB (Cone, halfLength)
;
......@@ -177,38 +172,38 @@ void exposeShapes ()
class_ <Cylinder, bases<ShapeBase>, shared_ptr<Cylinder> >
("Cylinder", doxygen::class_doc<Cylinder>(), no_init)
.def (dv::init<Cylinder, FCL_REAL, FCL_REAL>(args("self","radius","length")))
.def (dv::init<Cylinder, FCL_REAL, FCL_REAL>())
.DEF_RW_CLASS_ATTRIB (Cylinder, radius)
.DEF_RW_CLASS_ATTRIB (Cylinder, halfLength)
;
class_ <Halfspace, bases<ShapeBase>, shared_ptr<Halfspace> >
("Halfspace", doxygen::class_doc<Halfspace>(), no_init)
.def (dv::init<Halfspace, const Vec3f&, FCL_REAL>(args("self","normal","offset")))
.def (dv::init<Halfspace, FCL_REAL,FCL_REAL,FCL_REAL,FCL_REAL>(args("self","x","y","z","offset")))
.def (dv::init<Halfspace>(arg("self")))
.def (dv::init<Halfspace, const Vec3f&, FCL_REAL>())
.def (dv::init<Halfspace, FCL_REAL,FCL_REAL,FCL_REAL,FCL_REAL>())
.def (dv::init<Halfspace>())
.DEF_RW_CLASS_ATTRIB (Halfspace, n)
.DEF_RW_CLASS_ATTRIB (Halfspace, d)
;
class_ <Plane, bases<ShapeBase>, shared_ptr<Plane> >
("Plane", doxygen::class_doc<Plane>(), no_init)
.def (dv::init<Plane, const Vec3f&, FCL_REAL>(args("self","normal","offset")))
.def (dv::init<Plane, FCL_REAL,FCL_REAL,FCL_REAL,FCL_REAL>(args("self","x","y","z","offset")))
.def (dv::init<Plane>(arg("self")))
.def (dv::init<Plane, const Vec3f&, FCL_REAL>())
.def (dv::init<Plane, FCL_REAL,FCL_REAL,FCL_REAL,FCL_REAL>())
.def (dv::init<Plane>())
.DEF_RW_CLASS_ATTRIB (Plane, n)
.DEF_RW_CLASS_ATTRIB (Plane, d)
;
class_ <Sphere, bases<ShapeBase>, shared_ptr<Sphere> >
("Sphere", doxygen::class_doc<Sphere>(), no_init)
.def (dv::init<Sphere, FCL_REAL>(args("self","radius")))
.def (dv::init<Sphere, FCL_REAL>())
.DEF_RW_CLASS_ATTRIB (Sphere, radius)
;
class_ <TriangleP, bases<ShapeBase>, shared_ptr<TriangleP> >
("TriangleP", doxygen::class_doc<TriangleP>(), no_init)
.def (dv::init<TriangleP, const Vec3f&, const Vec3f&, const Vec3f&>(args("self","a","b","c")))
.def (dv::init<TriangleP, const Vec3f&, const Vec3f&, const Vec3f&>())
.DEF_RW_CLASS_ATTRIB (TriangleP, a)
.DEF_RW_CLASS_ATTRIB (TriangleP, b)
.DEF_RW_CLASS_ATTRIB (TriangleP, c)
......
......@@ -82,8 +82,8 @@ void exposeCollisionAPI ()
{
class_ <CollisionRequest> ("CollisionRequest",
doxygen::class_doc<CollisionRequest>(), no_init)
.def (dv::init<CollisionRequest>(::boost::python::arg("self")))
.def (dv::init<CollisionRequest, const CollisionRequestFlag, size_t>(::boost::python::args("self","flag","num_max_contacts")))
.def (dv::init<CollisionRequest>())
.def (dv::init<CollisionRequest, const CollisionRequestFlag, size_t>())
.DEF_RW_CLASS_ATTRIB (CollisionRequest, num_max_contacts )
.DEF_RW_CLASS_ATTRIB (CollisionRequest, enable_contact )
.DEF_RW_CLASS_ATTRIB (CollisionRequest, enable_distance_lower_bound)
......@@ -123,7 +123,7 @@ void exposeCollisionAPI ()
{
class_ <CollisionResult> ("CollisionResult",
doxygen::class_doc<CollisionResult>(), no_init)
.def (dv::init<CollisionResult>(arg("self")))
.def (dv::init<CollisionResult>())
.DEF_CLASS_FUNC (CollisionResult, isCollision)
.DEF_CLASS_FUNC (CollisionResult, numContacts)
.DEF_CLASS_FUNC (CollisionResult, addContact)
......
Supports Markdown
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