pyglet 2.1.12__py3-none-any.whl → 3.0.dev1__py3-none-any.whl

pyglet/text/formats/html.py

@@ -25,7 +25,7 @@ import pyglet
 from pyglet.text.formats import structured
 
 if TYPE_CHECKING:
-    from pyglet.image import AbstractImage
+    from pyglet.image import _AbstractImage
     from pyglet.resource import Location
 
 
@@ -124,7 +124,7 @@ class HTMLDecoder(HTMLParser, structured.StructuredTextDecoder):
         self.feed(text)
         self.close()
 
-    def get_image(self, filename: str) -> AbstractImage:
+    def get_image(self, filename: str) -> _AbstractImage:
         return pyglet.image.load(filename, file=self.location.open(filename))
 
     def prepare_for_data(self) -> None:

pyglet/text/formats/structured.py

@@ -5,23 +5,13 @@ import re
 from typing import TYPE_CHECKING, Any, NoReturn
 
 import pyglet
-import pyglet.text.layout
-from pyglet.gl import (
-    GL_BLEND,
-    GL_ONE_MINUS_SRC_ALPHA,
-    GL_SRC_ALPHA,
-    GL_TEXTURE0,
-    glActiveTexture,
-    glBindTexture,
-    glBlendFunc,
-    glDisable,
-    glEnable,
-)
+from pyglet.enums import BlendFactor
+from pyglet.graphics import GeometryMode
 
 if TYPE_CHECKING:
     from pyglet.graphics import Group
     from pyglet.graphics.shader import ShaderProgram
-    from pyglet.image import AbstractImage, Texture
+    from pyglet.image import _AbstractImage, Texture
     from pyglet.resource import Location
     from pyglet.text.document import InlineElement
     from pyglet.text.layout import TextLayout
@@ -33,31 +23,9 @@ class _InlineElementGroup(pyglet.graphics.Group):
         super().__init__(order, parent)
         self.texture = texture
         self.program = program
-
-    def set_state(self) -> None:
-        self.program.use()
-
-        glActiveTexture(GL_TEXTURE0)
-        glBindTexture(self.texture.target, self.texture.id)
-
-        glEnable(GL_BLEND)
-        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)
-
-    def unset_state(self) -> None:
-        glDisable(GL_BLEND)
-        self.program.stop()
-
-    def __eq__(self, other: _InlineElementGroup) -> bool:
-        return (self.__class__ is other.__class__ and
-                self._order == other.order and
-                self.program == other.program and
-                self.parent == other.parent and
-                self.texture.target == other.texture.target and
-                self.texture.id == other.texture.id)
-
-    def __hash__(self) -> int:
-        return hash((self._order, self.program, self.parent,
-                     self.texture.target, self.texture.id))
+        self.set_shader_program(program)
+        self.set_texture(texture, 0)
+        self.set_blend(BlendFactor.SRC_ALPHA, BlendFactor.ONE_MINUS_SRC_ALPHA)
 
 
 class ImageElement(pyglet.text.document.InlineElement):
@@ -65,7 +33,7 @@ class ImageElement(pyglet.text.document.InlineElement):
     height: int
     width: int
 
-    def __init__(self, image: AbstractImage, width: int | None=None, height: int | None=None) -> None:  # noqa: D107
+    def __init__(self, image: _AbstractImage, width: int | None=None, height: int | None=None) -> None:  # noqa: D107
         self.image = image.get_texture()
         self.width = width or image.width
         self.height = height or image.height
@@ -85,7 +53,7 @@ class ImageElement(pyglet.text.document.InlineElement):
         x2 = line_x + self.width
         y2 = line_y + self.height + self.descent
 
-        vertex_list = program.vertex_list_indexed(4, pyglet.gl.GL_TRIANGLES, [0, 1, 2, 0, 2, 3],
+        vertex_list = program.vertex_list_indexed(4, GeometryMode.TRIANGLES, [0, 1, 2, 0, 2, 3],
                                                   layout.batch, group,
                                                   position=("f", (x1, y1, z, x2, y1, z, x2, y2, z, x1, y2, z)),
                                                   translation=("f", (x, y, z) * 4),
@@ -93,6 +61,8 @@ class ImageElement(pyglet.text.document.InlineElement):
                                                   visible=("f", (visible,) * 4),
                                                   rotation=("f", (rotation,) * 4),
                                                   anchor=("f", (anchor_x, anchor_y) * 4),
+                                                  view_translation=("f", (0, 0, 0) * 4),
+                                                  #colors=("Bn", (128, 128, 128, 255) * 4),
                                                   )
 
         self.vertex_lists[layout] = vertex_list

pyglet/text/layout/__init__.py

@@ -121,24 +121,31 @@ from pyglet.text.layout.base import (
     TextDecorationGroup,
     TextLayout,
     TextLayoutGroup,
-    decoration_fragment_source,
-    decoration_vertex_source,
-    get_default_decoration_shader,
-    get_default_image_layout_shader,
     get_default_layout_shader,
-    layout_fragment_image_source,
-    layout_fragment_source,
-    layout_vertex_source,
+    get_default_image_layout_shader,
+    get_default_decoration_shader, ScrollableTextLayoutGroup, ScrollableTextDecorationGroup,
 )
 from pyglet.text.layout.incremental import (
     IncrementalTextDecorationGroup,
     IncrementalTextLayout,
     IncrementalTextLayoutGroup,
 )
-from pyglet.text.layout.scrolling import ScrollableTextDecorationGroup, ScrollableTextLayout, ScrollableTextLayoutGroup
 
-__all__ = ["TextLayout", "IncrementalTextLayout", "ScrollableTextLayout", "TextLayoutGroup", "TextDecorationGroup",
-           "IncrementalTextLayoutGroup", "IncrementalTextDecorationGroup", "ScrollableTextLayoutGroup",
-           "ScrollableTextDecorationGroup", "get_default_layout_shader", "get_default_image_layout_shader",
-           "get_default_decoration_shader", "decoration_fragment_source", "layout_fragment_image_source",
-           "layout_fragment_source", "layout_vertex_source", "decoration_vertex_source"]
+from pyglet.text.layout.scrolling import (
+    ScrollableTextLayout,
+)
+
+__all__ = [
+    "IncrementalTextDecorationGroup",
+    "IncrementalTextLayout",
+    "IncrementalTextLayoutGroup",
+    "ScrollableTextDecorationGroup",
+    "ScrollableTextLayout",
+    "ScrollableTextLayoutGroup",
+    "TextDecorationGroup",
+    "TextLayout",
+    "TextLayoutGroup",
+    "get_default_decoration_shader",
+    "get_default_image_layout_shader",
+    "get_default_layout_shader",
+]