pyglet 3.0.dev1__py3-none-any.whl → 3.0.dev2__py3-none-any.whl

pyglet/__init__.py

@@ -16,7 +16,7 @@ if TYPE_CHECKING:
     from typing import Any, Callable, ItemsView, Sized
 
 #: The release version
-version = '3.0.dev1'
+version = '3.0.dev2'
 __version__ = version
 
 MIN_PYTHON_VERSION = 3, 8

pyglet/enums.py

@@ -10,6 +10,15 @@ class GraphicsAPI(Enum):
     WEBGL = auto()
 
 
+class GeometryMode(Enum):
+    POINTS = auto()
+    LINES = auto()
+    LINE_STRIP = auto()
+    TRIANGLES = auto()
+    TRIANGLE_STRIP = auto()
+    TRIANGLE_FAN = auto()
+
+
 class BlendFactor(Enum):
     ZERO = "ZERO"
     ONE = "ONE"
@@ -86,11 +95,13 @@ class CompareOp(Enum):
     GREATER_OR_EQUAL = auto()
     ALWAYS = auto()
 
+
 class FramebufferTarget(Enum):
     FRAMEBUFFER = auto()
     DRAW = auto()
     READ = auto()
 
+
 class FramebufferAttachment(Enum):
     COLOR0 = auto()
     COLOR1 = auto()
@@ -114,7 +125,6 @@ class FramebufferAttachment(Enum):
     DEPTH_STENCIL = auto()
 
 
-
 class Weight(str, Enum):
     """An :py:class:`~enum.Enum` of known cross-platform font weight strings.
 

pyglet/experimental/geoshader_sprite.py

@@ -4,7 +4,7 @@ import sys
 
 import pyglet
 from pyglet import clock, event, graphics, image
-from pyglet.graphics import GeometryMode
+from pyglet.enums import GeometryMode
 from pyglet.graphics.api.gl import *
 
 _is_pyglet_doc_run = hasattr(sys, "is_pyglet_doc_run") and sys.is_pyglet_doc_run

pyglet/experimental/particles.py

@@ -7,8 +7,7 @@ import time
 
 import pyglet
 from pyglet import clock, event, graphics, image
-from pyglet.graphics import GeometryMode
-from pyglet.graphics.api.gl import *
+from pyglet.enums import BlendFactor, GeometryMode
 
 _is_pyglet_doc_run = hasattr(sys, "is_pyglet_doc_run") and sys.is_pyglet_doc_run
 
@@ -186,6 +185,9 @@ def get_default_shader():
 
 
 class EmitterGroup(graphics.Group):
+    blend_src: BlendFactor
+    blend_dest: BlendFactor
+
     def __init__(self, texture, blend_src, blend_dest, program, parent=None):
         super().__init__(parent=parent)
         self.texture = texture
@@ -203,15 +205,14 @@ class Emitter(event.EventDispatcher):
     _animation = None
     _frame_index = 0
     _paused = False
-    _rotation = 0
     _visible = True
     _vertex_list = None
     group_class = EmitterGroup
 
     def __init__(self, img, x, y, z, count, velocity, spread,
                  color_start=(255, 255, 255, 255), color_end=(255, 255, 255, 255),
-                 scale_start=(1.0, 1.0), scale_end=(1.0, 1.0),
-                 blend_src=GL_SRC_ALPHA, blend_dest=GL_ONE_MINUS_SRC_ALPHA,
+                 scale_start=(1.0, 1.0), scale_end=(1.0, 1.0), rotation=0.0,
+                 blend_src=BlendFactor.SRC_ALPHA, blend_dest=BlendFactor.ONE_MINUS_SRC_ALPHA,
                  batch=None, group=None, program=None):
 
         self._img = img
@@ -225,6 +226,7 @@ class Emitter(event.EventDispatcher):
         self._color_end = color_end
         self._scale_start = scale_start
         self._scale_end = scale_end
+        self._rotation = rotation
 
         if isinstance(img, image.Animation):
             self._animation = img
@@ -274,7 +276,7 @@ class Emitter(event.EventDispatcher):
                                        program,
                                        self._user_group)
         if (self._batch and
-                self._batch.update_shader(self._vertex_list, GL_POINTS, self._group, program)):
+                self._batch.update_shader(self._vertex_list, GeometryMode.POINTS, self._group, program)):
             # Exit early if changing domain is not needed.
             return
 
@@ -290,7 +292,8 @@ class Emitter(event.EventDispatcher):
         """
         if self._animation:
             clock.unschedule(self._animate)
-        self._vertex_list.delete()
+        if self._vertex_list:
+            self._vertex_list.delete()
         self._vertex_list = None
         self._texture = None
         self._group = None
