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

pyglet/font/user.py

@@ -73,7 +73,7 @@ except ImportError:
     pass
 
 if TYPE_CHECKING:
-    from pyglet.font.base import Glyph
+    from pyglet.font.base import Glyph, GlyphPosition
     from pyglet.image import ImageData
 
 
@@ -158,11 +158,18 @@ class UserDefinedFontBase(base.Font):
     def enable_scaling(self, base_size: int) -> None:
         if not SCALING_ENABLED:
             msg = "PIL is not installed. User Font Scaling requires PIL."
-            raise Exception(msg)
+            raise ImportError(msg)
 
         self._base_size = base_size
         self._scaling = True
 
+    def _initialize_renderer(self) -> None:
+        """Initialize the glyph renderer and cache it on the Font.
+
+        This way renderers for fonts that have been loaded but not used will not have unnecessary loaders.
+        """
+        if not self._glyph_renderer:
+            self._glyph_renderer = self.glyph_renderer_class(self)
 
 class UserDefinedFontException(Exception):  # noqa: N818
     """An exception related to user font creation."""
@@ -175,9 +182,10 @@ class DictLikeObject(Protocol):
 
 class UserDefinedMappingFont(UserDefinedFontBase):
     """The class allows the creation of user defined fonts from a set of mappings.
-    
+
     .. versionadded:: 2.0.15
     """
