Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Python bindings: move definition of dot product to generic implementation

Browse Source
This commit is contained in:
Janis Born
2015-11-25 15:16:41 +01:00
parent b8d304a453
commit 4ef152ac2e
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Python/Vector.hh
View File

@@ -72,9 +72,6 @@ void defInitMod(class_< OpenMesh::VectorT<Scalar, 2> > &classVector) {
.def("__init__", make_constructor(&Factory<Scalar>::vec2_default)) .def("__init__", make_constructor(&Factory<Scalar>::vec2_default))
.def("__init__", make_constructor(&Factory<Scalar>::vec2_user_defined)) .def("__init__", make_constructor(&Factory<Scalar>::vec2_user_defined))
; ;
typedef OpenMesh::VectorT<Scalar, 2> Vector;
def("dot", &Vector::operator|);
} }
template<class Scalar> template<class Scalar>
void defInitMod(class_< OpenMesh::VectorT<Scalar, 3> > &classVector) { void defInitMod(class_< OpenMesh::VectorT<Scalar, 3> > &classVector) {
@@ -85,9 +82,6 @@ void defInitMod(class_< OpenMesh::VectorT<Scalar, 3> > &classVector) {
; ;
def("cross", &Factory<Scalar>::Vector3::operator%); def("cross", &Factory<Scalar>::Vector3::operator%);
typedef OpenMesh::VectorT<Scalar, 3> Vector;
def("dot", &Vector::operator|);
} }
template<class Scalar> template<class Scalar>
void defInitMod(class_< OpenMesh::VectorT<Scalar, 4> > &classVector) { void defInitMod(class_< OpenMesh::VectorT<Scalar, 4> > &classVector) {
@@ -95,9 +89,6 @@ void defInitMod(class_< OpenMesh::VectorT<Scalar, 4> > &classVector) {
.def("__init__", make_constructor(&Factory<Scalar>::vec4_default)) .def("__init__", make_constructor(&Factory<Scalar>::vec4_default))
.def("__init__", make_constructor(&Factory<Scalar>::vec4_user_defined)) .def("__init__", make_constructor(&Factory<Scalar>::vec4_user_defined))
; ;
typedef OpenMesh::VectorT<Scalar, 4> Vector;
def("dot", &Vector::operator|);
} }
/** /**
@@ -149,6 +140,7 @@ void expose_vec(const char *_name) {
.def(self < self) .def(self < self)
#if (_MSC_VER >= 1900 || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)) && !defined(OPENMESH_VECTOR_LEGACY) #if (_MSC_VER >= 1900 || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)) && !defined(OPENMESH_VECTOR_LEGACY)
.def("dot", &Vector::template operator|<Scalar>)
.def("norm", &Vector::template norm<Scalar>) .def("norm", &Vector::template norm<Scalar>)
.def("length", &Vector::template length<Scalar>) .def("length", &Vector::template length<Scalar>)
.def("sqrnorm", &Vector::template sqrnorm<Scalar>) .def("sqrnorm", &Vector::template sqrnorm<Scalar>)
@@ -156,6 +148,7 @@ void expose_vec(const char *_name) {
.def("normalized", &Vector::template normalized<Scalar>) .def("normalized", &Vector::template normalized<Scalar>)
.def("normalize_cond", &Vector::template normalize_cond<Scalar>, return_internal_reference<>()) .def("normalize_cond", &Vector::template normalize_cond<Scalar>, return_internal_reference<>())
#else #else
.def("dot", &Vector::operator|)
.def("norm", &Vector::norm) .def("norm", &Vector::norm)
.def("length", &Vector::length) .def("length", &Vector::length)
.def("sqrnorm", &Vector::sqrnorm) .def("sqrnorm", &Vector::sqrnorm)