@@ -357,47 +360,36 @@ class ParticleManager:
     def __init__(self, img, lifespan, count, velocity,
                  spread=(10.0, 10.0),
                  color_start=(255, 255, 255, 255), color_end=(255, 255, 255, 255),
-                 scale_start=(1.0, 1.0), scale_end=(1.0, 1.0),
+                 scale_start=(1.0, 1.0), scale_end=(1.0, 1.0), rotation=0.0,
                  batch=None, group=None):
 
         self._img = img
-        self._lifespan = lifespan
-        self._count = count
-        self._velocity = velocity
-        self._spread = spread
-        self._color_start = color_start
-        self._color_end = color_end
-        self._scale_start = scale_start
-        self._scale_end = scale_end
+        self.lifespan = lifespan
+        self.count = count
+        self.velocity = velocity
+        self.spread = spread
+        self.color_start = color_start
+        self.color_end = color_end
+        self.scale_start = scale_start
+        self.scale_end = scale_end
+        self.rotation = rotation
 
         self._batch = batch
         self._group = group
         self._program = get_default_shader()
         clock.schedule_interval(self._update_shader_time, 1 / 60)
 
-        # TODO: remove debug
-        self.total_number = 0
-        self.total_label = pyglet.text.Label("particles: 0", 10, 10, dpi=256, color=(10, 200, 10), batch=batch)
-
     def _update_shader_time(self, dt):
         self._program['time'] = time.perf_counter()
 
-    def _delete_callback(self, dt, emitter):
+    @staticmethod
+    def _delete_callback(dt, emitter):
         emitter.delete()
 
-        # TODO: remove debug
-        self.total_number -= 1
-        self.total_label.text = f"particles: {self.total_number * self._count * 8!s}"
-
     def create_emitter(self, x, y, z=0):
