pyglet 2.1.12__py3-none-any.whl → 2.1.13__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.12'
+version = '2.1.13'
 __version__ = version
 
 MIN_PYTHON_VERSION = 3, 8

pyglet/display/win32.py

@@ -4,7 +4,7 @@ import ctypes
 from ctypes import byref, sizeof
 from typing import TYPE_CHECKING
 
-from pyglet.libs.win32 import _gdi32, _shcore, _user32
+from pyglet.libs.win32 import _gdi32, _user32
 from pyglet.libs.win32.constants import (
     CDS_FULLSCREEN,
     DISP_CHANGE_SUCCESSFUL,
@@ -37,6 +37,9 @@ from pyglet.libs.win32.types import (
 
 from .base import Canvas, Display, Screen, ScreenMode
 
+if WINDOWS_8_1_OR_GREATER:
+    from pyglet.libs.win32 import _shcore
+
 if TYPE_CHECKING:
     from ctypes.wintypes import HDC, HMONITOR, LPARAM, LPRECT
 

pyglet/libs/win32/__init__.py

@@ -22,7 +22,9 @@ _dwmapi = DebugLibrary('dwmapi')
 _shell32 = DebugLibrary('shell32')
 _ole32 = DebugLibrary('ole32')
 _oleaut32 = DebugLibrary('oleaut32')
-_shcore = DebugLibrary('shcore')
+
+if constants.WINDOWS_8_1_OR_GREATER:
+    _shcore = DebugLibrary('shcore')
 
 # _gdi32
 _gdi32.AddFontMemResourceEx.restype = HANDLE

pyglet/shapes.py

@@ -1414,12 +1414,22 @@ class Sector(ShapeBase):
     def __contains__(self, point: tuple[float, float]) -> bool:
         assert len(point) == 2
         point = _rotate_point((self._x, self._y), point, math.radians(self._rotation))
-        angle = math.atan2(point[1] - self._y + self._anchor_y, point[0] - self._x + self._anchor_x)
-        if angle < 0:
-            angle += 2 * math.pi
-        if self._start_angle < angle < self._start_angle + self._angle:
-            return math.dist((self._x - self._anchor_x, self._y - self._anchor_y), point) < self._radius
-        return False
+        if math.dist((self._x - self._anchor_x, self._y - self._anchor_y), point) > self._radius:
+            return False
+        angle = math.degrees(math.atan2(point[1] - self._y + self._anchor_y, point[0] - self._x + self._anchor_x))
+        angle = angle % 360
+        start_angle = self._start_angle % 360
+        end_angle = (start_angle + self._angle) % 360
+        if self._angle >= 0:
+            if start_angle <= end_angle:
+                return start_angle <= angle <= end_angle
+            else:
+                return angle >= start_angle or angle <= end_angle
+        else:
+            if end_angle <= start_angle:
+                return end_angle <= angle <= start_angle
+            else:
+                return angle >= end_angle or angle <= start_angle
 
     def _create_vertex_list(self) -> None:
         self._vertex_list = self._program.vertex_list(
@@ -1437,7 +1447,7 @@ class Sector(ShapeBase):
         y = -self._anchor_y
         r = self._radius
         segment_radians = math.radians(self._angle) / self._segments
-        start_radians = math.radians(self._start_angle - self._rotation)
+        start_radians = math.radians(self._start_angle)
 
         # Calculate the outer points of the sector.
         points = [(x + (r * math.cos((i * segment_radians) + start_radians)),

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyglet
-Version: 2.1.12
+Version: 2.1.13
 Summary: pyglet is a cross-platform games and multimedia package.
 Author-email: Alex Holkner & contributors <Alex.Holkner@gmail.com>
 Requires-Python: >=3.8

{pyglet-2.1.12.dist-info → pyglet-2.1.13.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pyglet/__init__.py,sha256=uw8dgsrkqZdwCOpicH2nTQ2sFvUlqYMaxFOVDPfWzoU,21155
+pyglet/__init__.py,sha256=zUxv--HVC1haqqlM68yMJDA36TPqnn2rwq6uHWPCa7c,21155
 pyglet/__init__.pyi,sha256=g-eSsTUa4WDTqTULiN7cRqagvW58NGCPLj9sabXRFjo,2005
 pyglet/clock.py,sha256=ZiYHckYRIUKuN1XmywQc3Dastd7O40Lw2XeMjC3iMtk,21892
 pyglet/customtypes.py,sha256=e9AB-8WPPhhZXqfDEf4r2Lv0vAQUBjwig5EBejBDz0k,608
@@ -8,7 +8,7 @@ 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=48f14qroZYc5hT_A1_o_MSJlNuY-Zg05gw9QcfBfavo,98290
+pyglet/shapes.py,sha256=itBnLMIiZoavXFODGcfGWAdFToJoM6-bjOe_jeaB0kg,98692
 pyglet/sprite.py,sha256=DWMiCG1wO5ySEe_Wn7pPzgCOWiG1NceodtViD4nBbLg,28701
 pyglet/util.py,sha256=OPu-Lw5Rxu1NMcsXBSM3Y-_3r2J09OjmdfUUAqSWvfg,8647
 pyglet/app/__init__.py,sha256=AzV-eZLCSGJgqx8GEuOrOrJUtcUBBLHbw5oyyyni7e0,3043
@@ -21,7 +21,7 @@ pyglet/display/__init__.pyi,sha256=JRd3vFMahd1YC3r-uPgr99V9yAmiut1QZXKMFmstg5o,6
 pyglet/display/base.py,sha256=o8TYTl1J4zdy4pRJy9HEz4sOLqmdVMhNRFcrTJKP4U8,10142
 pyglet/display/cocoa.py,sha256=mW3Npw4PjeH29xnAuww6pRToO3Zh4v_xWTEVKubqIAA,6391
 pyglet/display/headless.py,sha256=LwS0dHee0Y6oxPHidMvDVhIFqCDoBwNI0eQdXQgvtpE,2491
-pyglet/display/win32.py,sha256=BqlRbIcDrgavU7pKTCn2bAn3U5sHU0mUpoiCjxPLyBw,9449
+pyglet/display/win32.py,sha256=JJwnVkxrgZQJZh0cjimL0Z8h8AEL8BLznDQ7QYAPYRg,9510
 pyglet/display/xlib.py,sha256=6_SjJuqgDesW_jqwrQj7fjX3Csm8bVItnfBUxXds6BY,17264
 pyglet/display/xlib_vidmoderestore.py,sha256=fkcVbCvwQ65UDvAxaIZb3JV_bAWONVgw7l-6UJhEXTs,5663
 pyglet/experimental/README.md,sha256=bipJa3Y-kpEu9Uf_HNZJR00AAbfpUyGAKGEFdRY8YsI,222
@@ -132,7 +132,7 @@ pyglet/libs/egl/lib.py,sha256=IdQfLfRPbTckgNBEIUumdmEQ6iSWiy1nhTnkTTzaZ6M,893
 pyglet/libs/wayland/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyglet/libs/wayland/gbm.py,sha256=iv6IKaB_U9t3s8njo0zy29rksbFPKEYlmGjF7wHjYr0,13388
 pyglet/libs/wayland/xkbcommon.py,sha256=GCQ2mONKCi8MPwNfeL8t5JdszEoYhvEqrPUGDFE30xQ,20657
-pyglet/libs/win32/__init__.py,sha256=FKb-ylogLYxyYZUO48SxMKB3ASjbDsYQpi4t4Wj6dRY,15085
+pyglet/libs/win32/__init__.py,sha256=oPvQ9y9V-9EZE39cLGNowgrfpkNdOi1gecgLNH9C4RI,15127
 pyglet/libs/win32/com.py,sha256=E4lzOzkmPRbV0F6Hj1MH_PQK46N_-USaOjPJbjgrXpM,17607
 pyglet/libs/win32/constants.py,sha256=gL787XYVx2d63ue5dVu1HXCONfZc64yUiRFihpD3P9M,121484
 pyglet/libs/win32/context_managers.py,sha256=pNCpws8Xc-HP19jC42gtWSdC9m1s6sP8H-0mFyiEz0A,1433
@@ -228,7 +228,7 @@ pyglet/window/cocoa/systemcursor.py,sha256=-rMhvPH3DWl4gsSTCUbkn-yUnbyKM7JdQLfb5
 pyglet/window/headless/__init__.py,sha256=QT3vdaa8qIJVm9B8u17c9-agIG_wrbAIPExNdIFuNjI,3254
 pyglet/window/win32/__init__.py,sha256=rmxohCsReTiEbMmegLxjvzH8NnERbd2jbvdz_zbzCqA,55910
 pyglet/window/xlib/__init__.py,sha256=_SmSwQlhiYx37P-jMR3WVZDDQV9A3O6qFNvPrzSDfwE,70725
-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.13.dist-info/licenses/LICENSE,sha256=V-fuy2c8jUDPMZJjPEgH-6jIFoUymjfht2PhVW1d7TQ,1546
+pyglet-2.1.13.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+pyglet-2.1.13.dist-info/METADATA,sha256=eBVNY-EXhA_dIbPGTPuklvYYvR-UXdeMPfYQbws6mHQ,7673
+pyglet-2.1.13.dist-info/RECORD,,