Zxc200611/pocketpy
1
0
Fork 0
mirror of https://github.com/pocketpy/pocketpy synced 2025-10-20 03:20:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

add methods for vec2i and vec3i

Browse Source
This commit is contained in:
blueloveTH 2024-09-29 21:46:02 +08:00
parent 18fc4c02d3
commit b29ba90099
3 changed files with 149 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/typings/linalg.pyi
View File

@ -1,6 +1,6 @@
from typing import overload from typing import overload
class _vecD[T]: class _vecF[T]:
ONE: T ONE: T
ZERO: T ZERO: T
@ -17,7 +17,21 @@ class _vecD[T]:
def length_squared(self) -> float: ... def length_squared(self) -> float: ...
def normalize(self) -> T: ... def normalize(self) -> T: ...
class vec2(_vecD['vec2']): class _vecI[T]:
ONE: T
ZERO: T
def __add__(self, other: T) -> T: ...
def __sub__(self, other: T) -> T: ...
@overload
def __mul__(self, other: int) -> T: ...
@overload
def __mul__(self, other: T) -> T: ...
def dot(self, other: T) -> int: ...
class vec2(_vecF['vec2']):
@property @property
def x(self) -> float: ... def x(self) -> float: ...
@property @property
@ -90,7 +104,7 @@ class mat3x3:
def transform_vector(self, v: vec2) -> vec2: ... def transform_vector(self, v: vec2) -> vec2: ...
class vec2i: class vec2i(_vecI['vec2i']):
@property @property
def x(self) -> int: ... def x(self) -> int: ...
@property @property
@ -102,7 +116,7 @@ class vec2i:
def __init__(self, x: int, y: int) -> None: ... def __init__(self, x: int, y: int) -> None: ...
class vec3i: class vec3i(_vecI['vec3i']):
@property @property
def x(self) -> int: ... def x(self) -> int: ...
@property @property
@ -117,7 +131,7 @@ class vec3i:
def __init__(self, x: int, y: int, z: int) -> None: ... def __init__(self, x: int, y: int, z: int) -> None: ...
class vec3(_vecD['vec3']): class vec3(_vecF['vec3']):
@property @property
def x(self) -> float: ... def x(self) -> float: ...
@property @property

190
src/modules/linalg.c
View File

