remove vectorio object arg implementations. Fix docstrings.

FoamyGuy · FoamyGuy · commit 5db420a4a234 · 2024-09-02T10:56:47.000-05:00
diff --git a/shared-bindings/vectorio/Circle.c b/shared-bindings/vectorio/Circle.c
@@ -106,15 +106,6 @@ MP_PROPERTY_GETSET(vectorio_circle_color_index_obj,
     (mp_obj_t)&vectorio_circle_set_color_index_obj);
 
 
-//|     def intersects(self, other_shape: Union[vectorio.Circle, vectorio.Rectangle]) -> bool:
-//|         """Return true if this shape intersects (overlaps with) another shape."""
-//|         ...
-static mp_obj_t vectorio_circle_obj_intersects(mp_obj_t self_in, mp_obj_t other_shape) {
-    vectorio_circle_t *self = MP_OBJ_TO_PTR(self_in);
-    return mp_obj_new_bool(common_hal_vectorio_circle_intersects(self, other_shape));
-}
-MP_DEFINE_CONST_FUN_OBJ_2(vectorio_circle_intersects_obj, vectorio_circle_obj_intersects);
-
 // Documentation for properties inherited from VectorShape.
 
 //|     x: int
@@ -142,7 +133,6 @@ static const mp_rom_map_elem_t vectorio_circle_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_y), MP_ROM_PTR(&vectorio_vector_shape_y_obj) },
     { MP_ROM_QSTR(MP_QSTR_hidden), MP_ROM_PTR(&vectorio_vector_shape_hidden_obj) },
     { MP_ROM_QSTR(MP_QSTR_color_index), MP_ROM_PTR(&vectorio_circle_color_index_obj) },
-    { MP_ROM_QSTR(MP_QSTR_intersects), MP_ROM_PTR(&vectorio_circle_intersects_obj) },
     { MP_ROM_QSTR(MP_QSTR_location), MP_ROM_PTR(&vectorio_vector_shape_location_obj) },
     { MP_ROM_QSTR(MP_QSTR_pixel_shader), MP_ROM_PTR(&vectorio_vector_shape_pixel_shader_obj) },
 };
diff --git a/shared-bindings/vectorio/Circle.h b/shared-bindings/vectorio/Circle.h
@@ -28,5 +28,3 @@ uint16_t common_hal_vectorio_circle_get_color_index(void *obj);
 void common_hal_vectorio_circle_set_color_index(void *obj, uint16_t color_index);
 
 mp_obj_t common_hal_vectorio_circle_get_draw_protocol(void *circle);
-
-bool common_hal_vectorio_circle_intersects(vectorio_circle_t *self, mp_obj_t other_shape);
diff --git a/shared-bindings/vectorio/Rectangle.c b/shared-bindings/vectorio/Rectangle.c
@@ -136,15 +136,6 @@ const mp_obj_property_t vectorio_rectangle_color_index_obj = {
               MP_ROM_NONE},
 };
 
-//|     def intersects(self, other_shape: Union[vectorio.Circle, vectorio.Rectangle]) -> bool:
-//|         """Return true if this shape intersects (overlaps with) another shape."""
-//|         ...
-static mp_obj_t vectorio_rectangle_obj_intersects(mp_obj_t self_in, mp_obj_t other_shape) {
-    vectorio_rectangle_t *self = MP_OBJ_TO_PTR(self_in);
-    return mp_obj_new_bool(common_hal_vectorio_rectangle_intersects(self, other_shape));
-}
-MP_DEFINE_CONST_FUN_OBJ_2(vectorio_rectangle_intersects_obj, vectorio_rectangle_obj_intersects);
-
 
 // Documentation for properties inherited from VectorShape.
 
@@ -172,7 +163,6 @@ static const mp_rom_map_elem_t vectorio_rectangle_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_y), MP_ROM_PTR(&vectorio_vector_shape_y_obj) },
     { MP_ROM_QSTR(MP_QSTR_hidden), MP_ROM_PTR(&vectorio_vector_shape_hidden_obj) },
     { MP_ROM_QSTR(MP_QSTR_color_index), MP_ROM_PTR(&vectorio_rectangle_color_index_obj) },
-    { MP_ROM_QSTR(MP_QSTR_intersects), MP_ROM_PTR(&vectorio_rectangle_intersects_obj) },
     { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&vectorio_rectangle_width_obj) },
     { MP_ROM_QSTR(MP_QSTR_height), MP_ROM_PTR(&vectorio_rectangle_height_obj) },
     { MP_ROM_QSTR(MP_QSTR_location), MP_ROM_PTR(&vectorio_vector_shape_location_obj) },