-        emitter = Emitter(self._img, x, y, z, self._count, self._velocity, self._spread,
-                          color_start=self._color_start, color_end=self._color_end,
-                          scale_start=self._scale_start, scale_end=self._scale_end,
+        emitter = Emitter(self._img, x, y, z, self.count, self.velocity, self.spread,
+                          color_start=self.color_start, color_end=self.color_end,
+                          scale_start=self.scale_start, scale_end=self.scale_end, rotation=self.rotation,
                           batch=self._batch, group=self._group)
-        pyglet.clock.schedule_once(self._delete_callback, self._lifespan, emitter)
-
-        # TODO: remove debug
-        self.total_number += 1
-        self.total_label.text = f"particles: {self.total_number * self._count * 8!s}"
-
+        pyglet.clock.schedule_once(self._delete_callback, self.lifespan, emitter)
         return emitter

pyglet/graphics/__init__.py

@@ -8,8 +8,6 @@ See the :ref:`guide_graphics` for details on how to use this graphics API.
 """
 from __future__ import annotations
 
-
-from pyglet.graphics.base import GeometryMode  # noqa: F401
 from pyglet.graphics import api  # noqa: F401
 from pyglet.graphics.draw import Group, ShaderGroup  # noqa: F401
 from pyglet.graphics.state import State  # noqa: F401

pyglet/graphics/api/gl/draw.py

@@ -14,7 +14,7 @@ from pyglet.graphics.state import State
 _debug_graphics_batch = pyglet.options.debug_graphics_batch
 
 if TYPE_CHECKING:
-    from pyglet.graphics import GeometryMode
+    from pyglet.enums import GeometryMode
     from pyglet.graphics.api.gl2.shader import ShaderProgram
     from pyglet.graphics.api.gl.vertexdomain import VertexList, IndexedVertexList
 

pyglet/graphics/api/gl/enums.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-from pyglet.graphics import GeometryMode
 from pyglet.graphics.api.gl import (
     GL_LINEAR, GL_NEAREST, GL_TEXTURE_1D, GL_TEXTURE_2D, GL_TEXTURE_3D, \
     GL_TEXTURE_CUBE_MAP, \
@@ -15,7 +14,7 @@ from pyglet.graphics.api.gl import (
     GL_CONSTANT_ALPHA, GL_ONE_MINUS_CONSTANT_ALPHA, GL_NEVER, GL_LESS, GL_EQUAL, GL_LEQUAL, GL_GREATER, GL_NOTEQUAL,
     GL_GEQUAL, GL_ALWAYS)
 
-from pyglet.enums import BlendFactor, TextureFilter, TextureType, TextureWrapping, CompareOp
+from pyglet.enums import BlendFactor, TextureFilter, TextureType, TextureWrapping, CompareOp, GeometryMode
 
 geometry_map = {
     GeometryMode.POINTS: GL_POINTS,

pyglet/graphics/api/gl/shader.py

@@ -42,7 +42,7 @@ from pyglet.graphics.shader import ShaderSource, ShaderType, ShaderBase, Attribu
 from pyglet.graphics.shader import ShaderException
 
 from pyglet.graphics.api.gl.buffer import BufferObject
-from pyglet.graphics import GeometryMode
+from pyglet.enums import GeometryMode
 
 if TYPE_CHECKING:
     from _weakref import CallableProxyType

pyglet/graphics/api/gl/vertexdomain.py

@@ -64,7 +64,8 @@ from pyglet.graphics.vertexdomain import (
 if TYPE_CHECKING:
     from ctypes import Array
     from pyglet.graphics.shader import AttributeView
-    from pyglet.graphics import GeometryMode, Group
+    from pyglet.graphics import Group
+    from pyglet.enums import GeometryMode
     from pyglet.graphics.shader import Attribute
     from pyglet.customtypes import CType, DataTypes
 

pyglet/graphics/api/gl2/draw.py

@@ -23,7 +23,7 @@ _debug_graphics_batch = pyglet.options.debug_graphics_batch
 
 if TYPE_CHECKING:
     from pyglet.graphics.state import State
-    from pyglet.graphics import GeometryMode
+    from pyglet.enums import GeometryMode
     from pyglet.graphics.api.gl2.shader import ShaderProgram
 
 

pyglet/graphics/api/gl2/vertexdomain.py

@@ -62,7 +62,7 @@ from pyglet.graphics.vertexdomain import (
 if TYPE_CHECKING:
     from pyglet.graphics.shader import AttributeView
     from pyglet.customtypes import CType, DataTypes
-    from pyglet.graphics import GeometryMode
+    from pyglet.enums import GeometryMode
     from pyglet.graphics.shader import Attribute
 
 _c_types = {

pyglet/graphics/api/webgl/draw.py

@@ -10,7 +10,7 @@ from pyglet.graphics.draw import BatchBase, _DomainKey, Group
 _debug_graphics_batch = pyglet.options.debug_graphics_batch
 
 if TYPE_CHECKING:
-    from pyglet.graphics import GeometryMode
+    from pyglet.enums import GeometryMode
     from pyglet.graphics.api.webgl.vertexdomain import IndexedVertexList, VertexList
     from pyglet.graphics.api.webgl.shader import ShaderProgram
     from pyglet.graphics.api.webgl.context import OpenGLSurfaceContext

pyglet/graphics/api/webgl/enums.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-from pyglet.graphics import GeometryMode
 from pyglet.graphics.api.webgl.gl import (
     GL_LINEAR, GL_NEAREST, GL_TEXTURE_1D, GL_TEXTURE_2D, GL_TEXTURE_3D, \
     GL_TEXTURE_CUBE_MAP, \
@@ -15,7 +14,7 @@ from pyglet.graphics.api.webgl.gl import (
     GL_CONSTANT_ALPHA, GL_ONE_MINUS_CONSTANT_ALPHA, GL_NEVER, GL_LESS, GL_EQUAL, GL_LEQUAL, GL_GREATER, GL_NOTEQUAL,
     GL_GEQUAL, GL_ALWAYS)
 
-from pyglet.enums import BlendFactor, TextureFilter, TextureType, TextureWrapping, CompareOp
+from pyglet.enums import BlendFactor, TextureFilter, TextureType, TextureWrapping, CompareOp, GeometryMode
 
 geometry_map = {
     GeometryMode.POINTS: GL_POINTS,

pyglet/graphics/api/webgl/shader.py

@@ -26,7 +26,7 @@ from typing import TYPE_CHECKING, Any, Callable, Sequence, Type, Union
 import pyglet
 
 # from pyglet.graphics.api.webgl.buffer import BufferObject
-from pyglet.graphics import GeometryMode
+from pyglet.enums import GeometryMode
 from pyglet.graphics.api.webgl import gl
 from pyglet.graphics.api.webgl.buffer import BufferObject
 from pyglet.graphics.api.webgl.gl import (

pyglet/graphics/api/webgl/vertexdomain.py

@@ -66,7 +66,7 @@ from pyglet.graphics.vertexdomain import (
 if TYPE_CHECKING:
     from pyglet.graphics.shader import AttributeView
     from pyglet.customtypes import CType, DataTypes
-    from pyglet.graphics import GeometryMode
+    from pyglet.enums import GeometryMode
     from pyglet.graphics.shader import Attribute
     from pyglet.graphics.api.webgl.context import OpenGLSurfaceContext
 
@@ -228,7 +228,7 @@ class VertexDomain(VertexDomainBase):
         if self._supports_multi_draw:
             starts = (GLint * primcount)(*start_list)
             sizes = (GLsizei * primcount)(*size_list)
-            self._multi_draw_array(starts[:], 0, sizes[:], 0, primcount)
+            self._multi_draw_array(mode, starts[:], 0, sizes[:], 0, primcount)
         else:
             for start, size in zip(start_list, size_list):
                 self._gl.drawArrays(mode, start, size)

pyglet/graphics/draw.py

@@ -5,7 +5,7 @@ from dataclasses import dataclass
 from typing import Any, Callable, Sequence, TYPE_CHECKING
 
 import pyglet
-from pyglet.enums import BlendFactor, BlendOp, CompareOp
+from pyglet.enums import BlendFactor, BlendOp, CompareOp, GeometryMode
 
 from pyglet.graphics.state import (
     State,
@@ -22,7 +22,6 @@ from pyglet.graphics.state import (
 
 if TYPE_CHECKING:
     from pyglet.customtypes import ScissorProtocol
-    from pyglet.graphics import GeometryMode
     from pyglet.graphics.api.base import SurfaceContext
     from pyglet.graphics.texture import TextureBase
     from pyglet.graphics.vertexdomain import VertexDomain, VertexList, IndexedVertexList

pyglet/graphics/shader.py

@@ -10,7 +10,8 @@ from typing import Literal, Sequence, Any, TYPE_CHECKING, Callable, Protocol
 if TYPE_CHECKING:
     from pyglet.customtypes import DataTypes, CType
     from pyglet.graphics.vertexdomain import IndexedVertexList, VertexList, InstanceIndexedVertexList, InstanceVertexList
-    from pyglet.graphics import GeometryMode, Batch, Group
+    from pyglet.graphics import Batch, Group
+    from pyglet.enums import GeometryMode
     from _weakref import CallableProxyType
 
 

pyglet/graphics/vertexdomain.py

@@ -35,7 +35,8 @@ if TYPE_CHECKING:
     from pyglet.graphics.api.base import SurfaceContext
     from pyglet.graphics.instance import InstanceBucket, VertexInstanceBase, BaseInstanceDomain
     from pyglet.graphics.buffer import AttributeBufferObject, IndexedBufferObject
-    from pyglet.graphics import GeometryMode, Group
+    from pyglet.graphics import Group
+    from pyglet.enums import GeometryMode
 
 
 def _nearest_pow2(v: int) -> int:

pyglet/gui/ninepatch.py

@@ -2,12 +2,12 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from pyglet.enums import BlendFactor
+from pyglet.enums import BlendFactor, GeometryMode
 from pyglet.sprite import Sprite
 
 if TYPE_CHECKING:
     from pyglet.image import _AbstractImage, Animation
-    from pyglet.graphics import Batch, Group, GeometryMode
+    from pyglet.graphics import Batch, Group
     from pyglet.text.layout import TextLayout
 
 

pyglet/gui/widgets.py

@@ -266,7 +266,7 @@ class PushButton(WidgetBase):
             return
         self._sprite.image = self._unpressed_img
         self._pressed = False
-        self.dispatch_event('on_release')
+        self.dispatch_event('on_release', self)
 
     def on_mouse_motion(self, x: int, y: int, dx: int, dy: int) -> None:
         if not self.enabled or self._pressed:

pyglet/input/base.py

@@ -77,12 +77,13 @@ class Device:
 
         Args:
             window:
-                Optional window to associate with the device.  The behaviour
+                Optional window to associate with the device. The behavior
                 of this parameter is device and operating system dependent.
                 It can usually be omitted for most devices.
             exclusive:
                 If ``True`` the device will be opened exclusively so that no
-                other application can use it.
+                other application can use it. Note that not all device types
+                support being opened exclusively.
 
         Raises:
             DeviceOpenException:

pyglet/input/win32/xinput.py

@@ -551,12 +551,12 @@ class XInputController(Controller):
 
         for button_name in controller_api_to_pyglet.values():
             control = self.device.controls[button_name]
-            self._button_controls.append(control)
+            # self.button_controls.append(control)
             self._bind_button_control(control, button_name)
 
         for axis_name in "leftx", "lefty", "rightx", "righty", "lefttrigger", "righttrigger":
             control = self.device.controls[axis_name]
-            self._axis_controls.append(control)
+            # self.absolute_axis_controls.append(control)
             self._bind_axis_control(control, axis_name, Sign.DEFAULT)
 
     def rumble_play_weak(self, strength=1.0, duration=0.5):

pyglet/media/codecs/webaudio_pyodide.py

@@ -97,10 +97,9 @@ class PyodideDecoder(MediaDecoder):  # noqa: D101
         return '.mp3', '.aac', '.wav', '.ogg', '.webm'
         # possibly use audio.canPlayType?
 
-    def decode(self, filename: str, file: BinaryIO, streaming: bool = True) -> JavascriptWebAudioSource | StaticSource:
-        if streaming:
-            return JavascriptWebAudioSource(filename, file)
-        return StaticSource(JavascriptWebAudioSource(filename, file))
+    def decode(self, filename: str, file: BinaryIO, streaming: bool = True) -> JavascriptWebAudioSource:
+        # web audio doesn't really have streaming sources, so just always return this regardless
+        return JavascriptWebAudioSource(filename, file)
 
 
 def get_decoders() -> list[PyodideDecoder]:  # noqa: D103

pyglet/model/__init__.py

@@ -32,6 +32,7 @@ from math import pi, sin, cos
 from typing import TYPE_CHECKING
 
 import pyglet
+import pyglet.enums
 from pyglet import graphics
 from pyglet.math import Mat4
 
@@ -128,7 +129,7 @@ class Model:
             batch = graphics.Batch()
 
         for group, vlist in zip(self.groups, self.vertex_lists):
-            self._batch.migrate(vlist, graphics.GeometryMode.TRIANGLES, group, batch)
+            self._batch.migrate(vlist, pyglet.enums.GeometryMode.TRIANGLES, group, batch)
 
         self._batch = batch
 
@@ -213,25 +214,6 @@ class TexturedMaterialGroup(BaseMaterialGroup):
         self.set_shader_program(program)
         self.uniforms = {"model": self.matrix}
         self.set_shader_uniforms(program, self.uniforms)
-    #
-    # def set_state(self) -> None:
-    #     # gl.glActiveTexture(gl.GL_TEXTURE0)
-    #     # gl.glBindTexture(self.texture.target, self.texture.id)
-    #     # self.program.use()
-    #     # self.program['model'] = self.matrix
-    #     pass
-    #
-    # def __hash__(self) -> int:
-    #     return hash((self.texture.target, self.texture.id, self.program, self.order, self.parent))
-    #
-    # def __eq__(self, other) -> bool:
-    #     return (self.__class__ is other.__class__ and
-    #             self.material == other.material and
-    #             self.texture.target == other.texture.target and
-    #             self.texture.id == other.texture.id and
-    #             self.program == other.program and
-    #             self.order == other.order and
-    #             self.parent == other.parent)
 
 
 class MaterialGroup(BaseMaterialGroup):
@@ -278,19 +260,11 @@ class MaterialGroup(BaseMaterialGroup):
     }
     """
 
-    def set_state(self) -> None:
-        self.program.use()
-        self.program['model'] = self.matrix
-
-    def __hash__(self):
-        return hash((self.material, self.program, self.order, self.parent))
-
-    def __eq__(self, other):
-        return (self.__class__ is other.__class__ and
-                self.material == other.material and
-                self.program == other.program and
-                self.order == other.order and
-                self.parent == other.parent)
+    def __init__(self, material: SimpleMaterial, program: ShaderProgram, order: int = 0, parent: Group | None = None):
+        super().__init__(material, program, order, parent)
+        self.set_shader_program(program)
+        self.uniforms = {"model": self.matrix}
+        self.set_shader_uniforms(program, self.uniforms)
 
 
 class Cube(Model):
@@ -364,7 +338,7 @@ class Cube(Model):
                    7, 6, 4, 6, 5, 4,        # back
                    3, 2, 0, 2, 1, 0]        # front
 
-        return self._program.vertex_list_indexed(len(vertices) // 3, graphics.GeometryMode.TRIANGLES, indices,
+        return self._program.vertex_list_indexed(len(vertices) // 3, pyglet.enums.GeometryMode.TRIANGLES, indices,
                                                  batch=self._batch, group=self._group,
                                                  POSITION=('f', vertices),
                                                  NORMAL=('f', normals),
@@ -422,7 +396,7 @@ class Sphere(Model):
                 indices.extend([first, second, second + 1])
                 indices.extend([first, second + 1, first + 1])
 
-        return self._program.vertex_list_indexed(len(vertices) // 3, graphics.GeometryMode.TRIANGLES, indices,
+        return self._program.vertex_list_indexed(len(vertices) // 3, pyglet.enums.GeometryMode.TRIANGLES, indices,
                                                  batch=self._batch, group=self._group,
                                                  POSITION=('f', vertices),
                                                  NORMAL=('f', normals),