pyglet 2.1.2__py3-none-any.whl → 2.1.4__py3-none-any.whl

pyglet/media/drivers/xaudio2/lib_xaudio2.py

@@ -1,30 +1,47 @@
-import ctypes
-import platform
 import os
-from pyglet.libs.win32.constants import *
-from pyglet.libs.win32.types import *
+import platform
+from ctypes import (
+    HRESULT,
+    POINTER,
+    Structure,
+    c_bool,
+    c_char,
+    c_float,
+    c_int,
+    c_uint32,
+    c_uint64,
+    c_void_p,
+    cdll,
+    windll,
+)
+from ctypes.wintypes import BOOL, BYTE, DWORD, FLOAT, LPCWSTR, UINT, WORD
+
 from pyglet.libs.win32 import com
+from pyglet.libs.win32.constants import WINDOWS_10_ANNIVERSARY_UPDATE_OR_GREATER
+from pyglet.libs.win32.types import c_void
 from pyglet.util import debug_print
 
 _debug = debug_print('debug_media')
 
 
 def load_xaudio2(dll_name):
-    """This will attempt to load a version of XAudio2. Versions supported: 2.9, 2.8.
-       While Windows 8 ships with 2.8 and Windows 10 ships with version 2.9, it is possible to install 2.9 on 8/8.1.
+    """This will attempt to load a version of XAudio2.
+
+    Versions supported: 2.9, 2.8.
+
+    While Windows 8 ships with 2.8 and Windows 10 ships with version 2.9, it is possible to install 2.9 on 8/8.1.
     """
     xaudio2 = dll_name
     # System32 and SysWOW64 folders are opposite perception in Windows x64.
     # System32 = x64 dll's | SysWOW64 = x86 dlls
     # By default ctypes only seems to look in system32 regardless of Python architecture, which has x64 dlls.
-    if platform.architecture()[0] == '32bit':
-        if platform.machine().endswith('64'):  # Machine is 64 bit, Python is 32 bit.
-            xaudio2 = os.path.join(os.environ['WINDIR'], 'SysWOW64', '{}.dll'.format(xaudio2))
+    if platform.architecture()[0] == '32bit' and platform.machine().endswith('64'):  # Machine is 64 bit, Python is 32 bit.
+        xaudio2 = os.path.join(os.environ['WINDIR'], 'SysWOW64', '{}.dll'.format(xaudio2))
 
-    xaudio2_lib = ctypes.windll.LoadLibrary(xaudio2)
+    xaudio2_lib = windll.LoadLibrary(xaudio2)
 
     # Somehow x3d uses different calling structure than the rest of the DLL; Only affects 32 bit? Microsoft...
-    x3d_lib = ctypes.cdll.LoadLibrary(xaudio2)
+    x3d_lib = cdll.LoadLibrary(xaudio2)
     return xaudio2_lib, x3d_lib
 
 
@@ -43,7 +60,7 @@ UINT32 = c_uint32
 FLOAT32 = c_float
 
 
-class XAUDIO2_DEBUG_CONFIGURATION(ctypes.Structure):
+class XAUDIO2_DEBUG_CONFIGURATION(Structure):
     _fields_ = [
         ('TraceMask', UINT32),
         ('BreakMask', UINT32),
@@ -54,7 +71,7 @@ class XAUDIO2_DEBUG_CONFIGURATION(ctypes.Structure):
     ]
 
 
-class XAUDIO2_PERFORMANCE_DATA(ctypes.Structure):
+class XAUDIO2_PERFORMANCE_DATA(Structure):
     _fields_ = [
         ('AudioCyclesSinceLastQuery', c_uint64),
         ('TotalCyclesSinceLastQuery', c_uint64),
@@ -76,14 +93,14 @@ class XAUDIO2_PERFORMANCE_DATA(ctypes.Structure):
         return "XAUDIO2PerformanceData(active_voices={}, total_voices={}, glitches={}, latency={} samples, memory_usage={} bytes)".format(self.ActiveSourceVoiceCount, self.TotalSourceVoiceCount, self.GlitchesSinceEngineStarted, self.CurrentLatencyInSamples, self.MemoryUsageInBytes)
 
 
-class XAUDIO2_VOICE_SENDS(ctypes.Structure):
+class XAUDIO2_VOICE_SENDS(Structure):
     _fields_ = [
         ('SendCount', UINT32),
         ('pSends', c_void_p),
     ]
 
 
-class XAUDIO2_BUFFER(ctypes.Structure):
+class XAUDIO2_BUFFER(Structure):
     _fields_ = [
         ('Flags', UINT32),
         ('AudioBytes', UINT32),
@@ -96,7 +113,7 @@ class XAUDIO2_BUFFER(ctypes.Structure):
         ('pContext', c_void_p),
     ]
 
-class XAUDIO2_VOICE_STATE(ctypes.Structure):
+class XAUDIO2_VOICE_STATE(Structure):
     _fields_ = [
         ('pCurrentBufferContext', c_void_p),
         ('BuffersQueued', UINT32),
@@ -106,7 +123,7 @@ class XAUDIO2_VOICE_STATE(ctypes.Structure):
     def __repr__(self):
         return "XAUDIO2_VOICE_STATE(BuffersQueued={0}, SamplesPlayed={1})".format(self.BuffersQueued, self.SamplesPlayed)
 
-class WAVEFORMATEX(ctypes.Structure):
+class WAVEFORMATEX(Structure):
     _fields_ = [
         ('wFormatTag', WORD),
         ('nChannels', WORD),
@@ -198,13 +215,13 @@ class IXAudio2VoiceCallback(com.Interface):
         ('OnStreamEnd',
          com.VOIDMETHOD()),
         ('OnBufferStart',
-         com.VOIDMETHOD(ctypes.c_void_p)),
+         com.VOIDMETHOD(c_void_p)),
         ('OnBufferEnd',
-         com.VOIDMETHOD(ctypes.c_void_p)),
+         com.VOIDMETHOD(c_void_p)),
         ('OnLoopEnd',
-         com.VOIDMETHOD(ctypes.c_void_p)),
+         com.VOIDMETHOD(c_void_p)),
         ('OnVoiceError',
-         com.VOIDMETHOD(ctypes.c_void_p, HRESULT))
+         com.VOIDMETHOD(c_void_p, HRESULT))
     ]
 
 
@@ -216,7 +233,7 @@ class XAUDIO2_EFFECT_DESCRIPTOR(Structure):
     ]
 
 
-class XAUDIO2_EFFECT_CHAIN(ctypes.Structure):
+class XAUDIO2_EFFECT_CHAIN(Structure):
     _fields_ = [
         ('EffectCount', UINT32),
         ('pEffectDescriptors', POINTER(XAUDIO2_EFFECT_DESCRIPTOR)),
@@ -331,21 +348,21 @@ class IXAudio2EngineCallback(com.Interface):
 
 
 # -------------- 3D Audio Positioning----------
-class X3DAUDIO_DISTANCE_CURVE_POINT(ctypes.Structure):
+class X3DAUDIO_DISTANCE_CURVE_POINT(Structure):
     _fields_ = [
         ('Distance', FLOAT32),
         ('DSPSetting', FLOAT32)
     ]
 
 
-class X3DAUDIO_DISTANCE_CURVE(ctypes.Structure):
+class X3DAUDIO_DISTANCE_CURVE(Structure):
     _fields_ = [
         ('pPoints', POINTER(X3DAUDIO_DISTANCE_CURVE_POINT)),
         ('PointCount', UINT32)
     ]
 
 
-class X3DAUDIO_VECTOR(ctypes.Structure):
+class X3DAUDIO_VECTOR(Structure):
     _fields_ = [
         ('x', c_float),
         ('y', c_float),

pyglet/model/__init__.py

@@ -37,7 +37,7 @@ from pyglet.math import Mat4
 
 from .codecs import add_default_codecs as _add_default_codecs
 from .codecs import registry as _codec_registry
-from .codecs.base import Material, Scene
+from .codecs.base import Material, Scene, SimpleMaterial
 
 if TYPE_CHECKING:
     from typing import BinaryIO, TextIO
@@ -137,22 +137,13 @@ class Model:
         for group in self.groups:
             group.matrix = matrix
 
-    def draw(self) -> None:
-        """Draw the model.
-
-        This is not recommended. See the module documentation
-        for information on efficient drawing of multiple models.
-        """
-        gl.current_context.window_block.bind(0)
-        self._batch.draw_subset(self.vertex_lists)
-
 
 class BaseMaterialGroup(graphics.Group):
     default_vert_src: str
     default_frag_src: str
     matrix: Mat4 = Mat4()
 
-    def __init__(self, material: Material, program: ShaderProgram, order: int = 0, parent: Group | None = None) -> None:
+    def __init__(self, material: SimpleMaterial, program: ShaderProgram, order: int = 0, parent: Group | None = None) -> None:
         super().__init__(order, parent)
         self.material = material
         self.program = program
@@ -209,7 +200,7 @@ class TexturedMaterialGroup(BaseMaterialGroup):
     }
     """
 