@ -88,6 +88,22 @@ c11_mat3x3* py_tomat3x3(py_Ref self) {
return py_touserdata(self); return py_touserdata(self);
} }
#define DEF_VECTOR_ELEMENT_WISE(D, T, name, op) \
static bool T##name(int argc, py_Ref argv) { \
PY_CHECK_ARGC(2); \
if(argv[1].type != tp_##T) { \
py_newnotimplemented(py_retval()); \
return true; \
} \
c11_##T a = py_to##T(&argv[0]); \
c11_##T b = py_to##T(&argv[1]); \
c11_##T res; \
for(int i = 0; i < D; i++) \
res.data[i] = a.data[i] op b.data[i]; \
py_new##T(py_retval(), res); \
return true; \
}
#define DEF_VECTOR_OPS(D) \ #define DEF_VECTOR_OPS(D) \
static bool vec##D##__new__(int argc, py_Ref argv) { \ static bool vec##D##__new__(int argc, py_Ref argv) { \
PY_CHECK_ARGC(D + 1); \ PY_CHECK_ARGC(D + 1); \
@ -98,34 +114,8 @@ c11_mat3x3* py_tomat3x3(py_Ref self) {
py_newvec##D(py_retval(), res); \ py_newvec##D(py_retval(), res); \
return true; \ return true; \
} \ } \
static bool vec##D##__add__(int argc, py_Ref argv) { \ DEF_VECTOR_ELEMENT_WISE(D, vec##D, __add__, +) \
PY_CHECK_ARGC(2); \ DEF_VECTOR_ELEMENT_WISE(D, vec##D, __sub__, -) \
if(argv[1].type != tp_vec##D) { \
py_newnotimplemented(py_retval()); \
return true; \
} \
c11_vec##D a = py_tovec##D(&argv[0]); \
c11_vec##D b = py_tovec##D(&argv[1]); \
c11_vec##D res; \
for(int i = 0; i < D; i++) \
res.data[i] = a.data[i] + b.data[i]; \
py_newvec##D(py_retval(), res); \
return true; \
} \
static bool vec##D##__sub__(int argc, py_Ref argv) { \
PY_CHECK_ARGC(2); \
if(argv[1].type != tp_vec##D) { \
py_newnotimplemented(py_retval()); \
return true; \
} \
c11_vec##D a = py_tovec##D(&argv[0]); \
c11_vec##D b = py_tovec##D(&argv[1]); \
c11_vec##D res; \
for(int i = 0; i < D; i++) \
res.data[i] = a.data[i] - b.data[i]; \
py_newvec##D(py_retval(), res); \
return true; \
} \
static bool vec##D##__mul__(int argc, py_Ref argv) { \ static bool vec##D##__mul__(int argc, py_Ref argv) { \
PY_CHECK_ARGC(2); \ PY_CHECK_ARGC(2); \
c11_vec##D res; \ c11_vec##D res; \
@ -235,6 +225,73 @@ c11_mat3x3* py_tomat3x3(py_Ref self) {
DEF_VECTOR_OPS(2) DEF_VECTOR_OPS(2)
DEF_VECTOR_OPS(3) DEF_VECTOR_OPS(3)
#define DEF_VECTOR_INT_OPS(D) \
static bool vec##D##i__new__(int argc, py_Ref argv) { \
PY_CHECK_ARGC(D + 1); \
c11_vec##D##i res; \
for(int i = 0; i < D; i++) { \
if(!py_checkint(&argv[i + 1])) return false; \
res.data[i] = py_toint(&argv[i + 1]); \
} \
py_newvec##D##i(py_retval(), res); \
return true; \
} \
DEF_VECTOR_ELEMENT_WISE(D, vec##D##i, __add__, +) \
DEF_VECTOR_ELEMENT_WISE(D, vec##D##i, __sub__, -) \
static bool vec##D##i__mul__(int argc, py_Ref argv) { \
PY_CHECK_ARGC(2); \
c11_vec##D##i res; \
switch(argv[1].type) { \
case tp_vec##D##i: { \
c11_vec##D##i a = py_tovec##D##i(&argv[0]); \
c11_vec##D##i b = py_tovec##D##i(&argv[1]); \
for(int i = 0; i < D; i++) \
res.data[i] = a.data[i] * b.data[i]; \
py_newvec##D##i(py_retval(), res); \
return true; \
} \
case tp_int: { \
c11_vec##D##i a = py_tovec##D##i(&argv[0]); \
py_i64 b = argv[1]._i64; \
for(int i = 0; i < D; i++) \
res.data[i] = a.data[i] * b; \
py_newvec##D##i(py_retval(), res); \
return true; \
} \
default: py_newnotimplemented(py_retval()); return true; \
} \
} \
static bool vec##D##i__eq__(int argc, py_Ref argv) { \
PY_CHECK_ARGC(2); \
if(argv[1].type != tp_vec##D##i) { \
py_newnotimplemented(py_retval()); \
return true; \
} \
c11_vec##D##i lhs = py_tovec##D##i(&argv[0]); \
c11_vec##D##i rhs = py_tovec##D##i(&argv[1]); \
bool ok = true; \
for(int i = 0; i < D; i++) { \
if(lhs.data[i] != rhs.data[i]) ok = false; \
} \
py_newbool(py_retval(), ok); \
return true; \
} \
DEFINE_BOOL_NE(vec##D##i, vec##D##i__eq__) \
static bool vec##D##i##_dot(int argc, py_Ref argv) { \
PY_CHECK_ARGC(2); \
PY_CHECK_ARG_TYPE(1, tp_vec##D##i); \
c11_vec##D##i a = py_tovec##D##i(&argv[0]); \
c11_vec##D##i b = py_tovec##D##i(&argv[1]); \
py_i64 sum = 0; \
for(int i = 0; i < D; i++) \
sum += a.data[i] * b.data[i]; \
py_newint(py_retval(), sum); \
return true; \
}
DEF_VECTOR_INT_OPS(2)
DEF_VECTOR_INT_OPS(3)
static bool vec2__repr__(int argc, py_Ref argv) { static bool vec2__repr__(int argc, py_Ref argv) {
PY_CHECK_ARGC(1); PY_CHECK_ARGC(1);
char buf[64]; char buf[64];
@ -676,17 +733,6 @@ static bool mat3x3_transform_vector(int argc, py_Ref argv) {
} }
/* vec2i */ /* vec2i */
static bool vec2i__new__(int argc, py_Ref argv) {
PY_CHECK_ARGC(3);
PY_CHECK_ARG_TYPE(1, tp_int);
PY_CHECK_ARG_TYPE(2, tp_int);
py_newvec2i(py_retval(),
(c11_vec2i){
{argv[1]._i64, argv[2]._i64}
});
return true;
}
DEFINE_VEC_FIELD(vec2i, int, py_i64, x) DEFINE_VEC_FIELD(vec2i, int, py_i64, x)
DEFINE_VEC_FIELD(vec2i, int, py_i64, y) DEFINE_VEC_FIELD(vec2i, int, py_i64, y)
@ -699,33 +745,7 @@ static bool vec2i__repr__(int argc, py_Ref argv) {
return true; return true;
} }
static bool vec2i__eq__(int argc, py_Ref argv) {
PY_CHECK_ARGC(2);
if(argv[1].type != tp_vec2i) {
py_newnotimplemented(py_retval());
return true;
}
c11_vec2i lhs = py_tovec2i(argv);
c11_vec2i rhs = py_tovec2i(&argv[1]);
py_newbool(py_retval(), lhs.x == rhs.x && lhs.y == rhs.y);
return true;
}
DEFINE_BOOL_NE(vec2i, vec2i__eq__)
/* vec3i */ /* vec3i */
static bool vec3i__new__(int argc, py_Ref argv) {
PY_CHECK_ARGC(4);
PY_CHECK_ARG_TYPE(1, tp_int);
PY_CHECK_ARG_TYPE(2, tp_int);
PY_CHECK_ARG_TYPE(3, tp_int);
py_newvec3i(py_retval(),
(c11_vec3i){
{argv[1]._i64, argv[2]._i64, argv[3]._i64}
});
return true;
}
static bool vec3i__repr__(int argc, py_Ref argv) { static bool vec3i__repr__(int argc, py_Ref argv) {
PY_CHECK_ARGC(1); PY_CHECK_ARGC(1);
c11_vec3i data = py_tovec3i(argv); c11_vec3i data = py_tovec3i(argv);
@ -735,20 +755,6 @@ static bool vec3i__repr__(int argc, py_Ref argv) {
return true; return true;
} }
static bool vec3i__eq__(int argc, py_Ref argv) {
PY_CHECK_ARGC(2);
if(argv[1].type != tp_vec3i) {
py_newnotimplemented(py_retval());
return true;
}
c11_vec3i lhs = py_tovec3i(argv);
c11_vec3i rhs = py_tovec3i(&argv[1]);
py_newbool(py_retval(), lhs.x == rhs.x && lhs.y == rhs.y && lhs.z == rhs.z);
return true;
}
DEFINE_BOOL_NE(vec3i, vec3i__eq__)
DEFINE_VEC_FIELD(vec3i, int, py_i64, x) DEFINE_VEC_FIELD(vec3i, int, py_i64, x)
DEFINE_VEC_FIELD(vec3i, int, py_i64, y) DEFINE_VEC_FIELD(vec3i, int, py_i64, y)
DEFINE_VEC_FIELD(vec3i, int, py_i64, z) DEFINE_VEC_FIELD(vec3i, int, py_i64, z)
@ -870,16 +876,32 @@ void pk__add_module_linalg() {
/* vec2i */ /* vec2i */
py_bindmagic(vec2i, __new__, vec2i__new__); py_bindmagic(vec2i, __new__, vec2i__new__);
py_bindmagic(vec2i, __repr__, vec2i__repr__); py_bindmagic(vec2i, __repr__, vec2i__repr__);
py_bindmagic(vec2i, __add__, vec2i__add__);
py_bindmagic(vec2i, __sub__, vec2i__sub__);
py_bindmagic(vec2i, __mul__, vec2i__mul__);
py_bindmagic(vec2i, __eq__, vec2i__eq__); py_bindmagic(vec2i, __eq__, vec2i__eq__);
py_bindmagic(vec2i, __ne__, vec2i__ne__); py_bindmagic(vec2i, __ne__, vec2i__ne__);
py_bindproperty(vec2i, "x", vec2i__x, NULL); py_bindproperty(vec2i, "x", vec2i__x, NULL);
py_bindproperty(vec2i, "y", vec2i__y, NULL); py_bindproperty(vec2i, "y", vec2i__y, NULL);
py_bindmethod(vec2i, "with_x", vec2i__with_x); py_bindmethod(vec2i, "with_x", vec2i__with_x);
py_bindmethod(vec2i, "with_y", vec2i__with_y); py_bindmethod(vec2i, "with_y", vec2i__with_y);
py_bindmethod(vec2i, "dot", vec2i_dot);
py_newvec2i(py_emplacedict(py_tpobject(vec2i), py_name("ZERO")),
(c11_vec2i){
{0, 0}
});
py_newvec2i(py_emplacedict(py_tpobject(vec2i), py_name("ONE")),
(c11_vec2i){
{1, 1}
});
/* vec3i */ /* vec3i */
py_bindmagic(vec3i, __new__, vec3i__new__); py_bindmagic(vec3i, __new__, vec3i__new__);
py_bindmagic(vec3i, __repr__, vec3i__repr__); py_bindmagic(vec3i, __repr__, vec3i__repr__);
py_bindmagic(vec3i, __add__, vec3i__add__);
py_bindmagic(vec3i, __sub__, vec3i__sub__);
py_bindmagic(vec3i, __mul__, vec3i__mul__);
py_bindmagic(vec3i, __eq__, vec3i__eq__); py_bindmagic(vec3i, __eq__, vec3i__eq__);
py_bindmagic(vec3i, __ne__, vec3i__ne__); py_bindmagic(vec3i, __ne__, vec3i__ne__);
py_bindproperty(vec3i, "x", vec3i__x, NULL); py_bindproperty(vec3i, "x", vec3i__x, NULL);
@ -888,6 +910,16 @@ void pk__add_module_linalg() {
py_bindmethod(vec3i, "with_x", vec3i__with_x); py_bindmethod(vec3i, "with_x", vec3i__with_x);
py_bindmethod(vec3i, "with_y", vec3i__with_y); py_bindmethod(vec3i, "with_y", vec3i__with_y);
py_bindmethod(vec3i, "with_z", vec3i__with_z); py_bindmethod(vec3i, "with_z", vec3i__with_z);
py_bindmethod(vec3i, "dot", vec3i_dot);
py_newvec3i(py_emplacedict(py_tpobject(vec3i), py_name("ZERO")),
(c11_vec3i){
{0, 0, 0}
});
py_newvec3i(py_emplacedict(py_tpobject(vec3i), py_name("ONE")),
(c11_vec3i){
{1, 1, 1}
});
/* vec3 */ /* vec3 */
py_bindmagic(vec3, __new__, vec3__new__); py_bindmagic(vec3, __new__, vec3__new__);

18
tests/80_linalg.py
View File

@ -371,3 +371,21 @@ assert vec3.ONE == vec3(1, 1, 1)
assert vec3.ZERO == vec3(0, 0, 0) assert vec3.ZERO == vec3(0, 0, 0)
# test vec3.with_xy # test vec3.with_xy
assert vec3(1, 2, 3).with_xy(vec2(4, 5)) == vec3(4, 5, 3) assert vec3(1, 2, 3).with_xy(vec2(4, 5)) == vec3(4, 5, 3)
# test vec2i and vec3i
assert vec2i.ONE == vec2i(1, 1)
assert vec2i.ZERO == vec2i(0, 0)
assert vec3i.ONE == vec3i(1, 1, 1)
assert vec3i.ZERO == vec3i(0, 0, 0)
assert vec2i(1, 2) + vec2i(3, 4) == vec2i(4, 6)
assert vec2i(1, 2) - vec2i(3, 4) == vec2i(-2, -2)
assert vec2i(1, 2) * vec2i(3, 4) == vec2i(3, 8)
assert vec2i(1, 2) * 2 == vec2i(2, 4)
assert vec2i(1, 2).dot(vec2i(3, 4)) == 11
assert vec3i(1, 2, 3) + vec3i(4, 5, 6) == vec3i(5, 7, 9)
assert vec3i(1, 2, 3) - vec3i(4, 5, 6) == vec3i(-3, -3, -3)
assert vec3i(1, 2, 3) * vec3i(4, 5, 6) == vec3i(4, 10, 18)
assert vec3i(1, 2, 3) * 2 == vec3i(2, 4, 6)
assert vec3i(1, 2, 3).dot(vec3i(4, 5, 6)) == 32