Skip to content

Commit 57d4e80

Browse files
gottadiveintopythongottadiveintopython
committed
コードのスタイルをある程度揃える
1 parent 9e3d692 commit 57d4e80

18 files changed

+75
-71
lines changed

‎examples/03_countdown_on_gui.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import pygame
22
import pygame.font
3-
from pygame.colordict import THECOLORS as COLORS
3+
from pygame.colordict import THECOLORS
44
import asyncpygame as apg
55

66

@@ -10,8 +10,8 @@ async def main(*, clock: apg.Clock, **kwargs):
1010
screen = pygame.display.set_mode((400, 400))
1111
screen_center = screen.get_rect().center
1212
font = pygame.font.SysFont(None, 400)
13-
fgcolor = COLORS["black"]
14-
bgcolor = COLORS["white"]
13+
fgcolor = THECOLORS["black"]
14+
bgcolor = THECOLORS["white"]
1515

1616
count_from = 3
1717
for i in range(count_from, -1, -1):

‎examples/04_countdown_in_a_more_practical_way.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from functools import partial
22
import pygame
33
import pygame.font
4-
from pygame.colordict import THECOLORS as COLORS
4+
from pygame.colordict import THECOLORS
55
import asyncpygame as apg
66

77

@@ -11,10 +11,10 @@ async def main(*, clock: apg.Clock, executor: apg.PriorityExecutor, **kwargs):
1111
screen = pygame.display.set_mode((400, 400))
1212
screen_center = screen.get_rect().center
1313
font = pygame.font.SysFont(None, 400)
14-
fgcolor = COLORS["black"]
14+
fgcolor = THECOLORS["black"]
1515

1616
# Functions with a lower priority will be called earlier.
17-
executor.register(partial(screen.fill, COLORS["white"]), priority=0)
17+
executor.register(partial(screen.fill, THECOLORS["white"]), priority=0)
1818
req = executor.register(None, priority=0x100)
1919
executor.register(pygame.display.flip, priority=0xFFFFFF00)
2020

‎examples/05_countdown_in_an_even_more_practical_way.py‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,33 @@
1+
from typing import Unpack
12
from functools import partial
23
import pygame
34
import pygame.font
4-
from pygame.colordict import THECOLORS as COLORS
5+
from pygame.colordict import THECOLORS
56
import asyncpygame as apg
67

78

8-
async def countdown(*, count_from: int, draw_target: pygame.Surface, clock: apg.Clock, executor: apg.PriorityExecutor, priority, **kwargs):
9+
async def countdown(*, count_from: int, draw_target: pygame.Surface, clock: apg.Clock, executor: apg.PriorityExecutor, priority, **__):
910
center = draw_target.get_rect().center
1011
font = pygame.font.SysFont(None, 400)
11-
fgcolor = COLORS["black"]
12+
fgcolor = THECOLORS["black"]
1213

13-
with executor.register(None, priority=priority) as req:
14+
with executor.register(None, priority) as req:
1415
for i in range(count_from, -1, -1):
1516
img = font.render(str(i), True, fgcolor).convert_alpha()
1617
req.callback = partial(draw_target.blit, img, img.get_rect(center=center))
1718
await clock.sleep(1000)
1819

1920

20-
async def main(**kwargs):
21+
async def main(**kwargs: Unpack[apg.CommonParams]):
2122
pygame.init()
2223
pygame.display.set_caption("Countdown")
23-
screen = pygame.display.set_mode((400, 400))
24+
kwargs["draw_target"] = screen = pygame.display.set_mode((400, 400))
2425

2526
r = kwargs["executor"].register
26-
r(partial(screen.fill, COLORS["white"]), priority=0)
27+
r(partial(screen.fill, THECOLORS["white"]), priority=0)
2728
r(pygame.display.flip, priority=0xFFFFFF00)
2829

29-
await countdown(count_from=3, draw_target=screen, priority=0x100, **kwargs)
30+
await countdown(count_from=3, priority=0x100, **kwargs)
3031

3132

3233
if __name__ == "__main__":

‎examples/06_full_blown_app_structure.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import pygame
55
import pygame.font
6-
from pygame.colordict import THECOLORS as COLORS
6+
from pygame.colordict import THECOLORS
77
import pygame.constants as C
88

99
import asyncpygame as apg
@@ -19,7 +19,7 @@ async def main(**kwargs: Unpack[apg.CommonParams]):
1919
pygame.display.set_caption("<Your App Title>")
2020
kwargs["draw_target"] = screen = pygame.display.set_mode((800, 600))
2121

