pyglet 2.1.11__py3-none-any.whl → 2.1.12__py3-none-any.whl

pyglet/__init__.py

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

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/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),

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/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/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/window/win32/__init__.py

@@ -411,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()

{pyglet-2.1.11.dist-info → pyglet-2.1.12.dist-info}/METADATA

@@ -1,10 +1,11 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: pyglet
-Version: 2.1.11
+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.11.dist-info → pyglet-2.1.12.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pyglet/__init__.py,sha256=pHRsEVzn0TCFUSfSRPeMkpAqhbsOkiz9f2Zb5QXMGpc,21155
+pyglet/__init__.py,sha256=uw8dgsrkqZdwCOpicH2nTQ2sFvUlqYMaxFOVDPfWzoU,21155
 pyglet/__init__.pyi,sha256=g-eSsTUa4WDTqTULiN7cRqagvW58NGCPLj9sabXRFjo,2005
 pyglet/clock.py,sha256=ZiYHckYRIUKuN1XmywQc3Dastd7O40Lw2XeMjC3iMtk,21892
 pyglet/customtypes.py,sha256=e9AB-8WPPhhZXqfDEf4r2Lv0vAQUBjwig5EBejBDz0k,608
@@ -8,10 +8,10 @@ pyglet/lib.py,sha256=Mj1W_KDmUQXMg1iPLrM0pIIHDyWPO38J6qvoU_hXKjc,12013
 pyglet/math.py,sha256=lMCspxzd_pOeLQev5HAA92v8nYFPfGjfK-mbO6iHK3E,56117
 pyglet/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyglet/resource.py,sha256=EknGIAxDuc8prrGd5faOM4MNPT2q6NN4r3KQlrRg2dM,29374
-pyglet/shapes.py,sha256=KRJz1lLN_jJXBYuW3AWVazbAILvHkJpVnxuo0Dmq_Jc,97445
+pyglet/shapes.py,sha256=48f14qroZYc5hT_A1_o_MSJlNuY-Zg05gw9QcfBfavo,98290
 pyglet/sprite.py,sha256=DWMiCG1wO5ySEe_Wn7pPzgCOWiG1NceodtViD4nBbLg,28701
 pyglet/util.py,sha256=OPu-Lw5Rxu1NMcsXBSM3Y-_3r2J09OjmdfUUAqSWvfg,8647
-pyglet/app/__init__.py,sha256=Cc21DTHddyf-YaTvwiZ5y6iKmrnEgyyVAdjVBAbiw5Y,2879
+pyglet/app/__init__.py,sha256=AzV-eZLCSGJgqx8GEuOrOrJUtcUBBLHbw5oyyyni7e0,3043
 pyglet/app/base.py,sha256=-rs9nvLoizNvbQfKQ0OGAnbDShpjnt6pAW0EFHLY9c4,11596
 pyglet/app/cocoa.py,sha256=NUy06NCLppmM9F0NX7kmKEL5sMMeq-Ia6f00lCAIxiE,10850
 pyglet/app/win32.py,sha256=252RfeIBB9TtytMf1bd6Zc1FDF0W3bukCJAlqfP4ioM,4340
@@ -77,14 +77,14 @@ pyglet/gl/xlib.py,sha256=q6BNLJ9lujt3P-0xh3CAvJHCFERAuLSUnXOgeS4jZhY,11357
 pyglet/graphics/__init__.py,sha256=O4O7fCQBI7qPReI8tUwLwArJHTWcoE1c_SotlHyUb2A,27940
 pyglet/graphics/allocation.py,sha256=0MTwkK7-00UDs2xl6Te7cf0ljC2mmsOQMbx0zKZCJOU,12430
 pyglet/graphics/instance.py,sha256=pzIaxO0EZCeoQDMR-qzjo4ahwfcbt3dDZm9UinYpZo0,2202
-pyglet/graphics/shader.py,sha256=kKJj6qkM8hMte6raCXlWcxKg8Zw6efcj9RZnPaLYU2g,66251
+pyglet/graphics/shader.py,sha256=O7H_Nu6CgMNCqKK3UUS4MQs9hJAO-r65gH-qALE-ftI,66604
 pyglet/graphics/vertexarray.py,sha256=BWJFvP79JHpKwY91mrkjjhlbK3g87nIpMbCsc4FCcEg,1371
 pyglet/graphics/vertexbuffer.py,sha256=SbtT2cNSXwPMlQRGf2DxTxZCEyj0AjEEDLLdho-ojG8,15284
 pyglet/graphics/vertexdomain.py,sha256=Y4tAi26ABf5kLBGJ0QDvTVeWEL2vSN4HuIeS5svZjsg,32764
 pyglet/gui/__init__.py,sha256=vW9yvUBoKz6nG-VpyIYwHMmq_y_2LWAZvFW9LYQALog,77
 pyglet/gui/frame.py,sha256=R9QXswxNAC1tUqB7OA2tt6jATqjghgjRYeZ5WyHoN1A,8413
 pyglet/gui/ninepatch.py,sha256=f3iOQr6GOhoCUCIcwltsqrEILZz-BhKwnGr9rcsfohM,11376