+    _glyph_renderer: UserDefinedGlyphRenderer
 
     def __init__(self, name: str, default_char: str, size: int, mappings: DictLikeObject,
             ascent: int | None = None, descent: int | None = None, weight: str = "normal", italic: bool = False,
@@ -233,17 +241,18 @@ class UserDefinedMappingFont(UserDefinedFontBase):
                 The base size is used to calculate the ratio between new sizes and the original.
         """
         super().enable_scaling(base_size)
-        glyphs = self.get_glyphs(self.default_char)
+        glyphs, offsets = self.get_glyphs(self.default_char)
         self.ascent = glyphs[0].height
         self.descent = 0
 
-    def get_glyphs(self, text: str) -> list[Glyph]:
+    def get_glyphs(self, text: str) -> tuple[list[Glyph], list[GlyphPosition]]:
         """Create and return a list of Glyphs for `text`.
 
         If any characters do not have a known glyph representation in this font, a substitution will be made with
         the ``default_char``.
         """
-        glyph_renderer = None
+        self._initialize_renderer()
+        offsets = []
         glyphs = []  # glyphs that are committed.
         for c in base.get_grapheme_clusters(text):
             # Get the glyph for 'c'.  Hide tabs (Windows and Linux render
@@ -251,16 +260,14 @@ class UserDefinedMappingFont(UserDefinedFontBase):
             if c == "\t":
                 c = " "
             if c not in self.glyphs:
-                if not glyph_renderer:
-                    glyph_renderer = self.glyph_renderer_class(self)
-
                 image_data = self.mappings.get(c)
                 if not image_data:
                     c = self.default_char
                 else:
-                    self.glyphs[c] = glyph_renderer.render(image_data)
+                    self.glyphs[c] = self._glyph_renderer.render(image_data)
             glyphs.append(self.glyphs[c])
-        return glyphs
+            offsets.append(base.GlyphPosition(0, 0, 0, 0))
+        return glyphs, offsets
 
 
 def get_scaled_user_font(font_base: UserDefinedMappingFont, size: int) -> UserDefinedMappingFont:

pyglet/font/win32.py

@@ -22,9 +22,11 @@ if TYPE_CHECKING:
 
 DriverStringOptionsCmapLookup = 1
 DriverStringOptionsRealizedAdvance = 4
+TextRenderingHintSingleBitPerPixelGridFit = 1
 TextRenderingHintAntiAlias = 4
 TextRenderingHintAntiAliasGridFit = 3
 
+
 FontStyleBold = 1
 FontStyleItalic = 2
 UnitPixel = 2
@@ -55,7 +57,13 @@ class Rectf(ctypes.Structure):
     ]
 
 
+_text_quality = {
+    True: TextRenderingHintAntiAliasGridFit,
+    False: TextRenderingHintSingleBitPerPixelGridFit,
+}
+
 class GDIPlusGlyphRenderer(base.GlyphRenderer):
+
     def __init__(self, font: GDIPlusFont) -> None:
         self._bitmap = None
         self._dc = None
@@ -103,7 +111,7 @@ class GDIPlusGlyphRenderer(base.GlyphRenderer):
         gdi32.SelectObject(self._dc, self.font.hfont)
 
         gdiplus.GdipSetTextRenderingHint(self._graphics,
-            TextRenderingHintAntiAliasGridFit)
+            _text_quality[pyglet.options.text_antialiasing])
 
         self._brush = ctypes.c_void_p()
         gdiplus.GdipCreateSolidFill(0xffffffff, ctypes.byref(self._brush))

pyglet/gl/wgl.py

@@ -3,71 +3,23 @@
 Generated by tools/gengl.py.
 """
 
-from ctypes import CFUNCTYPE, POINTER, Structure, c_char, c_char_p, c_double, c_float, c_int
-from ctypes import c_short, c_ubyte, c_uint, c_ulong, c_ulonglong, c_ushort, c_long, c_longlong
+from ctypes import CFUNCTYPE, POINTER, Structure, c_int
+from ctypes.wintypes import DWORD, BOOL, FLOAT, LONG, UINT, HDC, WORD, HANDLE, LPCSTR
 
 from pyglet.gl.lib import link_WGL as _link_function
+from pyglet.libs.win32.types import BYTE
 
 if not _link_function:
     raise ImportError('opengl32.dll is not available.')
 
 CONST = 0
-GLenum = c_uint
-GLboolean = c_ubyte
-GLbitfield = c_uint
-GLbyte = c_char
-GLshort = c_short
-GLint = c_int
-GLsizei = c_int
-GLubyte = c_ubyte
-GLushort = c_ushort
-GLuint = c_uint
-GLfloat = c_float
-GLclampf = c_float
-GLdouble = c_double
-GLclampd = c_double
-GLvoid = None
-INT8 = c_char
-PINT8 = c_char_p
-INT16 = c_short
-PINT16 = POINTER(c_short)
-INT32 = c_int
-PINT32 = POINTER(c_int)
-UINT8 = c_ubyte
-PUINT8 = POINTER(c_ubyte)
-UINT16 = c_ushort
-PUINT16 = POINTER(c_ushort)
-UINT32 = c_uint
-PUINT32 = POINTER(c_uint)
-LONG32 = c_int
-PLONG32 = POINTER(c_int)
-ULONG32 = c_uint
-PULONG32 = POINTER(c_uint)
-DWORD32 = c_uint
-PDWORD32 = POINTER(c_uint)
-INT64 = c_longlong
-PINT64 = POINTER(c_longlong)
-UINT64 = c_ulonglong
-PUINT64 = POINTER(c_ulonglong)
-VOID = None
-LPVOID = POINTER(None)
-LPCSTR = c_char_p
-CHAR = c_char
-BYTE = c_ubyte
-WORD = c_ushort
-USHORT = c_ushort
-UINT = c_uint
-INT = c_int
+
 INT_PTR = POINTER(c_int)
-BOOL = c_long
-LONG = c_long
-DWORD = c_ulong
-FLOAT = c_float
+
 COLORREF = DWORD
 LPCOLORREF = POINTER(DWORD)
-HANDLE = POINTER(None)
 HGLRC = HANDLE
-HDC = HANDLE
+
 PROC = CFUNCTYPE(INT_PTR)
 
 wglCopyContext = _link_function('wglCopyContext', BOOL, [HGLRC, HGLRC, UINT], None)
@@ -279,36 +231,91 @@ PRECT = POINTER(struct_tagRECT)
 NPRECT = POINTER(struct_tagRECT)
 LPRECT = POINTER(struct_tagRECT)
 
-__all__ = ['CONST', 'GLenum', 'GLboolean', 'GLbitfield', 'GLbyte', 'GLshort',
-           'GLint', 'GLsizei', 'GLubyte', 'GLushort', 'GLuint', 'GLfloat', 'GLclampf',
-           'GLdouble', 'GLclampd', 'GLvoid', 'INT8', 'PINT8', 'INT16', 'PINT16', 'INT32',
-           'PINT32', 'UINT8', 'PUINT8', 'UINT16', 'PUINT16', 'UINT32', 'PUINT32',
-           'LONG32', 'PLONG32', 'ULONG32', 'PULONG32', 'DWORD32', 'PDWORD32', 'INT64',
-           'PINT64', 'UINT64', 'PUINT64', 'VOID', 'LPVOID', 'LPCSTR', 'CHAR', 'BYTE',
-           'WORD', 'USHORT', 'UINT', 'INT', 'INT_PTR', 'BOOL', 'LONG', 'DWORD', 'FLOAT',
-           'COLORREF', 'LPCOLORREF', 'HANDLE', 'HGLRC', 'HDC', 'PROC', 'wglCopyContext',
-           'wglCreateContext', 'wglCreateLayerContext', 'wglDeleteContext',
-           'wglGetCurrentContext', 'wglGetCurrentDC', 'wglGetProcAddress',
-           'wglMakeCurrent', 'wglShareLists', 'wglUseFontBitmapsA', 'wglUseFontBitmapsW',
-           'SwapBuffers', 'POINTFLOAT', 'PPOINTFLOAT', 'GLYPHMETRICSFLOAT',
-           'PGLYPHMETRICSFLOAT', 'LPGLYPHMETRICSFLOAT', 'WGL_FONT_LINES',
-           'WGL_FONT_POLYGONS', 'wglUseFontOutlinesA', 'wglUseFontOutlinesW',
-           'LAYERPLANEDESCRIPTOR', 'PLAYERPLANEDESCRIPTOR', 'LPLAYERPLANEDESCRIPTOR',
-           'LPD_DOUBLEBUFFER', 'LPD_STEREO', 'LPD_SUPPORT_GDI', 'LPD_SUPPORT_OPENGL',
-           'LPD_SHARE_DEPTH', 'LPD_SHARE_STENCIL', 'LPD_SHARE_ACCUM',
-           'LPD_SWAP_EXCHANGE', 'LPD_SWAP_COPY', 'LPD_TRANSPARENT', 'LPD_TYPE_RGBA',
-           'LPD_TYPE_COLORINDEX', 'WGL_SWAP_MAIN_PLANE', 'WGL_SWAP_OVERLAY1',
-           'WGL_SWAP_OVERLAY2', 'WGL_SWAP_OVERLAY3', 'WGL_SWAP_OVERLAY4',
-           'WGL_SWAP_OVERLAY5', 'WGL_SWAP_OVERLAY6', 'WGL_SWAP_OVERLAY7',
-           'WGL_SWAP_OVERLAY8', 'WGL_SWAP_OVERLAY9', 'WGL_SWAP_OVERLAY10',
-           'WGL_SWAP_OVERLAY11', 'WGL_SWAP_OVERLAY12', 'WGL_SWAP_OVERLAY13',
-           'WGL_SWAP_OVERLAY14', 'WGL_SWAP_OVERLAY15', 'WGL_SWAP_UNDERLAY1',
-           'WGL_SWAP_UNDERLAY2', 'WGL_SWAP_UNDERLAY3', 'WGL_SWAP_UNDERLAY4',
-           'WGL_SWAP_UNDERLAY5', 'WGL_SWAP_UNDERLAY6', 'WGL_SWAP_UNDERLAY7',
-           'WGL_SWAP_UNDERLAY8', 'WGL_SWAP_UNDERLAY9', 'WGL_SWAP_UNDERLAY10',
-           'WGL_SWAP_UNDERLAY11', 'WGL_SWAP_UNDERLAY12', 'WGL_SWAP_UNDERLAY13',
-           'WGL_SWAP_UNDERLAY14', 'WGL_SWAP_UNDERLAY15', 'wglDescribeLayerPlane',
-           'wglSetLayerPaletteEntries', 'wglGetLayerPaletteEntries',
-           'wglRealizeLayerPalette', 'wglSwapLayerBuffers', 'WGLSWAP', 'PWGLSWAP',
-           'LPWGLSWAP', 'WGL_SWAPMULTIPLE_MAX', 'wglSwapMultipleBuffers', 'RECT',
-           'PRECT', 'NPRECT', 'LPRECT']
+__all__ = [
+    'COLORREF',
+    'CONST',
+    'GLYPHMETRICSFLOAT',
+    'HGLRC',
+    'LAYERPLANEDESCRIPTOR',
+    'LPCOLORREF',
+    'LPD_DOUBLEBUFFER',
+    'LPD_SHARE_ACCUM',
+    'LPD_SHARE_DEPTH',
+    'LPD_SHARE_STENCIL',
+    'LPD_STEREO',
+    'LPD_SUPPORT_GDI',
+    'LPD_SUPPORT_OPENGL',
+    'LPD_SWAP_COPY',
+    'LPD_SWAP_EXCHANGE',
+    'LPD_TRANSPARENT',
+    'LPD_TYPE_COLORINDEX',
+    'LPD_TYPE_RGBA',
+    'LPGLYPHMETRICSFLOAT',
+    'LPLAYERPLANEDESCRIPTOR',
+    'LPRECT',
+    'LPWGLSWAP',
+    'NPRECT',
+    'PGLYPHMETRICSFLOAT',
+    'PLAYERPLANEDESCRIPTOR',
+    'POINTFLOAT',
+    'PPOINTFLOAT',
+    'PRECT',
+    'PROC',
+    'PWGLSWAP',
+    'RECT',
+    'WGLSWAP',
+    'WGL_FONT_LINES',
+    'WGL_FONT_POLYGONS',
+    'WGL_SWAPMULTIPLE_MAX',
+    'WGL_SWAP_MAIN_PLANE',
+    'WGL_SWAP_OVERLAY1',
+    'WGL_SWAP_OVERLAY2',
+    'WGL_SWAP_OVERLAY3',
+    'WGL_SWAP_OVERLAY4',
+    'WGL_SWAP_OVERLAY5',
+    'WGL_SWAP_OVERLAY6',
+    'WGL_SWAP_OVERLAY7',
+    'WGL_SWAP_OVERLAY8',
+    'WGL_SWAP_OVERLAY9',
+    'WGL_SWAP_OVERLAY10',
+    'WGL_SWAP_OVERLAY11',
+    'WGL_SWAP_OVERLAY12',
+    'WGL_SWAP_OVERLAY13',
+    'WGL_SWAP_OVERLAY14',
+    'WGL_SWAP_OVERLAY15',
+    'WGL_SWAP_UNDERLAY1',
+    'WGL_SWAP_UNDERLAY2',
+    'WGL_SWAP_UNDERLAY3',
+    'WGL_SWAP_UNDERLAY4',
+    'WGL_SWAP_UNDERLAY5',
+    'WGL_SWAP_UNDERLAY6',
+    'WGL_SWAP_UNDERLAY7',
+    'WGL_SWAP_UNDERLAY8',
+    'WGL_SWAP_UNDERLAY9',
+    'WGL_SWAP_UNDERLAY10',
+    'WGL_SWAP_UNDERLAY11',
+    'WGL_SWAP_UNDERLAY12',
+    'WGL_SWAP_UNDERLAY13',
+    'WGL_SWAP_UNDERLAY14',
+    'WGL_SWAP_UNDERLAY15',
+    'SwapBuffers',
+    'wglCopyContext',
+    'wglCreateContext',
+    'wglCreateLayerContext',
+    'wglDeleteContext',
+    'wglDescribeLayerPlane',
+    'wglGetCurrentContext',
+    'wglGetCurrentDC',
+    'wglGetLayerPaletteEntries',
+    'wglGetProcAddress',
+    'wglMakeCurrent',
+    'wglRealizeLayerPalette',
+    'wglSetLayerPaletteEntries',
+    'wglShareLists',
+    'wglSwapLayerBuffers',
+    'wglSwapMultipleBuffers',
+    'wglUseFontBitmapsA',
+    'wglUseFontBitmapsW',
+    'wglUseFontOutlinesA',
+    'wglUseFontOutlinesW',
+]