Merge pull request adafruit#9589 from jamesbowman/main

dhalbert · web-flow · commit 5f6640003bbd · 2024-09-03T16:19:02.000-04:00
Add support for ulab.numpy float vectors in Vertex2f()
diff --git a/shared-bindings/_eve/__init__.c b/shared-bindings/_eve/__init__.c
@@ -11,6 +11,11 @@
 #include "py/runtime.h"
 #include "py/binary.h"
 
+#if CIRCUITPY_ULAB
+#include "extmod/ulab/code/ulab.h"
+#include "extmod/ulab/code/ndarray.h"
+#endif
+
 #include "shared-module/_eve/__init__.h"
 #include "shared-bindings/_eve/__init__.h"
 
@@ -844,6 +849,19 @@ static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(vertex2ii_obj, 3, 5, _vertex2ii);
 
 // }
 
+#if CIRCUITPY_ULAB
+static bool is_vector(mp_obj_t a) {
+    if (!mp_obj_is_type(a, &ulab_ndarray_type)) {
+        return false;
+    }
+    ndarray_obj_t *ndarray = MP_OBJ_TO_PTR(a);
+    if (!ndarray_is_dense(ndarray)) {
+        mp_raise_TypeError(MP_ERROR_TEXT("input must be an ndarray"));
+    }
+    return true;
+}
+#endif
+
 // Hand-written functions {
 
 //|     def Vertex2f(self, b: float) -> None:
@@ -853,6 +871,18 @@ static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(vertex2ii_obj, 3, 5, _vertex2ii);
 //|         :param float y: pixel y-coordinate"""
 //|         ...
 static mp_obj_t _vertex2f(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
+    #if CIRCUITPY_ULAB
+    if (is_vector(a0) && is_vector(a1)) {
+        ndarray_obj_t *v0 = MP_OBJ_TO_PTR(a0);
+        ndarray_obj_t *v1 = MP_OBJ_TO_PTR(a1);
+        mp_float_t *p0 = (mp_float_t *)v0->array;
+        mp_float_t *p1 = (mp_float_t *)v1->array;
+        for (size_t i = 0; i < v0->len; i++, p0++, p1++) {
+            common_hal__eve_Vertex2f(EVEHAL(self), *p0, *p1);
+        }
+        return mp_const_none;
+    }
+    #endif
     mp_float_t x = mp_obj_get_float(a0);
     mp_float_t y = mp_obj_get_float(a1);
     common_hal__eve_Vertex2f(EVEHAL(self), x, y);