-    def __init__(self, material: Material, program: ShaderProgram,
+    def __init__(self, material: SimpleMaterial, program: ShaderProgram,
                  texture: Texture, order: int = 0, parent: Group | None = None):
         super().__init__(material, program, order, parent)
         self.texture = texture
@@ -305,7 +296,7 @@ class Cube(Model):
         self._program = program if program else get_default_shader()
 
         # Create a Material and Group for the Model
-        self._material = material if material else pyglet.model.Material(name="cube")
+        self._material = material if material else SimpleMaterial(name="cube")
         self._group = pyglet.model.MaterialGroup(material=self._material, program=self._program, parent=group)
 
         self._vlist = self._create_vertexlist()
@@ -317,30 +308,51 @@ class Cube(Model):
         h = self._height / 2
         d = self._depth / 2
 
-        vertices = (-w, -h, -d,   # front, bottom-left    0
-                    w, -h, -d,    # front, bottom-right   1
-                    w, h, -d,     # front, top-right      2
-                    -w, h, -d,    # front, top-left       3
-                    -w, -h, d,    # back, bottom-left     4
-                    w, -h, d,     # back, bottom-right    5
-                    w, h, d,      # back, top-right       6
-                    -w, h, d)     # back, top-left        7
-
-        normals = (-0.5, -0.5, -1.0,    # back, bottom-left
-                   0.5, -0.5, -1.0,     # back, buttom-right
-                   0.5,  0.5, -1.0,     # back, top-right
-                   -0.5, 0.5, -1.0,     # back, top-left
-                   -0.5, -0.5, 0.0,     # front, bottom-left
-                   0.5, -0.5, 0.0,      # front, bottom-right
-                   0.5, 0.5, 0.0,       # front, top-right
-                   -0.5, 0.5, 0.0)      # front, top-left
-
-        indices = (0, 3, 2, 0, 2, 1,    # front
-                   4, 5, 6, 4, 6, 7,    # back
-                   4, 7, 3, 4, 3, 0,    # left
-                   1, 2, 6, 1, 6, 5,    # right
-                   3, 7, 6, 3, 6, 2,    # top
-                   0, 1, 5, 0, 5, 4)    # bottom
+        vertices = [
+            -w, -h, -d,   # front, bottom-left    0
+            w, -h, -d,    # front, bottom-right   1
+            w, h, -d,     # front, top-right      2         Front
+            -w, h, -d,    # front, top-left       3
+
+            w, -h, d,     # back, bottom-right    4
+            -w, -h, d,    # back, bottom-left     5
+            -w, h, d,     # back, top-left        6         Back
+            w, h, d,      # back, top-right       7
+
+            w, -h, -d,    # front, bottom-right   8
+            w, -h, d,     # back, bottom-right    9
+            w, h, d,      # back, top-right      10         Right
+            w, h, -d,     # front, top-right     11
+
+            -w, -h, d,    # back, bottom-left    12
+            -w, -h, -d,   # front, bottom-left   13
+            -w, h, -d,    # front, top-left      14         Left
+            -w, h, d,     # back, top-left       15
+
+            -w, h, -d,    # front, top-left      16
+            w, h, -d,     # front, top-right     17
+            w, h, d,      # back, top-right      18         Top
+            -w, h, d,     # back, top-left       19
+
+            -w, -h, d,    # back, bottom-left    20
+            w, -h, d,     # back, bottom-right   21
+            w, -h, -d,    # front, bottom-right  22         Bottom
+            -w, -h, -d,   # front, bottom-left   23
+        ]
+
+        normals = [0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1,     # front face
+                   0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1,         # back face
+                   1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0,         # right face
+                   -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0,     # left face
+                   0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0,         # top face
+                   0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0]     # bottom face
+
+        indices = [23, 22, 20, 22, 21, 20,  # bottom
+                   19, 18, 16, 18, 17, 16,  # top
+                   15, 14, 12, 14, 13, 12,  # left
+                   11, 10, 8, 10, 9, 8,     # right
+                   7, 6, 4, 6, 5, 4,        # back
+                   3, 2, 0, 2, 1, 0]        # front
 
         return self._program.vertex_list_indexed(len(vertices) // 3, pyglet.gl.GL_TRIANGLES, indices,
                                                  batch=self._batch, group=self._group,
@@ -351,17 +363,18 @@ class Cube(Model):
 
 class Sphere(Model):
 
-    def __init__(self, radius=1.0, segments=30, color=(1.0, 1.0, 1.0, 1.0),
+    def __init__(self, radius=1.0, stacks=30, sectors=30, color=(1.0, 1.0, 1.0, 1.0),
                  material=None, batch=None, group=None, program=None):
         self._radius = radius
-        self._segments = segments
+        self._stacks = stacks
+        self._sectors = sectors
         self._color = color
 
         self._batch = batch
         self._program = program if program else get_default_shader()
 
         # Create a Material and Group for the Model
-        self._material = material if material else pyglet.model.Material(name="sphere")
+        self._material = material if material else SimpleMaterial(name="sphere")
         self._group = pyglet.model.MaterialGroup(material=self._material, program=self._program, parent=group)
 
         self._vlist = self._create_vertexlist()
@@ -369,27 +382,35 @@ class Sphere(Model):
         super().__init__([self._vlist], [self._group], self._batch)
 
     def _create_vertexlist(self):
-        radius = self._radius
-        segments = self._segments
+        radius = self._radius / 2
+        sectors = self._sectors
+        stacks = self._stacks
 
         vertices = []
+        normals = []
         indices = []
 
-        for i in range(segments):
-            u = i * pi / segments
-            for j in range(segments):
-                v = j * 2 * pi / segments
-                x = radius * sin(u) * cos(v)
-                y = radius * sin(u) * sin(v)
-                z = radius * cos(u)
-                vertices.extend((x, y, z))
-
-        for i in range(segments):
-            for j in range(segments):
-                indices.extend((i * segments + j, (i - 1) * segments + j, i * segments + (j - 1)))
-                indices.extend((i * segments + j, (i + 1) * segments + j, i * segments + (j + 1)))
-
-        normals = vertices
+        sector_step = 2 * pi / sectors
+        stack_step = pi / stacks
+
+        for i in range(stacks + 1):
+            stack_angle = pi / 2 - i * stack_step
+            for j in range(sectors + 1):
+                sector_angle = j * sector_step
+                vertices.append(radius * cos(stack_angle) * cos(sector_angle))    # x
+                vertices.append(radius * cos(stack_angle) * sin(sector_angle))    # y
+                vertices.append(radius * sin(stack_angle))                             # z
+                normals.append(cos(stack_angle) * cos(sector_angle))              # x
+                normals.append(cos(stack_angle) * sin(sector_angle))              # y
+                normals.append(sin(stack_angle))                                       # z
+
+        # Generate indices
+        for i in range(stacks):
+            for j in range(sectors):
+                first = i * (sectors + 1) + j
+                second = first + sectors + 1
+                indices.extend([first, second, second + 1])
+                indices.extend([first, second + 1, first + 1])
 
         return self._program.vertex_list_indexed(len(vertices) // 3, pyglet.gl.GL_TRIANGLES, indices,
                                                  batch=self._batch, group=self._group,

pyglet/shapes.py

@@ -814,7 +814,7 @@ class Arc(ShapeBase):
                 The angle of the arc, in degrees. Defaults to 360.0, which is
                 a full circle.
             start_angle:
-                The start angle of the arc, in radians. Defaults to 0.
+                The start angle of the arc, in degrees. Defaults to 0.
             closed:
                 If ``True``, the ends of the arc will be connected with a line.
                 defaults to ``False``.

pyglet/text/document.py

@@ -247,7 +247,7 @@ class AbstractDocument(event.EventDispatcher):
         self._text = ""
         self._elements: list[InlineElement] = []
         if text:
-            self.append_text(text)
+            self.insert_text(0, text)
 
     @property
     def text(self) -> str:
@@ -384,24 +384,6 @@ class AbstractDocument(event.EventDispatcher):
             if element._position >= start:  # noqa: SLF001
                 element._position += len_text  # noqa: SLF001
 
-    def append_text(self, text: str, attributes: dict[str, Any] | None = None) -> None:
-        """Append text into the end of document.
-
-        Dispatches an :py:meth:`~pyglet.text.document.AbstractDocument.on_insert_text` event.
-
-        Args:
-            text:
-                Text to append.
-            attributes:
-                Optional dictionary giving named style attributes of the appended text.
-        """  # noqa: D411, D405, D214, D410
-        start = len(self._text)
-        self._append_text(text, attributes)
-        self.dispatch_event("on_insert_text", start, text)
-
-    def _append_text(self, text: str, attributes: dict[str, Any] | None) -> None:
-        self._text += text
-
     def delete_text(self, start: int, end: int) -> None:
         """Delete text from the document.
 
@@ -645,49 +627,21 @@ class FormattedDocument(AbstractDocument):
     def get_element_runs(self) -> _ElementIterator:
         return _ElementIterator(self._elements, len(self._text))
 
-    def _insert_text(self, start: int, text: str, attributes: dict[str, Any] | None) -> None:
+    def _insert_text(self, start: int, text: str, attributes: dict[str, Any]) -> None:
         super()._insert_text(start, text, attributes)
 
         len_text = len(text)
-        if attributes is None:
-            for runs in self._style_runs.values():
-                runs.insert(start, len_text)
-
-        else:
-            for name, runs in self._style_runs.items():
-                if name not in attributes:
-                    runs.insert(start, len_text)
-
-            for attribute, value in attributes.items():
-                try:
-                    runs = self._style_runs[attribute]
-                except KeyError:
-                    runs = self._style_runs[attribute] = runlist.RunList(0, None)
-                    runs.append(len(self.text))
-                    runs.set_run(start, start+len_text, value)
-                else:
-                    runs.insert_run(start, len_text, value)
-
-    def _append_text(self, text: str, attributes: dict[str, Any] | None) -> None:
-        super()._append_text(text, attributes)
-
-        len_text = len(text)
-        if attributes is None:
-            for runs in self._style_runs.values():
-                runs.append(len_text)
-
-        else:
-            for name, runs in self._style_runs.items():
-                if name not in attributes:
-                    runs.append(len_text)
+        for runs in self._style_runs.values():
+            runs.insert(start, len_text)
 
+        if attributes is not None:
             for attribute, value in attributes.items():
                 try:
                     runs = self._style_runs[attribute]
                 except KeyError:
                     runs = self._style_runs[attribute] = runlist.RunList(0, None)
-                    runs.append(len(self.text) - len_text)
-                runs.append_run(len_text, value)
+                    runs.insert(0, len(self.text))
+                runs.set_run(start, start + len_text, value)
 
     def _delete_text(self, start: int, end: int) -> None:
         super()._delete_text(start, end)

pyglet/text/formats/attributed.py

@@ -30,6 +30,7 @@ class AttributedTextDecoder(pyglet.text.DocumentDecoder):  # noqa: D101
 
     def __init__(self) -> None:  # noqa: D107
         self.doc = pyglet.text.document.FormattedDocument()
+        self.length = 0
         self.attributes = {}
 
     def decode(self, text: str, location: Location | None = None) -> pyglet.text.document.FormattedDocument:  # noqa: ARG002
@@ -77,5 +78,6 @@ class AttributedTextDecoder(pyglet.text.DocumentDecoder):  # noqa: D101
         return self.doc
 
     def append(self, text: str) -> None:
-        self.doc.append_text(text, self.attributes)
+        self.doc.insert_text(self.length, text, self.attributes)
+        self.length += len(text)
         self.attributes.clear()

pyglet/text/formats/plaintext.py

@@ -13,5 +13,5 @@ if TYPE_CHECKING:
 class PlainTextDecoder(pyglet.text.DocumentDecoder):  # noqa: D101
     def decode(self, text: str, location: Location | None=None) -> UnformattedDocument:  # noqa: ARG002
         document = pyglet.text.document.UnformattedDocument()
-        document.append_text(text)
+        document.insert_text(0, text)
         return document

pyglet/text/formats/structured.py

@@ -315,7 +315,7 @@ class StructuredTextDecoder(pyglet.text.DocumentDecoder):  # noqa: D101
                 break
 
     def add_text(self, text: str) -> None:
-        self.document.append_text(text, self.next_style)
+        self.document.insert_text(self.len_text, text, self.next_style)
         self.next_style.clear()
         self.len_text += len(text)