Skip to content

Fix overwide PointList type for shaders expecting vec2 #2213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pushfoo merged 5 commits into from
Jul 5, 2024
Merged

Fix overwide PointList type for shaders expecting vec2 #2213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f6a8b45
Fix type overwide PointList type for shaders expecting vec2
pushfoo Jul 5, 2024
79e39f2
Fix misuse of PointList in draw_line_strip
pushfoo Jul 5, 2024
ba0f62f
Fix overbroad PointList in draw_rect_outline
pushfoo Jul 5, 2024
4c9f75c
Ruff formatting
pushfoo Jul 5, 2024
bec1207
Remove unused import
pushfoo Jul 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions arcade/draw/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions arcade/draw/line.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import array

from arcade import gl
from arcade.types import RGBA255, Color, Point, PointList
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


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.

Expand All @@ -19,7 +19,7 @@ def draw_line_strip(point_list: PointList, color: RGBA255, line_width: float = 1
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:
Expand Down Expand Up @@ -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.

Expand Down
4 changes: 2 additions & 2 deletions arcade/draw/rect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, Point2List, Rect
from arcade.window_commands import get_window

from .helpers import _generic_draw_line_strip
Expand Down Expand Up @@ -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 = []
Expand Down