Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
openmesh-python
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OpenMesh
openmesh-python
Commits
4d9c6945
Commit
4d9c6945
authored
7 years ago
by
Alexander Dielen
Browse files
Options
Downloads
Patches
Plain Diff
added missing vector functions
parent
6350c95d
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/Bindings.cc
+6
-1
6 additions, 1 deletion
src/Bindings.cc
src/Vector.hh
+34
-23
34 additions, 23 deletions
src/Vector.hh
with
40 additions
and
24 deletions
src/Bindings.cc
+
6
−
1
View file @
4d9c6945
...
...
@@ -7,7 +7,12 @@ namespace py = pybind11;
PYBIND11_MODULE
(
openmesh
,
m
)
{
expose_vec
<
float
,
2
>
(
m
,
"Vec2f"
);
expose_vec
<
float
,
3
>
(
m
,
"Vec3f"
);
expose_vec
<
float
,
4
>
(
m
,
"Vec4f"
);
expose_vec
<
double
,
2
>
(
m
,
"Vec2d"
);
expose_vec
<
double
,
3
>
(
m
,
"Vec3d"
);
expose_vec
<
double
,
4
>
(
m
,
"Vec4d"
);
}
...
...
This diff is collapsed.
Click to expand it.
src/Vector.hh
+
34
−
23
View file @
4d9c6945
...
...
@@ -15,9 +15,7 @@ void set_item(Vector& _vec, int _index, Scalar _value) {
_vec
[
_index
]
=
_value
;
}
else
{
// TODO
// PyErr_SetString(PyExc_IndexError, "Index out of range.");
// throw_error_already_set();
throw
py
::
index_error
();
}
}
...
...
@@ -31,9 +29,7 @@ Scalar get_item(Vector& _vec, int _index) {
return
_vec
[
_index
];
}
else
{
// TODO
// PyErr_SetString(PyExc_IndexError, "Index out of range.");
// throw_error_already_set();
throw
py
::
index_error
();
}
return
0.0
;
...
...
@@ -124,6 +120,20 @@ void expose_vec(py::module& m, const char *_name) {
Vector
&
(
Vector
::*
normalize
)(
void
)
=
&
Vector
::
normalize
;
Vector
&
(
Vector
::*
normalize_cond
)(
void
)
=
&
Vector
::
normalize_cond
;
Vector
&
(
Vector
::*
op_selfmul_scalar
)(
const
Scalar
&
)
=
&
Vector
::
operator
*=
;
Vector
&
(
Vector
::*
op_selfmul_vector
)(
const
Vector
&
)
=
&
Vector
::
operator
*=
;
Vector
&
(
Vector
::*
op_selfdiv_scalar
)(
const
Scalar
&
)
=
&
Vector
::
operator
/=
;
Vector
&
(
Vector
::*
op_selfdiv_vector
)(
const
Scalar
&
)
=
&
Vector
::
operator
/=
;
Vector
&
(
Vector
::*
op_selfadd_vector
)(
const
Vector
&
)
=
&
Vector
::
operator
+=
;
Vector
&
(
Vector
::*
op_selfsub_vector
)(
const
Vector
&
)
=
&
Vector
::
operator
-=
;
Vector
(
Vector
::*
op_mul_scalar
)(
const
Scalar
&
)
const
=
&
Vector
::
operator
*
;
Vector
(
Vector
::*
op_mul_vector
)(
const
Vector
&
)
const
=
&
Vector
::
operator
*
;
Vector
(
Vector
::*
op_div_scalar
)(
const
Scalar
&
)
const
=
&
Vector
::
operator
/
;
Vector
(
Vector
::*
op_div_vector
)(
const
Vector
&
)
const
=
&
Vector
::
operator
/
;
Vector
(
Vector
::*
op_add_vector
)(
const
Vector
&
)
const
=
&
Vector
::
operator
+
;
Vector
(
Vector
::*
op_sub_vector
)(
const
Vector
&
)
const
=
&
Vector
::
operator
-
;
Vector
(
Vector
::*
op_unary_minus
)(
void
)
const
=
&
Vector
::
operator
-
;
#if (_MSC_VER >= 1800 || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)) && !defined(OPENMESH_VECTOR_LEGACY)
Vector
(
Vector
::*
normalized
)()
const
=
&
Vector
::
normalized
;
#else
...
...
@@ -136,24 +146,25 @@ void expose_vec(py::module& m, const char *_name) {
.
def
(
"__setitem__"
,
&
set_item
<
Vector
,
Scalar
>
)
.
def
(
"__getitem__"
,
&
get_item
<
Vector
,
Scalar
>
)
.
def
(
"__eq__"
,
&
Vector
::
operator
==
)
// .def(self != self)
// .def(self *= Scalar())
// .def(self /= Scalar())
// .def(self * Scalar())
// .def(Scalar() * self)
// .def(self / Scalar())
// .def(self *= self)
// .def(self /= self)
// .def(self -= self)
// .def(self += self)
// .def(self * self)
// .def(self / self)
// .def(self + self)
// .def(self - self)
// .def("__neg__", &Vector::operator-)
// .def(self | self)
.
def
(
"__ne__"
,
&
Vector
::
operator
!=
)
.
def
(
"__lt__"
,
&
Vector
::
operator
<
)
.
def
(
"__imul__"
,
op_selfmul_scalar
)
.
def
(
"__imul__"
,
op_selfmul_vector
)
.
def
(
"__itruediv__"
,
op_selfdiv_scalar
)
.
def
(
"__itruediv__"
,
op_selfdiv_vector
)
.
def
(
"__iadd__"
,
op_selfadd_vector
)
.
def
(
"__isub__"
,
op_selfsub_vector
)
.
def
(
"__mul__"
,
op_mul_scalar
)
.
def
(
"__mul__"
,
op_mul_vector
)
.
def
(
"__rmul__"
,
op_mul_scalar
)
.
def
(
"__truediv__"
,
op_div_scalar
)
.
def
(
"__truediv__"
,
op_div_vector
)
.
def
(
"__add__"
,
op_add_vector
)
.
def
(
"__sub__"
,
op_sub_vector
)
.
def
(
"__neg__"
,
op_unary_minus
)
.
def
(
"__or__"
,
dot
)
.
def
(
"vectorize"
,
&
Vector
::
vectorize
,
py
::
return_value_policy
::
reference_internal
)
// .def(self < self)
.
def
(
"dot"
,
dot
)
.
def
(
"norm"
,
norm
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment