Skip to content

Commit 47b1961

Browse files
committed
A few better types in arcade.future and arcade.particles.
Adding type parameters to some `SpriteList`s. One allows to get rid of a cast.
1 parent 83fd2e1 commit 47b1961

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

arcade/future/input/input_manager_example.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class Player(arcade.Sprite):
2626
def __init__(
2727
self,
2828
texture,
29-
walls: arcade.SpriteList,
29+
walls: arcade.SpriteList[arcade.Sprite],
3030
input_manager_template: InputManager,
3131
controller: pyglet.input.Controller | None = None,
3232
center_x: float = 0.0,
@@ -76,11 +76,11 @@ def __init__(
7676
}
7777

7878
self.players: list[Player | None] = []
79-
self.player_list = arcade.SpriteList()
79+
self.player_list: arcade.SpriteList[Player] = arcade.SpriteList()
8080
self.device_labels_batch = pyglet.graphics.Batch()
8181
self.player_device_labels: list[arcade.Text | None] = []
8282

83-
self.wall_list = arcade.SpriteList(use_spatial_hash=True)
83+
self.wall_list: arcade.SpriteList[arcade.Sprite] = arcade.SpriteList(use_spatial_hash=True)
8484

8585
for x in range(0, self.width + 64, 64):
8686
wall = arcade.Sprite(":resources:images/tiles/grassMid.png", scale=0.5)

arcade/future/light/light_demo.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def __init__(self, width, height, title):
1818
super().__init__(width, height, title)
1919
self.background = arcade.load_texture(":resources:images/backgrounds/abstract_1.jpg")
2020

21-
self.torch_list = arcade.SpriteList()
21+
self.torch_list: arcade.SpriteList[arcade.Sprite] = arcade.SpriteList()
2222
self.torch_list.extend(
2323
[
2424
arcade.Sprite(

arcade/particles/emitter.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
from __future__ import annotations
77

8-
from typing import Callable, cast
8+
from typing import Callable
99

1010
import arcade
1111
from arcade import Vec2
@@ -151,7 +151,7 @@ def __init__(
151151
self.particle_factory = particle_factory
152152
self._emit_done_cb = emit_done_cb
153153
self._reap_cb = reap_cb
154-
self._particles: arcade.SpriteList = arcade.SpriteList(use_spatial_hash=False)
154+
self._particles: arcade.SpriteList[Particle] = arcade.SpriteList(use_spatial_hash=False)
155155

156156
def _emit(self):
157157
"""
@@ -189,7 +189,7 @@ def update(self, delta_time: float = 1 / 60):
189189
for _ in range(emit_count):
190190
self._emit()
191191
self._particles.update(delta_time)
192-
particles_to_reap = [p for p in self._particles if cast(Particle, p).can_reap()]
192+
particles_to_reap = [p for p in self._particles if p.can_reap()]
193193
for dead_particle in particles_to_reap:
194194
dead_particle.kill()
195195

0 commit comments

Comments
 (0)