Zxc200611/pocketpy
1
0
Fork 0
mirror of https://github.com/pocketpy/pocketpy synced 2026-05-12 21:23:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

add __mod__

Browse Source
This commit is contained in:
blueloveTH 2026-04-29 12:54:04 +08:00
parent 826b6f40f9
commit c39d86e999
3 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/typings/vmath.pyi
View File

@ -31,6 +31,7 @@ class _vecI[T]:
@overload @overload
def __mul__(self, other: T) -> T: ... def __mul__(self, other: T) -> T: ...
def __floordiv__(self, other: int) -> T: ... def __floordiv__(self, other: int) -> T: ...
def __mod__(self, other: int) -> T: ...
def __hash__(self) -> int: ... def __hash__(self) -> int: ...

4
src/bindings/py_number.c
View File

@ -127,7 +127,7 @@ static bool number__pow__(int argc, py_Ref argv) {
static py_i64 i64_abs(py_i64 x) { return x < 0 ? -x : x; } static py_i64 i64_abs(py_i64 x) { return x < 0 ? -x : x; }
static py_i64 cpy11__fast_floor_div(py_i64 a, py_i64 b) { py_i64 cpy11__fast_floor_div(py_i64 a, py_i64 b) {
assert(b != 0); assert(b != 0);
if(a == 0) return 0; if(a == 0) return 0;
if((a < 0) == (b < 0)) { if((a < 0) == (b < 0)) {
@ -137,7 +137,7 @@ static py_i64 cpy11__fast_floor_div(py_i64 a, py_i64 b) {
} }
} }
static py_i64 cpy11__fast_mod(py_i64 a, py_i64 b) { py_i64 cpy11__fast_mod(py_i64 a, py_i64 b) {
assert(b != 0); assert(b != 0);
if(a == 0) return 0; if(a == 0) return 0;
py_i64 res; py_i64 res;

25
src/modules/vmath.c
View File

@ -8,6 +8,9 @@
static bool isclose(float a, float b) { return dmath_fabs(a - b) < 1e-4; } static bool isclose(float a, float b) { return dmath_fabs(a - b) < 1e-4; }
py_i64 cpy11__fast_floor_div(py_i64 a, py_i64 b);
py_i64 cpy11__fast_mod(py_i64 a, py_i64 b);
#define DEFINE_VEC_FIELD(name, T, Tc, field) \ #define DEFINE_VEC_FIELD(name, T, Tc, field) \
static bool name##__##field(int argc, py_Ref argv) { \ static bool name##__##field(int argc, py_Ref argv) { \
PY_CHECK_ARGC(1); \ PY_CHECK_ARGC(1); \
@ -204,7 +207,7 @@ static py_Ref _const(py_Type type, const char* name) {
float sum = 0; \ float sum = 0; \
for(int i = 0; i < D; i++) \ for(int i = 0; i < D; i++) \
sum += v.data[i] * v.data[i]; \ sum += v.data[i] * v.data[i]; \
py_newfloat(py_retval(), dmath_sqrt(sum)); \ py_newfloat(py_retval(), dmath_sqrt(sum)); \
return true; \ return true; \
} \ } \
static bool vec##D##_length_squared(int argc, py_Ref argv) { \ static bool vec##D##_length_squared(int argc, py_Ref argv) { \
@ -234,7 +237,7 @@ static py_Ref _const(py_Type type, const char* name) {
for(int i = 0; i < D; i++) \ for(int i = 0; i < D; i++) \
len += self.data[i] * self.data[i]; \ len += self.data[i] * self.data[i]; \
if(isclose(len, 0)) return ZeroDivisionError("cannot normalize zero vector"); \ if(isclose(len, 0)) return ZeroDivisionError("cannot normalize zero vector"); \
len = dmath_sqrt(len); \ len = dmath_sqrt(len); \
c11_vec##D res; \ c11_vec##D res; \
for(int i = 0; i < D; i++) \ for(int i = 0; i < D; i++) \
res.data[i] = self.data[i] / len; \ res.data[i] = self.data[i] / len; \
@ -314,7 +317,17 @@ DEF_VECTOR_OPS(3)
c11_vec##D##i a = py_tovec##D##i(&argv[0]); \ c11_vec##D##i a = py_tovec##D##i(&argv[0]); \
py_i64 b = py_toint(&argv[1]); \ py_i64 b = py_toint(&argv[1]); \
for(int i = 0; i < D; i++) \ for(int i = 0; i < D; i++) \
a.data[i] /= b; \ a.data[i] = cpy11__fast_floor_div(a.data[i], b); \
py_newvec##D##i(py_retval(), a); \
return true; \
} \
static bool vec##D##i##__mod__(int argc, py_Ref argv) { \
PY_CHECK_ARGC(2); \
PY_CHECK_ARG_TYPE(1, tp_int); \
c11_vec##D##i a = py_tovec##D##i(&argv[0]); \
py_i64 b = py_toint(&argv[1]); \
for(int i = 0; i < D; i++) \
a.data[i] = cpy11__fast_mod(a.data[i], b); \
py_newvec##D##i(py_retval(), a); \ py_newvec##D##i(py_retval(), a); \
return true; \ return true; \
} }
@ -381,7 +394,8 @@ static bool vec2_angle_STATIC(int argc, py_Ref argv) {
PY_CHECK_ARGC(2); PY_CHECK_ARGC(2);
PY_CHECK_ARG_TYPE(0, tp_vec2); PY_CHECK_ARG_TYPE(0, tp_vec2);
PY_CHECK_ARG_TYPE(1, tp_vec2); PY_CHECK_ARG_TYPE(1, tp_vec2);
float val = dmath_atan2(argv[1]._vec2.y, argv[1]._vec2.x) - dmath_atan2(argv[0]._vec2.y, argv[0]._vec2.x); float val = dmath_atan2(argv[1]._vec2.y, argv[1]._vec2.x) -
dmath_atan2(argv[0]._vec2.y, argv[0]._vec2.x);
if(val > DMATH_PI) val -= 2 * (float)DMATH_PI; if(val > DMATH_PI) val -= 2 * (float)DMATH_PI;
if(val < -DMATH_PI) val += 2 * (float)DMATH_PI; if(val < -DMATH_PI) val += 2 * (float)DMATH_PI;
py_newfloat(py_retval(), val); py_newfloat(py_retval(), val);
@ -1237,6 +1251,7 @@ void pk__add_module_vmath() {
py_bindmagic(vec2i, __sub__, vec2i__sub__); py_bindmagic(vec2i, __sub__, vec2i__sub__);
py_bindmagic(vec2i, __mul__, vec2i__mul__); py_bindmagic(vec2i, __mul__, vec2i__mul__);
py_bindmagic(vec2i, __floordiv__, vec2i__floordiv__); py_bindmagic(vec2i, __floordiv__, vec2i__floordiv__);
py_bindmagic(vec2i, __mod__, vec2i__mod__);
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_bindmagic(vec2i, __hash__, vec2i__hash__); py_bindmagic(vec2i, __hash__, vec2i__hash__);
@ -1262,6 +1277,7 @@ void pk__add_module_vmath() {
py_bindmagic(vec3i, __sub__, vec3i__sub__); py_bindmagic(vec3i, __sub__, vec3i__sub__);
py_bindmagic(vec3i, __mul__, vec3i__mul__); py_bindmagic(vec3i, __mul__, vec3i__mul__);
py_bindmagic(vec3i, __floordiv__, vec3i__floordiv__); py_bindmagic(vec3i, __floordiv__, vec3i__floordiv__);
py_bindmagic(vec3i, __mod__, vec3i__mod__);
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_bindmagic(vec3i, __hash__, vec3i__hash__); py_bindmagic(vec3i, __hash__, vec3i__hash__);
@ -1289,6 +1305,7 @@ void pk__add_module_vmath() {
py_bindmagic(vec4i, __sub__, vec4i__sub__); py_bindmagic(vec4i, __sub__, vec4i__sub__);
py_bindmagic(vec4i, __mul__, vec4i__mul__); py_bindmagic(vec4i, __mul__, vec4i__mul__);
py_bindmagic(vec4i, __floordiv__, vec4i__floordiv__); py_bindmagic(vec4i, __floordiv__, vec4i__floordiv__);
py_bindmagic(vec4i, __mod__, vec4i__mod__);
py_bindmagic(vec4i, __eq__, vec4i__eq__); py_bindmagic(vec4i, __eq__, vec4i__eq__);
py_bindmagic(vec4i, __ne__, vec4i__ne__); py_bindmagic(vec4i, __ne__, vec4i__ne__);
py_bindmagic(vec4i, __hash__, vec4i__hash__); py_bindmagic(vec4i, __hash__, vec4i__hash__);