From f6a8b45110e416822126cc2f1249d8e1c91cf370 Mon Sep 17 00:00:00 2001 From: pushfoo <36696816+pushfoo@users.noreply.github.com> Date: Fri, 5 Jul 2024 09:53:43 -0400 Subject: [PATCH 1/5] Fix type overwide PointList type for shaders expecting vec2 --- arcade/draw/helpers.py | 4 ++-- arcade/draw/line.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arcade/draw/helpers.py b/arcade/draw/helpers.py index 7c97ec35d4..b6f220475d 100644 --- a/arcade/draw/helpers.py +++ b/arcade/draw/helpers.py @@ -2,7 +2,7 @@ import math from arcade import gl -from arcade.types import RGBA255, Color, Point2, PointList +from arcade.types import RGBA255, Color, Point2, Point2List from arcade.window_commands import get_window @@ -43,7 +43,7 @@ def get_points_for_thick_line( def _generic_draw_line_strip( - point_list: PointList, color: RGBA255, mode: int = gl.LINE_STRIP + point_list: Point2List, color: RGBA255, mode: int = gl.LINE_STRIP ) -> None: """ Draw a line strip. A line strip is a set of continuously connected diff --git a/arcade/draw/line.py b/arcade/draw/line.py index 2ae4727b06..bee0e8cd69 100644 --- a/arcade/draw/line.py +++ b/arcade/draw/line.py @@ -1,13 +1,13 @@ import array from arcade import gl -from arcade.types import RGBA255, Color, Point, PointList +from arcade.types import RGBA255, Color, Point, Point2List from arcade.window_commands import get_window from .helpers import _generic_draw_line_strip, get_points_for_thick_line -def draw_line_strip(point_list: PointList, color: RGBA255, line_width: float = 1) -> None: +def draw_line_strip(point_list: Point2List, color: RGBA255, line_width: float = 1) -> None: """ Draw a multi-point line. @@ -73,7 +73,7 @@ def draw_line( ctx.disable(ctx.BLEND) -def draw_lines(point_list: PointList, color: RGBA255, line_width: float = 1) -> None: +def draw_lines(point_list: Point2List, color: RGBA255, line_width: float = 1) -> None: """ Draw a set of lines. From 79e39f2efd577688ca90efb54697b432c12cfa71 Mon Sep 17 00:00:00 2001 From: pushfoo <36696816+pushfoo@users.noreply.github.com> Date: Fri, 5 Jul 2024 10:01:02 -0400 Subject: [PATCH 2/5] Fix misuse of PointList in draw_line_strip --- arcade/draw/line.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arcade/draw/line.py b/arcade/draw/line.py index bee0e8cd69..a1909d2cb2 100644 --- a/arcade/draw/line.py +++ b/arcade/draw/line.py @@ -19,7 +19,7 @@ def draw_line_strip(point_list: Point2List, color: RGBA255, line_width: float = if line_width == 1: _generic_draw_line_strip(point_list, color, gl.LINE_STRIP) else: - triangle_point_list: list[Point] = [] + triangle_point_list: Point2List = [] # This needs a lot of improvement last_point = None for point in point_list: From ba0f62fd0f086924a59c4bd27e34383696b72703 Mon Sep 17 00:00:00 2001 From: pushfoo <36696816+pushfoo@users.noreply.github.com> Date: Fri, 5 Jul 2024 10:01:36 -0400 Subject: [PATCH 3/5] Fix overbroad PointList in draw_rect_outline --- arcade/draw/rect.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arcade/draw/rect.py b/arcade/draw/rect.py index 94d8295b13..0011071b20 100644 --- a/arcade/draw/rect.py +++ b/arcade/draw/rect.py @@ -7,7 +7,7 @@ from arcade.sprite import BasicSprite from arcade.texture import Texture from arcade.texture_atlas.base import TextureAtlasBase -from arcade.types import LBWH, LRBT, RGBA255, XYWH, Color, PointList, Rect +from arcade.types import LBWH, LRBT, RGBA255, XYWH, Color, Rect, Point2List from arcade.window_commands import get_window from .helpers import _generic_draw_line_strip @@ -248,7 +248,7 @@ def draw_rect_outline( o_lt = rect.top_left.x - HALF_BORDER, rect.top_right.y + HALF_BORDER # fmt: on - point_list: PointList = (o_lt, i_lt, o_rt, i_rt, o_rb, i_rb, o_lb, i_lb, o_lt, i_lt) + point_list: Point2List = (o_lt, i_lt, o_rt, i_rt, o_rb, i_rb, o_lb, i_lb, o_lt, i_lt) if tilt_angle != 0: point_list_2 = [] From 4c9f75c4c950525384c21eea467f623a7a4470aa Mon Sep 17 00:00:00 2001 From: pushfoo <36696816+pushfoo@users.noreply.github.com> Date: Fri, 5 Jul 2024 10:10:02 -0400 Subject: [PATCH 4/5] Ruff formatting --- arcade/draw/rect.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arcade/draw/rect.py b/arcade/draw/rect.py index 0011071b20..6559bae230 100644 --- a/arcade/draw/rect.py +++ b/arcade/draw/rect.py @@ -7,7 +7,7 @@ from arcade.sprite import BasicSprite from arcade.texture import Texture from arcade.texture_atlas.base import TextureAtlasBase -from arcade.types import LBWH, LRBT, RGBA255, XYWH, Color, Rect, Point2List +from arcade.types import LBWH, LRBT, RGBA255, XYWH, Color, Point2List, Rect from arcade.window_commands import get_window from .helpers import _generic_draw_line_strip From bec12075ff9d73a241a8c84d3a5b0d2e1646d5d6 Mon Sep 17 00:00:00 2001 From: pushfoo <36696816+pushfoo@users.noreply.github.com> Date: Fri, 5 Jul 2024 10:17:04 -0400 Subject: [PATCH 5/5] Remove unused import --- arcade/draw/line.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arcade/draw/line.py b/arcade/draw/line.py index a1909d2cb2..14b0b1df5d 100644 --- a/arcade/draw/line.py +++ b/arcade/draw/line.py @@ -1,7 +1,7 @@ import array from arcade import gl -from arcade.types import RGBA255, Color, Point, Point2List +from arcade.types import RGBA255, Color, Point2List from arcade.window_commands import get_window from .helpers import _generic_draw_line_strip, get_points_for_thick_line