pyglet 2.1.12__tar.gz → 2.1.13__tar.gz

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

@@ -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 → pyglet-2.1.13}/RELEASE_NOTES

@@ -1,3 +1,12 @@
+pyglet 2.1.13
+
+Bugfixes
+--------
+shapes: fix rotation behaviour of Sector when later setting radius/angle/etc. (#1405)
+window.win32: check Windows version before importing shcore. (#1402)
+gui.PushButton: fix missing argument in on_mouse_leave handler. (#1397)
+
+
 pyglet 2.1.12
 
 Bugfixes

{pyglet-2.1.12 → pyglet-2.1.13}/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-2.1.12 → pyglet-2.1.13}/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-2.1.12 → pyglet-2.1.13}/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-2.1.12 → pyglet-2.1.13}/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)),