Typing fixes and small Pyglet 3 updates

Author: Cleptomania

arcade/__init__.py

@@ -59,7 +59,7 @@ def configure_logging(level: int | None = None):
 
 # Enable HiDPI support using stretch mode
 if os.environ.get("ARCADE_TEST"):
-    pyglet.options.dpi_scaling = "real"
+    pyglet.options.dpi_scaling = "platform"
 else:
     pyglet.options.dpi_scaling = "stretch"
 
@@ -68,13 +68,6 @@ def configure_logging(level: int | None = None):
 if headless:
     pyglet.options.headless = headless
 
-
-# from arcade import utils
-# Disable shadow window on macs and in headless mode.
-# if sys.platform == "darwin" or os.environ.get("ARCADE_HEADLESS") or utils.is_raspberry_pi():
-# NOTE: We always disable shadow window now to have consistent behavior across platforms.
-pyglet.options.shadow_window = False
-
 # Imports from modules that don't do anything circular
 
 # Complex imports with potential circularity

arcade/future/video/video_player.py

@@ -23,7 +23,7 @@ class VideoPlayer:
     """
 
     def __init__(self, path: str | Path, loop: bool = False):
-        self.player = pyglet.media.Player()
+        self.player = pyglet.media.VideoPlayer()
         self.player.loop = loop
         self.player.queue(pyglet.media.load(str(arcade.resources.resolve(path))))
         self.player.play()
@@ -80,7 +80,7 @@ def get_video_size(self) -> tuple[int, int]:
             width *= video_format.sample_aspect
         elif video_format.sample_aspect < 1:
             height /= video_format.sample_aspect
-        return width, height
+        return int(width), int(height)
 
 
 class VideoPlayerView(arcade.View):

arcade/sprite_list/sprite_list.py

@@ -1681,13 +1681,17 @@ def get_nearby_sprite_indices(self, pos: Point, size: Point, length: int) -> lis
             A list of indices of nearby sprites.
         """
         ctx = self.ctx
+
         ctx.collision_detection_program["check_pos"] = pos
         ctx.collision_detection_program["check_size"] = size
         buffer = ctx.collision_buffer
         with ctx.collision_query:
-            self._geometry.transform(  # type: ignore
-                ctx.collision_detection_program,
-                buffer,
+            # These calls are typed as | None because of the arcade.gl backends, but at this
+            # point if we have SpriteListBufferData these are guaranteed to be on a backend
+            # where they will not be None.
+            self._geometry.transform(
+                ctx.collision_detection_program,  # type: ignore
+                buffer,  # type: ignore
                 vertices=length,
             )
 
@@ -1882,6 +1886,8 @@ def get_nearby_sprite_indices(self, pos: Point, size: Point, length: int) -> lis
             A list of indices of nearby sprites.
         """
         ctx = self.ctx
+        if (ctx._gl_api == "webgl"):
+            raise RuntimeError("GPU Collision is not supported on WebGL Backends")
         buffer = ctx.collision_buffer
         program = ctx.collision_detection_program_simple
         program["check_pos"] = pos
@@ -1892,9 +1898,11 @@ def get_nearby_sprite_indices(self, pos: Point, size: Point, length: int) -> lis
         self._storage_index.use(2)
 
         with ctx.collision_query:
+            # This is ignored because it is guaranteed to not be none by the above context GL api
+            # check. This is only able to be None when we are on WebGL.
             ctx.geometry_empty.transform(
                 program,
-                buffer,
+                buffer,  # type: ignore
                 vertices=length,
             )
         emit_count = ctx.collision_query.primitives_generated

arcade/text.py

@@ -19,62 +19,6 @@
 __all__ = ["load_font", "Text", "create_text_sprite", "draw_text"]
 
 
-class _ArcadeTextLayoutGroup(pyglet.text.layout.TextLayoutGroup):
-    """Create a text layout rendering group.
-
-    Overrides pyglet blending handling to allow for additive blending.
-    Furthermore, it resets the blend function to the previous state.
-    """
-
-    _prev_blend: bool
-    _prev_blend_func: tuple[int, int, int, int]
-
-    def set_state(self) -> None:
-        self.program.use()
-        self.program["scissor"] = False
-
-        pyglet.gl.glActiveTexture(pyglet.gl.GL_TEXTURE0)
-        pyglet.gl.glBindTexture(self.texture.target, self.texture.id)
-
-        blend = c_ubyte()
-        pyglet.gl.glGetBooleanv(pyglet.gl.GL_BLEND, blend)
-        self._prev_blend = bool(blend.value)
-
-        src_rgb = c_int()
-        dst_rgb = c_int()
-        src_alpha = c_int()
-        dst_alpha = c_int()
-        pyglet.gl.glGetIntegerv(pyglet.gl.GL_BLEND_SRC_RGB, src_rgb)
-        pyglet.gl.glGetIntegerv(pyglet.gl.GL_BLEND_DST_RGB, dst_rgb)
-        pyglet.gl.glGetIntegerv(pyglet.gl.GL_BLEND_SRC_ALPHA, src_alpha)
-        pyglet.gl.glGetIntegerv(pyglet.gl.GL_BLEND_DST_ALPHA, dst_alpha)
-
-        self._prev_blend_func = (src_rgb.value, dst_rgb.value, src_alpha.value, dst_alpha.value)
-
-        pyglet.gl.glEnable(pyglet.gl.GL_BLEND)
-        pyglet.gl.glBlendFuncSeparate(
-            pyglet.gl.GL_SRC_ALPHA,
-            pyglet.gl.GL_ONE_MINUS_SRC_ALPHA,
-            pyglet.gl.GL_ONE,
-            pyglet.gl.GL_ONE,
-        )
-
-    def unset_state(self) -> None:
-        if not self._prev_blend:
-            pyglet.gl.glDisable(pyglet.gl.GL_BLEND)
-
-        pyglet.gl.glBlendFuncSeparate(
-            self._prev_blend_func[0],
-            self._prev_blend_func[1],
-            self._prev_blend_func[2],
-            self._prev_blend_func[3],
-        )
-        self.program.stop()
-
-
-pyglet.text.layout.TextLayout.group_class = _ArcadeTextLayoutGroup
-
-
 def load_font(path: str | Path) -> None:
     """
     Load fonts in a file (usually .ttf) adding them to a global font registry.