Skip to content
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

Jump to bottom

Unroll & reduce dot access in rectangle drawing helpers #2198

Merged
merged 7 commits into from
Sep 29, 2024
Merged

Unroll & reduce dot access in rectangle drawing helpers #2198

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
abbcec3
Optimize draw_rect_outline by reducing dot access
pushfoo Jul 3, 2024
891926b
Unroll rotated portion of draw_rect_outline
pushfoo Jul 3, 2024
822e25e
Use direct indexed access instead of slower properties in texture dra…
pushfoo Jul 3, 2024
f9477fd
Attempt to work around broken mypy
pushfoo Jul 3, 2024
6c6fce4
Use Point2List
pushfoo Jul 19, 2024
381f8e8
Fix bug in closing rectangle corner
pushfoo Jul 19, 2024
0c423e5
Merge branch 'development' into draw-opts
DragonMoffon Sep 29, 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
82 changes: 63 additions & 19 deletions arcade/draw/rect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def draw_texture_rect(
atlas.use_uv_texture(unit=1)

geometry = ctx.geometry_empty
program["pos"] = rect.center_x, rect.center_y, 0
program["pos"] = rect.x, rect.y, 0
program["color"] = color.normalized
program["size"] = rect.width, rect.height
program["angle"] = angle
Expand Down Expand Up @@ -299,27 +299,71 @@ def draw_rect_outline(
"""

HALF_BORDER = border_width / 2
# Extremely unrolled code below

# fmt: off
i_lb = rect.bottom_left.x + HALF_BORDER, rect.bottom_left.y + HALF_BORDER
i_rb = rect.bottom_right.x - HALF_BORDER, rect.bottom_right.y + HALF_BORDER
i_rt = rect.top_right.x - HALF_BORDER, rect.top_right.y - HALF_BORDER
i_lt = rect.top_left.x + HALF_BORDER, rect.top_left.y - HALF_BORDER
o_lb = rect.bottom_left.x - HALF_BORDER, rect.bottom_left.y - HALF_BORDER
o_rb = rect.bottom_right.x + HALF_BORDER, rect.bottom_right.y - HALF_BORDER
o_rt = rect.top_right.x + HALF_BORDER, rect.top_right.y + HALF_BORDER
o_lt = rect.top_left.x - HALF_BORDER, rect.top_right.y + HALF_BORDER
left = rect.left
right = rect.right
bottom = rect.bottom
top = rect.top
x = rect.x
y = rect.y

# o = outer, i = inner
#
# o_left, o_top o_right, o_top
# +----------------------------------------+
# | i_left, i_top i_right, i_top |
# | +----------------------------------+ |
# | | | |
# | | | |
# | | | |
# | +----------------------------------+ |
# | i_left, i_bottom i_right , i_bottom |
# +----------------------------------------+
# o_left, o_bottom o_right, o_bottom

i_left = left + HALF_BORDER
i_bottom = bottom + HALF_BORDER
i_right = right - HALF_BORDER
i_top = top - HALF_BORDER

o_left = left - HALF_BORDER
o_bottom = bottom - HALF_BORDER
o_right = right + HALF_BORDER
o_top = top + HALF_BORDER

# Declared separately because the code below seems to break mypy
point_list: Point2List

# This is intentionally unrolled to minimize repacking tuples
if tilt_angle == 0:
point_list = (
(o_left , o_top ),
(i_left , i_top ),
(o_right , o_top ),
(i_right , i_top ),
(o_right , o_bottom),
(i_right , i_bottom),
(o_left , o_bottom),
(i_left , i_bottom),
(o_left , o_top ),
(i_left , i_top )
)
else:
point_list = (
rotate_point(o_left , o_top , x, y, tilt_angle),
rotate_point(i_left , i_top , x, y, tilt_angle),
rotate_point(o_right , o_top , x, y, tilt_angle),
rotate_point(i_right , i_top , x, y, tilt_angle),
rotate_point(o_right , o_bottom, x, y, tilt_angle),
rotate_point(i_right , i_bottom, x, y, tilt_angle),
rotate_point(o_left , o_bottom, x, y, tilt_angle),
rotate_point(i_left , i_bottom, x, y, tilt_angle),
rotate_point(o_left , o_top , x, y, tilt_angle),
rotate_point(i_left , i_top , x, y, tilt_angle)
)
# fmt: on

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 = []
for point in point_list:
new_point = rotate_point(point[0], point[1], rect.x, rect.y, tilt_angle)
point_list_2.append(new_point)
point_list = point_list_2

_generic_draw_line_strip(point_list, color, gl.TRIANGLE_STRIP)


Expand Down
Loading