pyglet 2.1.5__py3-none-any.whl → 2.1.8__py3-none-any.whl

pyglet/font/dwrite/__init__.py

@@ -207,10 +207,12 @@ class _DWriteTextRenderer(com.COMObject):
         self.pixels_per_dip = 1.0
         self.dmatrix = DWRITE_MATRIX()
 
-    def _get_font_reference(self, font_face: IDWriteFontFace) -> tuple[c_void_p, int]:
+    @staticmethod
+    def _get_font_reference(font_face: IDWriteFontFace) -> tuple[int, int]:
         """Unique identifier for each font face."""
         font_file = _get_font_file(font_face)
-        return _get_font_ref(font_file, release_file=True)
+        ptr, size = _get_font_ref(font_file, release_file=True)
+        return ptr.value, size
 
     def DrawUnderline(self, *_args) -> int:  # noqa: ANN002, N802
         return com.E_NOTIMPL
@@ -247,6 +249,9 @@ class _DWriteTextRenderer(com.COMObject):
         glyph_renderer: DirectWriteGlyphRenderer = cast(drawing_context, py_object).value
         glyph_run = glyph_run_ptr.contents
 
+        # Font reference to cache glyphs otherwise cache misses may occur with other glyph indices.
+        font_ref = self._get_font_reference(glyph_run.fontFace)
+
         if glyph_run.glyphCount == 0:
             glyph = glyph_renderer.font._zero_glyph  # noqa: SLF001
             glyph_renderer.current_glyphs.append(glyph)
@@ -257,7 +262,7 @@ class _DWriteTextRenderer(com.COMObject):
         missing = []
         for i in range(glyph_run.glyphCount):
             glyph_indice = glyph_run.glyphIndices[i]
-            if glyph_indice not in glyph_renderer.font.glyphs and glyph_indice not in missing:
+            if (font_ref, glyph_indice) not in glyph_renderer.font.glyphs and glyph_indice not in missing:
                 missing.append(glyph_indice)
 
         # Missing glyphs, get their info.
@@ -266,13 +271,13 @@ class _DWriteTextRenderer(com.COMObject):
 
             for idx, glyph_indice in enumerate(missing):
                 glyph = glyph_renderer.render_single_glyph(glyph_run.fontFace, glyph_indice, metrics[idx], mode)
-                glyph_renderer.font.glyphs[glyph_indice] = glyph
+                glyph_renderer.font.glyphs[(font_ref, glyph_indice)] = glyph
 
         # Set glyphs for run.
         current = []
         for i in range(glyph_run.glyphCount):
             glyph_indice = glyph_run.glyphIndices[i]
-            glyph = glyph_renderer.font.glyphs[glyph_indice]
+            glyph = glyph_renderer.font.glyphs[(font_ref, glyph_indice)]
             current.append(glyph)
             # In some cases (italics) the offsets may be NULL.
             if glyph_run.glyphOffsets:
@@ -600,7 +605,7 @@ class DirectWriteGlyphRenderer(base.GlyphRenderer):  # noqa: D101
 
     def _create_bitmap(self, width: int, height: int) -> None:
         """Creates a bitmap using Direct2D and WIC."""
-        # Create a new bitmap, try to re-use the bitmap as much as we can to minimize creations.
+        # Create a new bitmap, try to reuse the bitmap as much as we can to minimize creations.
         if self._bitmap_dimensions[0] != width or self._bitmap_dimensions[1] != height:
             # If dimensions aren't the same, release bitmap to create new ones.
             if self._render_target:
@@ -1048,7 +1053,7 @@ class Win32DirectWriteFont(base.Font):
             if hr != 0:
                 raise Exception("This font file data is not not a font or unsupported.")
 
-            # We have to rebuild collection everytime we add a font.
+            # We have to rebuild collection every time we add a font.
             # No way to add fonts to the collection once the FontSet and Collection are created.
             # Release old one and renew.
             if cls._custom_collection:
@@ -1158,7 +1163,7 @@ class Win32DirectWriteFont(base.Font):
         metrics = DWRITE_TEXT_METRICS()
         layout.GetMetrics(byref(metrics))
         layout.Release()
-        return round(metrics.width), round(metrics.height)
+        return round(metrics.widthIncludingTrailingWhitespace), round(metrics.height)
 
     @classmethod
     def have_font(cls: type[Win32DirectWriteFont], name: str) -> bool:

pyglet/font/dwrite/dwrite_lib.py

