Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
pybind11
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
open
pybind11
Commits
73a50a04
Commit
73a50a04
authored
Sep 11, 2015
by
Wenzel Jakob
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for radd/rsub/rmul/rdiv operator convenience wrappers
parent
38ffb523
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
2 deletions
+16
-2
example/example3.cpp
+10
-0
example/example3.py
+4
-0
include/pybind/operators.h
+2
-2
No files found.
example/example3.cpp
View file @
73a50a04
...
...
@@ -42,10 +42,16 @@ public:
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
;
}
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
:
float
x
,
y
;
};
void
init_ex3
(
py
::
module
&
m
)
{
py
::
class_
<
Vector2
>
(
m
,
"Vector2"
)
.
def
(
py
::
init
<
float
,
float
>
())
...
...
@@ -59,6 +65,10 @@ void init_ex3(py::module &m) {
.
def
(
py
::
self
-=
py
::
self
)
.
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
);
m
.
attr
(
"Vector"
)
=
m
.
attr
(
"Vector2"
);
...
...
example/example3.py
View file @
73a50a04
...
...
@@ -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
(
"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
*=
2
...
...
include/pybind/operators.h
View file @
73a50a04
...
...
@@ -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> { \
static char const* name() { return "__" #rid "__"; } \
static auto execute(const
L &l, const R &r
) -> decltype(expr) { return (expr); } \
static B execute_cast(const
L &l, const R &r
) { return B(expr); } \
static auto execute(const
R &r, const L &l
) -> decltype(expr) { return (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 &) { \
return op_<op_##id, op_l, self_t, self_t>(); \
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment