pyglet 2.1.10__tar.gz → 2.1.12__tar.gz

{pyglet-2.1.10 → pyglet-2.1.12}/PKG-INFO

@@ -1,10 +1,11 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: pyglet
-Version: 2.1.10
+Version: 2.1.12
 Summary: pyglet is a cross-platform games and multimedia package.
 Author-email: Alex Holkner & contributors <Alex.Holkner@gmail.com>
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
+License-File: LICENSE
 Project-URL: Home, https://pyglet.org
 
 [![pypi](https://badge.fury.io/py/pyglet.svg)](https://pypi.python.org/pypi/pyglet) [![rtd](https://readthedocs.org/projects/pyglet/badge/?version=latest)](https://pyglet.readthedocs.io) [![PyTest](https://github.com/pyglet/pyglet/actions/workflows/unittests.yml/badge.svg)](https://github.com/pyglet/pyglet/actions/workflows/unittests.yml)

{pyglet-2.1.10 → pyglet-2.1.12}/RELEASE_NOTES

@@ -1,3 +1,24 @@
+pyglet 2.1.12
+
+Bugfixes
+--------
+shapes: On vertex_list creation, ensure vertex data is initialized for rotation.
+
+
+pyglet 2.1.11
+
+Changes
+-------
+shader: Add some missing Uniform type definitions that were missed for less common types. #1380
+ffmpeg: Remove some missing attributes (libavformat version loading) that have been removed in FFMpeg 8.0.
+
+Bugfixes
+--------
+media.ffmpeg: Fix source padding issue for some sources. #1386
+window.win32: Fix memory address issues when queuing events during Windows OS window creation. #1382
+font.dwrite: Fix bug in font_files indixing (use first object, not font_fact index).
+
+
 pyglet 2.1.10
 
 Changes

{pyglet-2.1.10 → pyglet-2.1.12}/pyglet/__init__.py

@@ -15,7 +15,7 @@ if TYPE_CHECKING:
     from typing import Any, Callable, ItemsView, Sized
 
 #: The release version
-version = '2.1.10'
+version = '2.1.12'
 __version__ = version
 
 MIN_PYTHON_VERSION = 3, 8

{pyglet-2.1.10 → pyglet-2.1.12}/pyglet/app/__init__.py

@@ -47,8 +47,10 @@ if _is_pyglet_doc_run:
 else:
     if compat_platform == 'darwin':
         from pyglet.app.cocoa import CocoaPlatformEventLoop as PlatformEventLoop
+        from pyglet.libs.darwin.cocoapy.runtime import get_chip_model
 
-        if platform.machine() == 'arm64' or pyglet.options["osx_alt_loop"]:
+        # Use alternate loop only if forced, or using an M1 chip.
+        if (platform.machine() == 'arm64' and "M1" in get_chip_model()) or pyglet.options.osx_alt_loop:
             from pyglet.app.cocoa import CocoaAlternateEventLoop as EventLoop
     elif compat_platform in ('win32', 'cygwin'):
         from pyglet.app.win32 import Win32EventLoop as PlatformEventLoop

{pyglet-2.1.10 → pyglet-2.1.12}/pyglet/font/dwrite/__init__.py

@@ -646,7 +646,7 @@ def _get_font_file(font_face: IDWriteFontFace) -> IDWriteFontFile:
     font_files = (IDWriteFontFile * file_ct.value)()
     font_face.GetFiles(byref(file_ct), font_files)
 
-    return font_files[font_face.GetIndex()]
+    return font_files[0]
 
 def _get_font_ref(font_file: IDWriteFontFile, release_file: bool=True) -> tuple[c_void_p, int]:
     """Get a unique font reference for the font face.

{pyglet-2.1.10 → pyglet-2.1.12}/pyglet/graphics/shader.py

@@ -120,6 +120,11 @@ _uniform_setters: dict[int, tuple[GLDataType, GLFunc, GLFunc, int]] = {
     gl.GL_INT_VEC3: (gl.GLint, gl.glUniform3iv, gl.glProgramUniform3iv, 3),
     gl.GL_INT_VEC4: (gl.GLint, gl.glUniform4iv, gl.glProgramUniform4iv, 4),
 
+    gl.GL_UNSIGNED_INT:      (gl.GLuint, gl.glUniform1uiv, gl.glProgramUniform1uiv, 1),
+    gl.GL_UNSIGNED_INT_VEC2: (gl.GLuint, gl.glUniform2uiv, gl.glProgramUniform2uiv, 2),
+    gl.GL_UNSIGNED_INT_VEC3: (gl.GLuint, gl.glUniform3uiv, gl.glProgramUniform3uiv, 3),
+    gl.GL_UNSIGNED_INT_VEC4: (gl.GLuint, gl.glUniform4uiv, gl.glProgramUniform4uiv, 4),
+
     gl.GL_FLOAT: (gl.GLfloat, gl.glUniform1fv, gl.glProgramUniform1fv, 1),
     gl.GL_FLOAT_VEC2: (gl.GLfloat, gl.glUniform2fv, gl.glProgramUniform2fv, 2),
     gl.GL_FLOAT_VEC3: (gl.GLfloat, gl.glUniform3fv, gl.glProgramUniform3fv, 3),
@@ -174,16 +179,37 @@ _uniform_setters: dict[int, tuple[GLDataType, GLFunc, GLFunc, int]] = {
     gl.GL_IMAGE_2D: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
     gl.GL_IMAGE_2D_RECT: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
     gl.GL_IMAGE_3D: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
-
     gl.GL_IMAGE_1D_ARRAY: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
     gl.GL_IMAGE_2D_ARRAY: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
-
     gl.GL_IMAGE_2D_MULTISAMPLE: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
     gl.GL_IMAGE_2D_MULTISAMPLE_ARRAY: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
-
     gl.GL_IMAGE_BUFFER: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
     gl.GL_IMAGE_CUBE: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
     gl.GL_IMAGE_CUBE_MAP_ARRAY: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+
+    gl.GL_INT_IMAGE_1D: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+    gl.GL_INT_IMAGE_2D: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+    gl.GL_INT_IMAGE_3D: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+    gl.GL_INT_IMAGE_2D_RECT: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+    gl.GL_INT_IMAGE_CUBE: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+    gl.GL_INT_IMAGE_BUFFER: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+    gl.GL_INT_IMAGE_1D_ARRAY: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+    gl.GL_INT_IMAGE_2D_ARRAY: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+    gl.GL_INT_IMAGE_CUBE_MAP_ARRAY: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+    gl.GL_INT_IMAGE_2D_MULTISAMPLE: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+    gl.GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+
+    gl.GL_UNSIGNED_INT_IMAGE_1D: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+    gl.GL_UNSIGNED_INT_IMAGE_2D: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+    gl.GL_UNSIGNED_INT_IMAGE_3D: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+    gl.GL_UNSIGNED_INT_IMAGE_2D_RECT: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+    gl.GL_UNSIGNED_INT_IMAGE_CUBE: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+    gl.GL_UNSIGNED_INT_IMAGE_BUFFER: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+    gl.GL_UNSIGNED_INT_IMAGE_1D_ARRAY: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+    gl.GL_UNSIGNED_INT_IMAGE_2D_ARRAY: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+    gl.GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+    gl.GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+    gl.GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
 }
 
 _attribute_types: dict[int, tuple[int, str]] = {

{pyglet-2.1.10 → pyglet-2.1.12}/pyglet/gui/widgets.py

@@ -265,7 +265,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-2.1.10 → pyglet-2.1.12}/pyglet/libs/darwin/cocoapy/runtime.py

@@ -66,6 +66,34 @@ libc = cdll.LoadLibrary(util.find_library('c'))
 libc.free.restype = None
 libc.free.argtypes = [c_void_p]
 
+libc.sysctlbyname.argtypes = [c_char_p, c_void_p, POINTER(c_size_t), c_void_p, c_size_t]
+libc.sysctlbyname.restype = c_int
+
+def _sysctl_get(name: str) -> str:
+    name_bytes = name.encode("utf-8")
+
+    size = c_size_t()
+    # Gets buffer size.
+    libc.sysctlbyname(name_bytes, None, byref(size), None, 0)
+
+    buf = create_string_buffer(size.value)
+    libc.sysctlbyname(name_bytes, buf, byref(size), None, 0)
+    return buf.value.decode("utf-8")
+
+def get_chip_model() -> str:
+    """Return Apple chip model name.
+
+    For example: "Apple M2"
+    """
+    try:
+        # Newer field.
+        return _sysctl_get("machdep.cpu.brand_string")
+    except Exception:
+        try:
+            return _sysctl_get("hw.model")
+        except Exception:
+            return "Unknown"
+
 ######################################################################
 
 # BOOL class_addIvar(Class cls, const char *name, size_t size, uint8_t alignment, const char *types)

{pyglet-2.1.10 → pyglet-2.1.12}/pyglet/media/codecs/ffmpeg.py

@@ -1037,7 +1037,7 @@ class FFmpegSource(StreamingSource):
         width = self.video_format.width
         height = self.video_format.height
         pitch = width * 4
-        buf_size = avutil.av_image_get_buffer_size(AV_PIX_FMT_RGBA, width, height, 1)
+        buf_size = avutil.av_image_get_buffer_size(AV_PIX_FMT_RGBA, width, height, 1) + AV_INPUT_BUFFER_PADDING_SIZE
         buffer = (c_uint8 * buf_size)()
         try:
             result = self._ffmpeg_decode_video(video_packet.packet, buffer)

{pyglet-2.1.10 → pyglet-2.1.12}/pyglet/media/codecs/ffmpeg_lib/libavformat.py

@@ -132,8 +132,8 @@ AVStream_Fields = [
         ('metadata', POINTER(AVDictionary)),
         ('avg_frame_rate', AVRational),
         ('attached_pic', AVPacket),
-        ('side_data', POINTER(AVPacketSideData)),
-        ('nb_side_data', c_int),
+        ('side_data', POINTER(AVPacketSideData)),  # Deprecated in 60. Removed in 62.
+        ('nb_side_data', c_int),  # Deprecated in 60. Removed in 62.
         ('event_flags', c_int),
         ('r_frame_rate', AVRational),
         ('recommended_encoder_configuration', c_char_p),  # Deprecated. Removed in 59.
@@ -147,11 +147,16 @@ compat.add_version_changes('avformat', 58, AVStream, AVStream_Fields, removals=(
 compat.add_version_changes('avformat', 59, AVStream, AVStream_Fields,
                            removals=('av_class', 'codec', 'recommended_encoder_configuration', 'info'))
 
-for compat_ver in (60, 61, 62):
+for compat_ver in (60, 61):
     compat.add_version_changes('avformat', compat_ver, AVStream, AVStream_Fields,
                                removals=('codec', 'recommended_encoder_configuration', 'info'),
                                repositions=(compat.Reposition("codecpar", "id"),))
 
+compat.add_version_changes('avformat', 62, AVStream, AVStream_Fields,
+                           removals=('codec', 'recommended_encoder_configuration', 'info', 'side_data',
+                                     'nb_side_data'),
+                           repositions=(compat.Reposition("codecpar", "id"),))
+
 
 class AVProgram(Structure):
     pass

{pyglet-2.1.10 → pyglet-2.1.12}/pyglet/shapes.py

@@ -864,7 +864,8 @@ class Arc(ShapeBase):
             self._num_verts, self._draw_mode, self._batch, self._group,
             position=('f', self._get_vertices()),
             colors=('Bn', self._rgba * self._num_verts),
-            translation=('f', (self._x, self._y) * self._num_verts))
+            translation=('f', (self._x, self._y) * self._num_verts),
+            rotation=('f', (self._rotation,) * self._num_verts))
 
     def _get_vertices(self) -> Sequence[float]:
         if not self._visible:
@@ -1034,7 +1035,8 @@ class BezierCurve(ShapeBase):
             self._num_verts, self._draw_mode, self._batch, self._group,
             position=('f', self._get_vertices()),
             colors=('Bn', self._rgba * self._num_verts),
-            translation=('f', (self._x, self._y) * self._num_verts))
+            translation=('f', (self._x, self._y) * self._num_verts),
+            rotation=('f', (self._rotation,) * self._num_verts))
 
     def _get_vertices(self) -> Sequence[float]:
         if not self._visible:
@@ -1171,7 +1173,8 @@ class Circle(ShapeBase):
             self._segments * 3, self._draw_mode, self._batch, self._group,
             position=('f', self._get_vertices()),
             colors=('Bn', self._rgba * self._num_verts),
-            translation=('f', (self._x, self._y) * self._num_verts))
+            translation=('f', (self._x, self._y) * self._num_verts),
+            rotation=('f', (self._rotation,) * self._num_verts))
 
     def _get_vertices(self) -> Sequence[float]:
         if not self._visible:
@@ -1289,7 +1292,8 @@ class Ellipse(ShapeBase):
             self._segments * 3, self._draw_mode, self._batch, self._group,
             position=('f', self._get_vertices()),
             colors=('Bn', self._rgba * self._num_verts),
-            translation=('f', (self._x, self._y) * self._num_verts))
+            translation=('f', (self._x, self._y) * self._num_verts),
+            rotation=('f', (self._rotation,) * self._num_verts))
 
     def _get_vertices(self) -> Sequence[float]:
         if not self._visible:
@@ -1422,7 +1426,8 @@ class Sector(ShapeBase):
             self._num_verts, self._draw_mode, self._batch, self._group,
             position=('f', self._get_vertices()),
             colors=('Bn', self._rgba * self._num_verts),
-            translation=('f', (self._x, self._y) * self._num_verts))
+            translation=('f', (self._x, self._y) * self._num_verts),
+            rotation=('f', (self._rotation,) * self._num_verts))
 
     def _get_vertices(self) -> Sequence[float]:
         if not self._visible:
@@ -1564,7 +1569,8 @@ class Line(ShapeBase):
             6, self._draw_mode, self._batch, self._group,
             position=('f', self._get_vertices()),
             colors=('Bn', self._rgba * self._num_verts),
-            translation=('f', (self._x, self._y) * self._num_verts))
+            translation=('f', (self._x, self._y) * self._num_verts),
+            rotation=('f', (self._rotation,) * self._num_verts))
 
     def _get_vertices(self) -> Sequence[float]:
         if not self._visible:
@@ -1690,7 +1696,8 @@ class Rectangle(ShapeBase):
             6, self._draw_mode, self._batch, self._group,
             position=('f', self._get_vertices()),
             colors=('Bn', self._rgba * self._num_verts),
-            translation=('f', (self._x, self._y) * self._num_verts))
+            translation=('f', (self._x, self._y) * self._num_verts),
+            rotation=('f', (self._rotation,) * self._num_verts))
 
     def _get_vertices(self) -> Sequence[float]:
         if not self._visible:
@@ -1833,7 +1840,8 @@ class BorderedRectangle(ShapeBase):
             8, self._draw_mode, indices, self._batch, self._group,
             position=('f', self._get_vertices()),
             colors=('Bn', self._rgba * 4 + self._border_rgba * 4),
-            translation=('f', (self._x, self._y) * self._num_verts))
+            translation=('f', (self._x, self._y) * self._num_verts),
+            rotation=('f', (self._rotation,) * self._num_verts))
 
     def _update_color(self) -> None:
         self._vertex_list.colors[:] = self._rgba * 4 + self._border_rgba * 4
@@ -2047,7 +2055,8 @@ class Box(ShapeBase):
             self._num_verts, self._draw_mode, indices, self._batch, self._group,
             position=('f', self._get_vertices()),
             colors=('Bn', self._rgba * self._num_verts),
-            translation=('f', (self._x, self._y) * self._num_verts))
+            translation=('f', (self._x, self._y) * self._num_verts),
+            rotation=('f', (self._rotation,) * self._num_verts))
 
     def _update_color(self):
         self._vertex_list.colors[:] = self._rgba * self._num_verts
@@ -2226,7 +2235,8 @@ class RoundedRectangle(pyglet.shapes.ShapeBase):
             self._num_verts, self._draw_mode, self._batch, self._group,
             position=('f', self._get_vertices()),
             colors=('Bn', self._rgba * self._num_verts),
-            translation=('f', (self._x, self._y) * self._num_verts))
+            translation=('f', (self._x, self._y) * self._num_verts),
+            rotation=('f', (self._rotation,) * self._num_verts))
 
     def _get_vertices(self) -> Sequence[float]:
         if not self._visible:
@@ -2377,7 +2387,8 @@ class Triangle(ShapeBase):
             3, self._draw_mode, self._batch, self._group,
             position=('f', self._get_vertices()),
             colors=('Bn', self._rgba * self._num_verts),
-            translation=('f', (self._x, self._y) * self._num_verts))
+            translation=('f', (self._x, self._y) * self._num_verts),
+            rotation=('f', (self._rotation,) * self._num_verts))
 
     def _get_vertices(self) -> Sequence[float]:
         if not self._visible:
@@ -2513,8 +2524,8 @@ class Star(ShapeBase):
             self._num_verts, self._draw_mode, self._batch, self._group,
             position=('f', self._get_vertices()),
             colors=('Bn', self._rgba * self._num_verts),
-            rotation=('f', (self._rotation,) * self._num_verts),
-            translation=('f', (self._x, self._y) * self._num_verts))
+            translation=('f', (self._x, self._y) * self._num_verts),
+            rotation=('f', (self._rotation,) * self._num_verts))
 
     def _get_vertices(self) -> Sequence[float]:
         if not self._visible:
@@ -2638,7 +2649,8 @@ class Polygon(ShapeBase):
             self._batch, self._group,
             position=('f', vertices),
             colors=('Bn', self._rgba * self._num_verts),
-            translation=('f', (self._x, self._y) * self._num_verts))
+            translation=('f', (self._x, self._y) * self._num_verts),
+            rotation=('f', (self._rotation,) * self._num_verts))
 
     def _get_vertices(self) -> Sequence[float]:
         if not self._visible:
@@ -2723,7 +2735,8 @@ class MultiLine(ShapeBase):
             self._num_verts, self._draw_mode, self._batch, self._group,
             position=('f', self._get_vertices()),
             colors=('Bn', self._rgba * self._num_verts),
-            translation=('f', (self._x, self._y) * self._num_verts))
+            translation=('f', (self._x, self._y) * self._num_verts),
+            rotation=('f', (self._rotation,) * self._num_verts))
 
     def _get_vertices(self) -> Sequence[float]:
         if not self._visible:

{pyglet-2.1.10 → pyglet-2.1.12}/pyglet/window/win32/__init__.py

@@ -106,6 +106,16 @@ Win32EventHandler = _PlatformEventHandler
 ViewEventHandler = _ViewEventHandler
 
 
+# Some events should not be queued, especially those with pointers or structures.
+# Data is only guaranteed to be available for the duration of the initial function call.
+_priority_events = [
+    constants.WM_GETMINMAXINFO,
+    constants.WM_GETDPISCALEDSIZE,
+    constants.WM_DPICHANGED,
+    constants.WM_INPUT,
+]
+
+
 class Win32Window(BaseWindow):
     _window_class = None
     _hwnd = None
@@ -401,7 +411,7 @@ class Win32Window(BaseWindow):
     def flip(self) -> None:
         self.draw_mouse_cursor()
 
-        if not self._fullscreen and (self._always_dwm or self._dwm_composition_enabled()) and self._interval:
+        if not self._fullscreen and not self._always_dwm and self._dwm_composition_enabled() and self._interval:
             _dwmapi.DwmFlush()
 
         self.context.flip()
@@ -427,8 +437,6 @@ class Win32Window(BaseWindow):
         if state:
             _user32.SetLayeredWindowAttributes(self._hwnd, color_ref.value, alpha.value, flags.value)
 
-
-
     def set_location(self, x: int, y: int) -> None:
         x, y = self._client_to_window_pos(x, y)
         _user32.SetWindowPos(self._hwnd, 0, x, y, 0, 0,
@@ -859,7 +867,7 @@ class Win32Window(BaseWindow):
             event_handler = event_handlers.get(msg)
             result = None
             if event_handler:
-                if self._allow_dispatch_event or not self._enable_event_queue:
+                if self._allow_dispatch_event or not self._enable_event_queue or msg in _priority_events:
                     result = event_handler(msg, wParam, lParam)
                 else:
                     result = 0