diff --git a/shared-bindings/vectorio/Rectangle.h b/shared-bindings/vectorio/Rectangle.h
@@ -29,5 +29,3 @@ void common_hal_vectorio_rectangle_set_color_index(void *obj, uint16_t color_ind
 
 int16_t common_hal_vectorio_rectangle_get_height(void *obj);
 void common_hal_vectorio_rectangle_set_height(void *obj, int16_t height);
-
-bool common_hal_vectorio_rectangle_intersects(vectorio_rectangle_t *self, mp_obj_t other_shape);
diff --git a/shared-bindings/vectorio/__init__.c b/shared-bindings/vectorio/__init__.c
@@ -38,18 +38,23 @@
 //|     group.append(polygon)
 //|
 //| """
+//|
 
 
 //| def circle_rectangle_intersects(
 //|     cx: int, cy: int, cr: int, rx: int, ry: int, rw: int, rh: int
+//| ) -> bool:
+//|     """Checks for intersection between a cricle and a rectangle.
+//|
 //|     :param int cx: Circle center x coordinate
 //|     :param int cy: Circle center y coordinate
 //|     :param int cr: Circle radius
 //|     :param int rx: Rectangle x coordinate
 //|     :param int ry: Rectangle y coordinate
 //|     :param int rw: Rectangle width
-//|     :param int rh: Rectangle height
-//| ) -> None:
+//|     :param int rh: Rectangle height"""
+//|     ...
+//|
 static mp_obj_t vectorio_circle_rectangle_intersects(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum {ARG_cx, ARG_cy, ARG_cr, ARG_rx, ARG_ry, ARG_rw, ARG_rh};
 
@@ -75,28 +80,30 @@ static mp_obj_t vectorio_circle_rectangle_intersects(size_t n_args, const mp_obj
     int16_t rh = args[ARG_rh].u_int;
 
     bool result = common_hal_vectorio_circle_rectangle_intersects(cx, cy, cr, rx, ry, rw, rh);
-    if (result){
+    if (result) {
         return mp_const_true;
-    }else{
+    } else {
         return mp_const_false;
     }
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(vectorio_circle_rectangle_intersects_obj, 0, vectorio_circle_rectangle_intersects);
 
 
 //| def rectangle_rectangle_intersects(
-//|     r1x: int, r1y: int, r1w: int, r1h: int,
-//      r2x: int, r2y: int, r2w: int, r2h: int
+//|     r1x: int, r1y: int, r1w: int, r1h: int, r2x: int, r2y: int, r2w: int, r2h: int
+//| ) -> bool:
+//|     """Checks for intersection between a two rectangles.
+//|
+//|     :param int r1x: First Rectangle x coordinate
+//|     :param int r1y: First Rectangle y coordinate
+//|     :param int r1w: First Rectangle width
+//|     :param int r1h: First Rectangle height
+//|     :param int r2x: Second Rectangle x coordinate
+//|     :param int r2y: Second Rectangle y coordinate
+//|     :param int r2w: Second Rectangle width
+//|     :param int r2h: Second Rectangle height"""
+//|     ...
 //|
-//|     :param int r1x: Rectangle x coordinate
-//|     :param int r1y: Rectangle y coordinate
-//|     :param int r1w: Rectangle width
-//|     :param int r1h: Rectangle height
-//|     :param int r2x: Other Rectangle x coordinate
-//|     :param int r2y: Other Rectangle y coordinate
-//|     :param int r2w: Other Rectangle width
-//|     :param int r2h: Other Rectangle height
-//| ) -> None:
 static mp_obj_t vectorio_rectangle_rectangle_intersects(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum {ARG_r1x, ARG_r1y, ARG_r1w, ARG_r1h, ARG_r2x, ARG_r2y, ARG_r2w, ARG_r2h};
 
@@ -126,24 +133,27 @@ static mp_obj_t vectorio_rectangle_rectangle_intersects(size_t n_args, const mp_
 
 
     bool result = common_hal_vectorio_rectangle_rectangle_intersects(r1x, r1y, r1w, r1h, r2x, r2y, r2w, r2h);
-    if (result){
+    if (result) {
         return mp_const_true;
-    }else{
+    } else {
         return mp_const_false;
     }
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(vectorio_rectangle_rectangle_intersects_obj, 0, vectorio_rectangle_rectangle_intersects);
 
-
 //| def circle_circle_intersects(
-//|     cx: int, cy: int, cr: int, rx: int, ry: int, rw: int, rh: int
-//|     :param int c1x: Circle center x coordinate
-//|     :param int c1y: Circle center y coordinate
-//|     :param int c1r: Circle radius
-//|     :param int c2x: Other Circle center x coordinate
-//|     :param int c2y: Other Circle center y coordinate
-//|     :param int c2r: Other Circle radius
-//| ) -> None:
+//|     c1x: int, c1y: int, c1r: int, c2x: int, c2y: int, c2r: int
+//| ) -> bool:
+//|     """Checks for intersection between two circles.
+//|
+//|     :param int c1x: First Circle center x coordinate
+//|     :param int c1y: First Circle center y coordinate
+//|     :param int c1r: First Circle radius
+//|     :param int c2x: Second Circle center x coordinate
+//|     :param int c2y: Second Circle center y coordinate
+//|     :param int c2r: Second Circle radius"""
+//|     ...
+//|
 static mp_obj_t vectorio_circle_circle_intersects(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum {ARG_c1x, ARG_c1y, ARG_c1r, ARG_c2x, ARG_c2y, ARG_c2r};
 
@@ -167,9 +177,9 @@ static mp_obj_t vectorio_circle_circle_intersects(size_t n_args, const mp_obj_t
     int16_t c2r = args[ARG_c2r].u_int;
 
     bool result = common_hal_vectorio_circle_circle_intersects(c1x, c1y, c1r, c2x, c2y, c2r);
-    if (result){
+    if (result) {
         return mp_const_true;
-    }else{
+    } else {
         return mp_const_false;
     }
 }
diff --git a/shared-module/vectorio/Circle.c b/shared-module/vectorio/Circle.c
@@ -81,63 +81,6 @@ void common_hal_vectorio_circle_set_color_index(void *obj, uint16_t color_index)
     }
 }
 
-bool common_hal_vectorio_circle_intersects(vectorio_circle_t *self, mp_obj_t other_shape) {
-
-    mp_obj_t possible_rect = mp_obj_cast_to_native_base(other_shape, &vectorio_rectangle_type);
-    if (possible_rect != MP_OBJ_NULL) {
-
-        vectorio_rectangle_t *other_rect = possible_rect;
-
-        mp_int_t self_x = common_hal_vectorio_vector_shape_get_x(self->draw_protocol_instance);
-        mp_int_t self_y = common_hal_vectorio_vector_shape_get_y(self->draw_protocol_instance);
-
-        mp_int_t other_left = common_hal_vectorio_vector_shape_get_x(other_rect->draw_protocol_instance);
-        mp_int_t other_right = other_left + other_rect->width;
-        mp_int_t other_top = common_hal_vectorio_vector_shape_get_y(other_rect->draw_protocol_instance);
-        mp_int_t other_bottom = other_top + other_rect->height;
-
-        mp_int_t test_x = self_x;
-        mp_int_t test_y = self_y;
-
-        if (self_x < other_left) {
-            test_x = other_left;
-        } else if (self_x > other_right) {
-            test_x = other_right;
-        }
-
-        if (self_y < other_top) {
-            test_y = other_top;
-        } else if (self_y > other_bottom) {
-            test_y = other_bottom;
-        }
-
-        mp_int_t dist_x = self_x - test_x;
-        mp_int_t dist_y = self_y - test_y;
-        mp_int_t dist = sqrtf((dist_x * dist_x) + (dist_y * dist_y));
-
-        return dist <= self->radius;
-    }
-    mp_obj_t possible_circle = mp_obj_cast_to_native_base(other_shape, &vectorio_circle_type);
-    if (possible_circle != MP_OBJ_NULL) {
-        vectorio_circle_t *other_circle = possible_circle;
-
-        mp_int_t self_x = common_hal_vectorio_vector_shape_get_x(self->draw_protocol_instance);
-        mp_int_t self_y = common_hal_vectorio_vector_shape_get_y(self->draw_protocol_instance);
-
-        mp_int_t other_circle_x = common_hal_vectorio_vector_shape_get_x(other_circle->draw_protocol_instance);
-        mp_int_t other_circle_y = common_hal_vectorio_vector_shape_get_y(other_circle->draw_protocol_instance);
-
-        mp_int_t dist_x = self_x - other_circle_x;
-        mp_int_t dist_y = self_y - other_circle_y;
-
-        mp_int_t dist = sqrtf((dist_x * dist_x) + (dist_y * dist_y));
-
-        return dist <= self->radius + other_circle->radius;
-
-    }
-
-    return false;
-}
 
 mp_obj_t common_hal_vectorio_circle_get_draw_protocol(void *circle) {
     vectorio_circle_t *self = circle;
diff --git a/shared-module/vectorio/Rectangle.c b/shared-module/vectorio/Rectangle.c
@@ -51,62 +51,6 @@ mp_obj_t common_hal_vectorio_rectangle_get_draw_protocol(void *rectangle) {
     return self->draw_protocol_instance;
 }
 
-bool common_hal_vectorio_rectangle_intersects(vectorio_rectangle_t *self, mp_obj_t other_shape) {
-
-    mp_obj_t possible_rect = mp_obj_cast_to_native_base(other_shape, &vectorio_rectangle_type);
-    if (possible_rect != MP_OBJ_NULL) {
-
-        vectorio_rectangle_t *other_rect = possible_rect;
-
-        mp_int_t self_left = common_hal_vectorio_vector_shape_get_x(self->draw_protocol_instance);
-        mp_int_t self_right = self_left + self->width;
-        mp_int_t self_top = common_hal_vectorio_vector_shape_get_y(self->draw_protocol_instance);
-        mp_int_t self_bottom = self_top + self->height;
-
-        mp_int_t other_left = common_hal_vectorio_vector_shape_get_x(other_rect->draw_protocol_instance);
-        mp_int_t other_right = other_left + other_rect->width;
-        mp_int_t other_top = common_hal_vectorio_vector_shape_get_y(other_rect->draw_protocol_instance);
-        mp_int_t other_bottom = other_top + other_rect->height;
-
-        return self_left < other_right && self_right > other_left &&
-               self_top < other_bottom && self_bottom > other_top;
-    }
-    mp_obj_t possible_circle = mp_obj_cast_to_native_base(other_shape, &vectorio_circle_type);
-    if (possible_circle != MP_OBJ_NULL) {
-        vectorio_circle_t *other_circle = possible_circle;
-
-        mp_int_t self_left = common_hal_vectorio_vector_shape_get_x(self->draw_protocol_instance);
-        mp_int_t self_right = self_left + self->width;
-        mp_int_t self_top = common_hal_vectorio_vector_shape_get_y(self->draw_protocol_instance);
-        mp_int_t self_bottom = self_top + self->height;
-
-        mp_int_t other_circle_x = common_hal_vectorio_vector_shape_get_x(other_circle->draw_protocol_instance);
-        mp_int_t other_circle_y = common_hal_vectorio_vector_shape_get_y(other_circle->draw_protocol_instance);
-
-        mp_int_t test_x = other_circle_x;
-        mp_int_t test_y = other_circle_y;
-
-        if (other_circle_x < self_left) {
-            test_x = self_left;
-        } else if (other_circle_x > self_right) {
-            test_x = self_right;
-        }
-
-        if (other_circle_y < self_top) {
-            test_y = self_top;
-        } else if (other_circle_y > self_bottom) {
-            test_y = self_bottom;
-        }
-
-        mp_int_t dist_x = other_circle_x - test_x;
-        mp_int_t dist_y = other_circle_y - test_y;
-        mp_int_t dist = sqrtf((dist_x * dist_x) + (dist_y * dist_y));
-
-        return dist <= other_circle->radius;
-    }
-
-    return false;
-}
 
 int16_t common_hal_vectorio_rectangle_get_width(void *obj) {
     vectorio_rectangle_t *self = obj;
diff --git a/shared-module/vectorio/__init__.c b/shared-module/vectorio/__init__.c
@@ -13,7 +13,7 @@
 
 bool common_hal_vectorio_circle_rectangle_intersects(
     int16_t cx, int16_t cy, int16_t cr,
-    int16_t rx, int16_t ry, int16_t rw, int16_t rh){
+    int16_t rx, int16_t ry, int16_t rw, int16_t rh) {
 
     mp_int_t rect_left = rx;
     mp_int_t rect_right = rect_left + rw;
@@ -39,13 +39,13 @@ bool common_hal_vectorio_circle_rectangle_intersects(
     mp_int_t dist_y = cy - test_y;
     mp_int_t dist = (dist_x * dist_x) + (dist_y * dist_y);
 
-    return dist <= cr*cr;
+    return dist <= cr * cr;
 }
 
 bool common_hal_vectorio_circle_circle_intersects(
     int16_t c1x, int16_t c1y, int16_t c1r,
     int16_t c2x, int16_t c2y, int16_t c2r
-){
+    ) {
 
     mp_int_t dist_x = c1x - c2x;
     mp_int_t dist_y = c1y - c2y;
@@ -58,7 +58,7 @@ bool common_hal_vectorio_circle_circle_intersects(
 
 bool common_hal_vectorio_rectangle_rectangle_intersects(
     int16_t r1x, int16_t r1y, int16_t r1w, int16_t r1h,
-    int16_t r2x, int16_t r2y, int16_t r2w, int16_t r2h){
+    int16_t r2x, int16_t r2y, int16_t r2w, int16_t r2h) {
 
 
     mp_int_t r1_left = r1x;
@@ -73,4 +73,4 @@ bool common_hal_vectorio_rectangle_rectangle_intersects(
 
     return r1_left < r2_right && r1_right > r2_left &&
            r1_top < r2_bottom && r1_bottom > r2_top;
-}
+}