@@ -1049,7 +1049,7 @@ class IDWriteFactory(com.pIUnknown):
         ("CreateCustomRenderingParams",
          com.STDMETHOD(FLOAT, FLOAT, FLOAT, UINT, UINT, POINTER(IDWriteRenderingParams))),
         ("RegisterFontFileLoader",
-         com.STDMETHOD(c_void_p)),  # Ambigious as newer is a pIUnknown and legacy is IUnknown.
+         com.STDMETHOD(c_void_p)),  # Ambiguous as newer is a pIUnknown and legacy is IUnknown.
         ("UnregisterFontFileLoader",
          com.STDMETHOD(POINTER(IDWriteFontFileLoader_LI))),
         ("CreateTextFormat",

pyglet/font/user.py

@@ -201,7 +201,7 @@ class UserDefinedMappingFont(UserDefinedFontBase):
                 Font size. Should be in pixels. This value will affect scaling if enabled.
             mappings:
                 A dict or dict-like object with a ``get`` function.
-                The ``get`` function must take a string character, and output :py:class:`~pyglet.iamge.ImageData` if
+                The ``get`` function must take a string character, and output :py:class:`~pyglet.image.ImageData` if
                 found. It also must return ``None`` if no character is found.
             ascent:
                 Maximum ascent above the baseline, in pixels. If None, the image height is used.

pyglet/gl/base.py

@@ -89,6 +89,7 @@ class Config:
         'forward_compatible',
         'opengl_api',
         'debug',
+        'transparent_framebuffer',
     )
 
     #: The OpenGL major version.
@@ -101,6 +102,8 @@ class Config:
     opengl_api: str
     #: Debug mode.
     debug: bool
+    #: If the framebuffer should be transparent.
+    transparent_framebuffer: bool
 
     def __init__(self, **kwargs: float) -> None:
         """Create a template config with the given attributes.
@@ -132,7 +135,7 @@ class Config:
         """Return a list of matching complete configs for the given canvas."""
 
     def create_context(self, share: Context | None) -> Context:  # noqa: ARG002
-        """Create a GL context that satisifies this configuration.
+        """Create a GL context that satisfies this configuration.
 
         Args:
             share:
@@ -180,10 +183,11 @@ class DisplayConfig(Config, abc.ABC):
         self.forward_compatible = base_config.forward_compatible
         self.opengl_api = base_config.opengl_api or self.opengl_api
         self.debug = base_config.debug
+        self.transparent_framebuffer = base_config.transparent_framebuffer
 
     @abc.abstractmethod
     def compatible(self, canvas: Canvas) -> bool:
-        """Determine compatability with the canvas."""
+        """Determine compatibility with the canvas."""
 
     @abc.abstractmethod
     def create_context(self, share: Context) -> Context:
@@ -311,7 +315,7 @@ class Context:
     # For the static functions below:
     # The garbage collector introduces a race condition.
     # The provided list might be appended to (and only appended to) while this
-    # method runs, as it's a `doomed_*` list either on the context or its bject
+    # method runs, as it's a `doomed_*` list either on the context or its object
     # space. If `count` wasn't stored in a local, this method might leak objects.
     @staticmethod
     def _delete_objects(list_: list, deletion_func: Callable[[int, Array[gl.GLuint]], None]) -> None:
@@ -343,7 +347,7 @@ class Context:
     def destroy(self) -> None:
         """Release the Context.
 
-        The context will not be useable after being destroyed.  Each platform
+        The context will not be usable after being destroyed.  Each platform
         has its own convention for releasing the context and the buffer(s)
         that depend on it in the correct order; this should never be called
         by an application.

pyglet/gl/cocoa.py

@@ -239,6 +239,10 @@ class CocoaDisplayConfig(DisplayConfig):  # noqa: D101
             self._pixel_format,
             share_context)
 
+        if self.transparent_framebuffer:
+            opaque = c_int(0)
+            nscontext.setValues_forParameter_(byref(opaque), cocoapy.NSOpenGLCPSurfaceOpacity)
+
         # No longer needed after context creation.
         if self._pixel_format:
             self._pixel_format.release()

pyglet/gl/gl.py

@@ -3,9 +3,10 @@ Generated by tools/gengl.py.
 Do not modify this file.
 """
 from __future__ import annotations
+
 from ctypes import (
-    CFUNCTYPE, POINTER, Structure, c_char, c_double, c_float, c_int,
-    c_int64, c_short, c_ubyte, c_uint, c_uint64, c_ushort,
+    CFUNCTYPE, POINTER, Structure, c_byte, c_char, c_double, c_float,
+    c_int, c_int64, c_short, c_ubyte, c_uint, c_uint64, c_ushort
 )
 from pyglet.gl.lib import link_GL as _link_function
 from pyglet.gl.lib import c_ptrdiff_t
@@ -24,7 +25,7 @@ GLenum = c_uint
 GLboolean = c_ubyte
 GLbitfield = c_uint
 GLvoid = None
-GLbyte = c_char
+GLbyte = c_byte
 GLubyte = c_ubyte
 GLshort = c_short
 GLushort = c_ushort