Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2024-11-22 05:05:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for radd/rsub/rmul/rdiv operator convenience wrappers

Browse Source
This commit is contained in:
Wenzel Jakob 2015-09-11 17:09:47 +02:00
parent 38ffb5232f
commit 73a50a0441
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
example/example3.cpp
View File

@ -42,10 +42,16 @@ public:
Vector2& operator-=(const Vector2 &v) { x -= v.x; y -= v.y; return *this; } Vector2& operator-=(const Vector2 &v) { x -= v.x; y -= v.y; return *this; }
Vector2& operator*=(float v) { x *= v; y *= v; return *this; } Vector2& operator*=(float v) { x *= v; y *= v; return *this; }
Vector2& operator/=(float v) { x /= v; y /= v; return *this; } Vector2& operator/=(float v) { x /= v; y /= v; return *this; }
friend Vector2 operator+(float f, const Vector2 &v) { return Vector2(f + v.x, f + v.y); }
friend Vector2 operator-(float f, const Vector2 &v) { return Vector2(f - v.x, f - v.y); }
friend Vector2 operator*(float f, const Vector2 &v) { return Vector2(f * v.x, f * v.y); }
friend Vector2 operator/(float f, const Vector2 &v) { return Vector2(f / v.x, f / v.y); }
private: private:
float x, y; float x, y;
}; };
void init_ex3(py::module &m) { void init_ex3(py::module &m) {
py::class_<Vector2>(m, "Vector2") py::class_<Vector2>(m, "Vector2")
.def(py::init<float, float>()) .def(py::init<float, float>())
@ -59,6 +65,10 @@ void init_ex3(py::module &m) {
.def(py::self -= py::self) .def(py::self -= py::self)
.def(py::self *= float()) .def(py::self *= float())
.def(py::self /= float()) .def(py::self /= float())
.def(float() + py::self)
.def(float() - py::self)
.def(float() * py::self)
.def(float() / py::self)
.def("__str__", &Vector2::toString); .def("__str__", &Vector2::toString);
m.attr("Vector") = m.attr("Vector2"); m.attr("Vector") = m.attr("Vector2");

4
example/example3.py
View File

@ -16,6 +16,10 @@ print("v1-8 = " + str(v1-8))
print("v1+8 = " + str(v1+8)) print("v1+8 = " + str(v1+8))
print("v1*8 = " + str(v1*8)) print("v1*8 = " + str(v1*8))
print("v1/8 = " + str(v1/8)) print("v1/8 = " + str(v1/8))
print("8-v1 = " + str(8-v1))
print("8+v1 = " + str(8+v1))
print("8*v1 = " + str(8*v1))
print("8/v1 = " + str(8/v1))
v1 += v2 v1 += v2
v1 *= 2 v1 *= 2

4
include/pybind/operators.h
View File

@ -67,8 +67,8 @@ template <typename B, typename L, typename R> struct op_impl<op_##id, op_l, B, L
}; \ }; \
template <typename B, typename L, typename R> struct op_impl<op_##id, op_r, B, L, R> { \ template <typename B, typename L, typename R> struct op_impl<op_##id, op_r, B, L, R> { \
static char const* name() { return "__" #rid "__"; } \ static char const* name() { return "__" #rid "__"; } \
static auto execute(const L &l, const R &r) -> decltype(expr) { return (expr); } \ static auto execute(const R &r, const L &l) -> decltype(expr) { return (expr); } \
static B execute_cast(const L &l, const R &r) { return B(expr); } \ static B execute_cast(const R &r, const L &l) { return B(expr); } \
}; \ }; \
inline op_<op_##id, op_l, self_t, self_t> op(const self_t &, const self_t &) { \ inline op_<op_##id, op_l, self_t, self_t> op(const self_t &, const self_t &) { \
return op_<op_##id, op_l, self_t, self_t>(); \ return op_<op_##id, op_l, self_t, self_t>(); \