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

add vec2i.__hash__

Browse Source
This commit is contained in:
blueloveTH 2024-11-09 14:49:40 +08:00
parent 480a2646e4
commit 87e0b0756d
3 changed files with 62 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/typings/linalg.pyi
View File

@ -28,10 +28,17 @@ class _vecI[T]:
@overload
def __mul__(self, other: T) -> T: ...
def __hash__(self) -> int: ...
def dot(self, other: T) -> int: ...
class vec2(_vecF['vec2']):
LEFT: vec2
RIGHT: vec2
UP: vec2
DOWN: vec2
@property
def x(self) -> float: ...
@property
@ -105,6 +112,11 @@ class mat3x3:
class vec2i(_vecI['vec2i']):
LEFT: vec2i
RIGHT: vec2i
UP: vec2i
DOWN: vec2i
@property
def x(self) -> int: ...
@property

62
src/modules/linalg.c
View File

@ -1,9 +1,9 @@
#include "pocketpy/pocketpy.h"
#include "pocketpy/common/utils.h"
#include "pocketpy/objects/object.h"
#include "pocketpy/common/sstream.h"
#include "pocketpy/common/utils.h"
#include "pocketpy/interpreter/vm.h"
#include "pocketpy/objects/object.h"
#include <math.h>
static bool isclose(float a, float b) { return fabs(a - b) < 1e-4; }
@ -88,6 +88,10 @@ c11_mat3x3* py_tomat3x3(py_Ref self) {
return py_touserdata(self);
}
static py_Ref _const(py_Type type, const char* name) {
return py_emplacedict(py_tpobject(type), py_name(name));
}
#define DEF_VECTOR_ELEMENT_WISE(D, T, name, op) \
static bool T##name(int argc, py_Ref argv) { \
PY_CHECK_ARGC(2); \
@ -287,6 +291,15 @@ DEF_VECTOR_OPS(3)
sum += a.data[i] * b.data[i]; \
py_newint(py_retval(), sum); \
return true; \
} \
static bool vec##D##i##__hash__(int argc, py_Ref argv) { \
PY_CHECK_ARGC(1); \
c11_vec##D##i v = py_tovec##D##i(argv); \
py_i64 hash = 0; \
for(int i = 0; i < D; i++) \
hash = hash * 31 + v.data[i]; \
py_newint(py_retval(), hash); \
return true; \
}
DEF_VECTOR_INT_OPS(2)
@ -431,7 +444,8 @@ static bool mat3x3__repr__(int argc, py_Ref argv) {
c11_mat3x3* m = py_tomat3x3(argv);
char buf[256];
const char* fmt =
"mat3x3(%.4f, %.4f, %.4f,\n %.4f, %.4f, %.4f,\n %.4f, %.4f, %.4f)";
"mat3x3(%.4f, %.4f, %.4f,\n %.4f, %.4f, %.4f,\n "
" %.4f, %.4f, %.4f)";
int size = snprintf(buf,
256,
fmt,
@ -830,14 +844,14 @@ void pk__add_module_linalg() {
py_bindmethod(vec2, "normalize", vec2_normalize);
py_bindmethod(vec2, "rotate", vec2_rotate);
py_newvec2(py_emplacedict(py_tpobject(vec2), py_name("ZERO")),
(c11_vec2){
{0, 0}
});
py_newvec2(py_emplacedict(py_tpobject(vec2), py_name("ONE")),
(c11_vec2){
{1, 1}
});
// clang-format off
py_newvec2(_const(vec2, "ZERO"), (c11_vec2){{0, 0}});
py_newvec2(_const(vec2, "ONE"), (c11_vec2){{1, 1}});
py_newvec2(_const(vec2, "LEFT"), (c11_vec2){{-1, 0}});
py_newvec2(_const(vec2, "RIGHT"), (c11_vec2){{1, 0}});
py_newvec2(_const(vec2, "UP"), (c11_vec2){{0, -1}});
py_newvec2(_const(vec2, "DOWN"), (c11_vec2){{0, 1}});
// clang-format on
py_bindmethod(vec2, "angle", vec2_angle_STATIC);
py_bindmethod(vec2, "smooth_damp", vec2_smoothdamp_STATIC);
@ -881,20 +895,21 @@ void pk__add_module_linalg() {
py_bindmagic(vec2i, __mul__, vec2i__mul__);
py_bindmagic(vec2i, __eq__, vec2i__eq__);
py_bindmagic(vec2i, __ne__, vec2i__ne__);
py_bindmagic(vec2i, __hash__, vec2i__hash__);
py_bindproperty(vec2i, "x", vec2i__x, NULL);
py_bindproperty(vec2i, "y", vec2i__y, NULL);
py_bindmethod(vec2i, "with_x", vec2i__with_x);
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}
});
// clang-format off
py_newvec2i(_const(vec2i, "ZERO"), (c11_vec2i){{0, 0}});
py_newvec2i(_const(vec2i, "ONE"), (c11_vec2i){{1, 1}});
py_newvec2i(_const(vec2i, "LEFT"), (c11_vec2i){{-1, 0}});
py_newvec2i(_const(vec2i, "RIGHT"), (c11_vec2i){{1, 0}});
py_newvec2i(_const(vec2i, "UP"), (c11_vec2i){{0, -1}});
py_newvec2i(_const(vec2i, "DOWN"), (c11_vec2i){{0, 1}});
// clang-format on
/* vec3i */
py_bindmagic(vec3i, __new__, vec3i__new__);
@ -904,6 +919,7 @@ void pk__add_module_linalg() {
py_bindmagic(vec3i, __mul__, vec3i__mul__);
py_bindmagic(vec3i, __eq__, vec3i__eq__);
py_bindmagic(vec3i, __ne__, vec3i__ne__);
py_bindmagic(vec3i, __hash__, vec3i__hash__);
py_bindproperty(vec3i, "x", vec3i__x, NULL);
py_bindproperty(vec3i, "y", vec3i__y, NULL);
py_bindproperty(vec3i, "z", vec3i__z, NULL);
@ -912,11 +928,11 @@ void pk__add_module_linalg() {
py_bindmethod(vec3i, "with_z", vec3i__with_z);
py_bindmethod(vec3i, "dot", vec3i_dot);
py_newvec3i(py_emplacedict(py_tpobject(vec3i), py_name("ZERO")),
py_newvec3i(_const(vec3i, "ZERO"),
(c11_vec3i){
{0, 0, 0}
});
py_newvec3i(py_emplacedict(py_tpobject(vec3i), py_name("ONE")),
py_newvec3i(_const(vec3i, "ONE"),
(c11_vec3i){
{1, 1, 1}
});
@ -943,11 +959,11 @@ void pk__add_module_linalg() {
py_bindmethod(vec3, "with_z", vec3__with_z);
py_bindmethod(vec3, "with_xy", vec3__with_xy);
py_newvec3(py_emplacedict(py_tpobject(vec3), py_name("ZERO")),
py_newvec3(_const(vec3, "ZERO"),
(c11_vec3){
{0, 0, 0}
});
py_newvec3(py_emplacedict(py_tpobject(vec3), py_name("ONE")),
py_newvec3(_const(vec3, "ONE"),
(c11_vec3){
{1, 1, 1}
});

11
tests/80_linalg.py
View File

@ -375,6 +375,11 @@ 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 vec2i.LEFT == vec2i(-1, 0)
assert vec2i.RIGHT == vec2i(1, 0)
assert vec2i.UP == vec2i(0, -1)
assert vec2i.DOWN == vec2i(0, 1)
assert vec3i.ONE == vec3i(1, 1, 1)
assert vec3i.ZERO == vec3i(0, 0, 0)
@ -389,3 +394,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
a = {}
a[vec2i(1, 2)] = 1
assert a[vec2i(1, 2)] == 1
a[vec3i(1, 2, 3)] = 2
assert a[vec3i(1, 2, 3)] == 2