-pyglet/gui/widgets.py,sha256=FBSsZRgOJrW-9kRGNtYrCdqed1zkGIFWmd-H0aZXK_4,20698
+pyglet/gui/widgets.py,sha256=WegDh_TadylnchR9BgIS2ZzxfjpjwN1nWIzxrYw6a6o,20704
 pyglet/image/__init__.py,sha256=1Axruxq_hul8RXY3Pxp5_JNhuVxbtJdivGfMKPdku0E,83852
 pyglet/image/animation.py,sha256=ThMlyHFlqQkCRh7WdlCRy-uhMN62rFiME_qSxBUaEB4,5564
 pyglet/image/atlas.py,sha256=svY5NWVVAjIhtGEeAJS_4PcLtg8QctPIBrpa_4C69KM,9913
@@ -124,7 +124,7 @@ pyglet/libs/darwin/quartzkey.py,sha256=FhwLyotAdlhJIvmGX1JNPkB0kxPhedRb-9NeRh_HT
 pyglet/libs/darwin/cocoapy/__init__.py,sha256=LvkMAtOc0SGfyitALT9FdCTUvZ6dNzcFF7kDyrhu6GY,1798
 pyglet/libs/darwin/cocoapy/cocoalibs.py,sha256=GLr7LRQTxQq3RCGeHlSplPmq3tGjUVsr-kS2fC9Ax00,26062
 pyglet/libs/darwin/cocoapy/cocoatypes.py,sha256=UNymqQdVNrq7T6jIupCgRgoxgm51hhQW-R42Y-tRP00,2629
-pyglet/libs/darwin/cocoapy/runtime.py,sha256=KaI64id6cESiJ40SxZHfP5YOVHw82CHMGCzNPzUSRiA,65492
+pyglet/libs/darwin/cocoapy/runtime.py,sha256=GgG2epgsCpEAA2hFjZKZ_aX-wxRFes8DguCZ3-waRzU,66265
 pyglet/libs/egl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyglet/libs/egl/egl.py,sha256=sfSx2puVsMJDIY_xH9EbadsG3cCpsNUN7V2UgebUzvk,29920
 pyglet/libs/egl/eglext.py,sha256=NPqhL-GQK1Y5cHLwXSNpyWEqWhSgqyxc3vgk374-D0s,859
@@ -226,9 +226,9 @@ pyglet/window/cocoa/pyglet_view.py,sha256=ZiWmWhjI4KWt1Gm2vlD1G2HrN0hBE-hWmFV8o7
 pyglet/window/cocoa/pyglet_window.py,sha256=ttcI6ox5ijDu-f1JJMAzdqK31kBv22iOQHbfBwu76nA,3627
 pyglet/window/cocoa/systemcursor.py,sha256=-rMhvPH3DWl4gsSTCUbkn-yUnbyKM7JdQLfb5RKb8xM,775
 pyglet/window/headless/__init__.py,sha256=QT3vdaa8qIJVm9B8u17c9-agIG_wrbAIPExNdIFuNjI,3254
-pyglet/window/win32/__init__.py,sha256=xKwhvZA0KEMVo3ytgaTh30GvIAlLCXF4N8plp7nRFJk,55907
+pyglet/window/win32/__init__.py,sha256=rmxohCsReTiEbMmegLxjvzH8NnERbd2jbvdz_zbzCqA,55910
 pyglet/window/xlib/__init__.py,sha256=_SmSwQlhiYx37P-jMR3WVZDDQV9A3O6qFNvPrzSDfwE,70725
-pyglet-2.1.11.dist-info/LICENSE,sha256=V-fuy2c8jUDPMZJjPEgH-6jIFoUymjfht2PhVW1d7TQ,1546
-pyglet-2.1.11.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
-pyglet-2.1.11.dist-info/METADATA,sha256=AnFcUdJIQxNtv8ZBlowD52UR1bWSCEK7H4nzp_-8Sdo,7651
-pyglet-2.1.11.dist-info/RECORD,,
+pyglet-2.1.12.dist-info/licenses/LICENSE,sha256=V-fuy2c8jUDPMZJjPEgH-6jIFoUymjfht2PhVW1d7TQ,1546
+pyglet-2.1.12.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+pyglet-2.1.12.dist-info/METADATA,sha256=fNXwliG-MUVPYejBSicQqryrAcC_Hi2QGtdtIU_FH5M,7673
+pyglet-2.1.12.dist-info/RECORD,,

{pyglet-2.1.11.dist-info → pyglet-2.1.12.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: flit 3.10.1
+Generator: flit 3.12.0
 Root-Is-Purelib: true
 Tag: py3-none-any