22-
bgcolor = COLORS["black"]
22+
bgcolor = THECOLORS["black"]
2323
r = kwargs["executor"].register
2424
r(partial(screen.fill, bgcolor), priority=0)
2525
r(pygame.display.flip, priority=0xFFFFFF00)

‎examples/_uix/modal_dialog.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414

1515

1616
@asynccontextmanager
17-
async def darken(**kwargs: Unpack[CommonParams]):
17+
async def darken(*, priority, **kwargs: Unpack[CommonParams]):
1818
interpolate = kwargs["clock"].interpolate_scalar
1919
draw_target = kwargs["draw_target"]
2020
overlay_surface = draw_target.copy()
2121
overlay_surface.fill("black")
2222
set_alpha = overlay_surface.set_alpha
23-
with kwargs["executor"].register(partial(draw_target.blit, overlay_surface), kwargs["priority"]):
23+
with kwargs["executor"].register(partial(draw_target.blit, overlay_surface), priority):
2424
async for v in interpolate(0, 180, duration=200):
2525
set_alpha(v)
2626
yield

‎examples/_uix/progress_spinner.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def _draw(pygame_draw_arc, draw_target, color, rect, line_width, self: Self):
2323
_draw = partial(_draw, pygame.draw.arc)
2424

2525

26-
async def progress_spinner(dest: Rect, *, color="black", line_width=20, min_arc_angle=0.3, speed=1.0, **kwargs):
26+
async def progress_spinner(dest: Rect, *, color="white", line_width=20, min_arc_angle=0.3, speed=1.0, priority, **kwargs):
2727
R1 = 0.4
2828
R2 = math.tau - min_arc_angle * 2
2929
next_start = itertools.accumulate(itertools.cycle((R1, R1, R1 + R2, R1, )), initial=0).__next__
@@ -32,6 +32,6 @@ async def progress_spinner(dest: Rect, *, color="black", line_width=20, min_arc_
3232

3333
anim_attrs = kwargs["clock"].anim_attrs
3434
arc = Arc(kwargs["draw_target"], Color(color), dest, next_start(), next_stop(), line_width)
35-
with kwargs["executor"].register(arc.draw, kwargs["priority"]):
35+
with kwargs["executor"].register(arc.draw, priority):
3636
while True:
3737
await anim_attrs(arc, start_angle=next_start(), stop_angle=next_stop(), duration=d)

‎examples/_uix/touch_indicator.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ def _draw(pygame_draw_circle, draw_target, color, radius, line_width, self: Self
2222
_draw = partial(_draw, pygame.draw.circle)
2323

2424

25-
async def touch_indicator(*, color="black", radius=60, line_width=4, **kwargs: Unpack[apg.CommonParams]):
25+
async def touch_indicator(*, color="white", radius=60, line_width=4, priority, **kwargs: Unpack[apg.CommonParams]):
2626
color = Color(color)
2727
draw_target = kwargs["draw_target"]
2828
async with (
2929
apg.open_nursery() as nursery,
3030
kwargs["sdlevent"].wait_freq(
31-
C.MOUSEBUTTONDOWN, C.FINGERDOWN, priority=kwargs["priority"],
31+
C.MOUSEBUTTONDOWN, C.FINGERDOWN, priority=priority,
3232
filter=lambda e: not getattr(e, 'touch', False)
3333
) as touch_down,
3434
):
@@ -38,10 +38,10 @@ async def touch_indicator(*, color="black", radius=60, line_width=4, **kwargs: U
3838
f = draw_ring_under_mouse_cursor
3939
else:
4040
f = draw_ring_under_finger
41-
nursery.start(f(e_down, ring=Ring(draw_target, color, e_down.pos, radius, line_width), **kwargs))
41+
nursery.start(f(e_down, priority=priority, ring=Ring(draw_target, color, e_down.pos, radius, line_width), **kwargs))
4242

4343

44-
async def draw_ring_under_mouse_cursor(e_down: Event, *, priority, executor, sdlevent, ring, **unsued):
44+
async def draw_ring_under_mouse_cursor(e_down: Event, *, priority, executor, sdlevent, ring, **__):
4545
with executor.register(ring.draw, priority):
4646
async with (
4747
apg.move_on_when(sdlevent.wait(C.MOUSEBUTTONUP, filter=lambda e: e.button == e_down.button, priority=priority)),
@@ -52,7 +52,7 @@ async def draw_ring_under_mouse_cursor(e_down: Event, *, priority, executor, sdl
5252
ring.pos = e.pos
5353

5454

55-
async def draw_ring_under_finger(e_down: Event, *, priority, executor, sdlevent, ring, **unused):
55+
async def draw_ring_under_finger(e_down: Event, *, priority, executor, sdlevent, ring, **__):
5656
with executor.register(ring.draw, priority):
5757
async with (
5858
apg.move_on_when(sdlevent.wait(C.FINGERUP, filter=lambda e: e.finger_id == e_down.finger_id, priority=priority)),

‎examples/_uix_anchor_layout.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1+
from typing import Unpack
12
from functools import partial
23

34
import pygame
45
import pygame.font
5-
from pygame.colordict import THECOLORS as COLORS
6+
from pygame.colordict import THECOLORS
67
import asyncpygame as apg
78

89
from _uix.anchor_layout import AnchorLayout
910

1011

11-
async def main(**kwargs):
12+
async def main(**kwargs: Unpack[apg.CommonParams]):
1213
pygame.init()
1314
pygame.display.set_caption("Anchor Layout")
14-
screen = pygame.display.set_mode((800, 600))
15+
kwargs["draw_target"] = screen = pygame.display.set_mode((800, 600))
1516
font = pygame.font.SysFont(None, 30)
1617

1718
r = kwargs["executor"].register
18-
r(partial(screen.fill, COLORS["black"]), priority=0)
19+
r(partial(screen.fill, THECOLORS["black"]), priority=0)
1920
r(pygame.display.flip, priority=0xFFFFFF00)
20-
kwargs["draw_target"] = screen
2121

2222
async with apg.open_nursery() as nursery:
2323
dest = screen.get_rect().inflate(-20, -20)

‎examples/_uix_progress_spinner.py‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
1+
from typing import Unpack
12
from functools import partial
23

34
import pygame
4-
from pygame.colordict import THECOLORS as COLORS
5-
import asyncpygame
5+
from pygame.colordict import THECOLORS
6+
import asyncpygame as apg
67

78
from _uix.progress_spinner import progress_spinner
89

910

10-
async def main(**kwargs):
11+
async def main(**kwargs: Unpack[apg.CommonParams]):
1112
pygame.init()
1213
pygame.display.set_caption("Progress Spinner")
13-
screen = pygame.display.set_mode((600, 600))
14+
kwargs["draw_target"] = screen = pygame.display.set_mode((600, 600))
1415

1516
r = kwargs["executor"].register
16-
r(partial(screen.fill, COLORS["white"]), priority=0)
17+
r(partial(screen.fill, THECOLORS["black"]), priority=0)
1718
r(pygame.display.flip, priority=0xFFFFFF00)
1819

19-
await progress_spinner(screen.get_rect().scale_by(0.8), priority=0x100, draw_target=screen, **kwargs)
20+
await progress_spinner(screen.get_rect().scale_by(0.8), priority=0x100, **kwargs)
2021

2122

2223
if __name__ == "__main__":
23-
asyncpygame.run(main)
24+
apg.run(main)

‎examples/_uix_ripple_button.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1+
from typing import Unpack
12
from functools import partial
23

34
import pygame
45
import pygame.font
5-
from pygame.colordict import THECOLORS as COLORS
6+
from pygame.colordict import THECOLORS
67
from pygame import Rect
78
import asyncpygame as apg
89

910
from _uix.ripple_button import RippleButton
1011

1112

12-
async def main(**kwargs):
13+
async def main(**kwargs: Unpack[apg.CommonParams]):
1314
pygame.init()
1415
pygame.display.set_caption("Ripple Button")
15-
screen = pygame.display.set_mode((800, 600))
16+
kwargs["draw_target"] = screen = pygame.display.set_mode((800, 600))
1617
font = pygame.font.SysFont(None, 100)
1718

1819
r = kwargs["executor"].register
19-
r(partial(screen.fill, COLORS["black"]), priority=0)
20+
r(partial(screen.fill, THECOLORS["black"]), priority=0)
2021
r(pygame.display.flip, priority=0xFFFFFF00)
21-
kwargs["draw_target"] = screen
2222

2323
async with apg.open_nursery() as nursery:
2424
RippleButton(nursery, font.render("PyGame", True, "white"), Rect(100, 100, 300, 200), priority=0x100, **kwargs)

0 commit comments

Comments
 (0)