pyglet 2.0.8__zip → 2.0.10__zip

pyglet-2.0.10/tests/interactive/shapes/test_shapes.py

@@ -0,0 +1,179 @@
+import itertools
+import inspect
+from typing import Dict, Optional, Generator, Tuple, Type
+
+import pyglet.window
+import math
+from pyglet.shapes import (
+    Arc,
+    BezierCurve,
+    Circle,
+    Ellipse,
+    Sector,
+    Line,
+    Rectangle,
+    BorderedRectangle,
+    Triangle,
+    Star,
+    Polygon,
+    Box,
+    ShapeBase
+)
+from pyglet.text import Label
+
+
+INSTRUCTIONS = """- / = keys to rotate
+Left click + drag to adjust positions
+"""
+
+PX_SIZE = 10
+PX_SIZE_2 = PX_SIZE * 2
+
+# Call next() to get a new color; endlessly repeats
+colors = itertools.cycle(map(lambda c: c + (255,), [
+    (255, 0, 0),  # Red
+    (0, 255, 0),  # Blue
+    (0, 0, 255),  # Green
+    (255, 255, 0)  # Yellow
+]))
+
+# Default values for each shape type: Type, *args, **kwargs
+shape_configs = [
+    (Arc, (PX_SIZE,), {}),
+    (BezierCurve, [(0,0), (PX_SIZE,PX_SIZE_2), (PX_SIZE_2 , PX_SIZE)], {}),
+    (Circle, (PX_SIZE,), {}),
+    (Ellipse, (PX_SIZE, PX_SIZE_2,), {}),
+
+    (Sector, (PX_SIZE, ), {}),
+    (Line, (0, 0, PX_SIZE_2, PX_SIZE_2), {}),
+    (Rectangle, (PX_SIZE, PX_SIZE_2), {}),
+    (BorderedRectangle, (PX_SIZE_2, PX_SIZE), {}),
+    (Box, (PX_SIZE_2, PX_SIZE_2), {}),
+
+    (Triangle, (-PX_SIZE, 0, 0, PX_SIZE, PX_SIZE, 0), {}),
+    (Star, (PX_SIZE_2, PX_SIZE, 5), {}),
+    (Polygon, ((-PX_SIZE,0), (0,PX_SIZE), (PX_SIZE,0)), {})
+]
+
+def layout_points(
+        width: int, height: int,
+        padding: int,
+        num_cols: int,
+        num_rows: Optional[int] = None
+) -> Generator[Tuple[int, int], None, None]:
+    """Yield points out in a col / row grid.
+
+    All units in px.
+    Args:
+        width: Width of the area
+        height: Height of the area
+        padding: How many px to pad on all sides
+        num_cols: How many columns each row should have
+        num_rows: Specify to prevent auto-calculation
+
+    Yields:
+        Bottom left screen position of the grid cell in px
+    """
+    x_step_range = width - 2 * padding
+    y_step_range = height - 2 * padding
+
+    if num_rows is None:
+        num_rows = math.ceil(len(shape_configs) / num_cols)
+
+    x_step = x_step_range // num_cols
+    y_step = y_step_range // num_rows
+
+    for y in range(height - padding, y_step, -y_step):
+        for x in range(padding, padding + x_step_range, x_step):
+            yield x, y
+
+def main():
+    padding = 50
+    width, height = 600, 600
+
+    window = pyglet.window.Window(
+        width, height,
+        caption="Shape Translation / Rotation Spotcheck",
+        resizable=True)
+
+    shapes: Dict[Type, ShapeBase] = {}
+    labels: Dict[Type, Label] = {}
+    batch = pyglet.graphics.Batch()
+
+    for shape_config, position in zip(shape_configs, layout_points(window.width, window.height, padding, 4)):
+        shape_type, args, kwargs = shape_config
+        sig = inspect.signature(shape_type)
+        params = list(sig.parameters)
+        print(shape_type.__name__, params)
+
+        # Arrange shape args
+        if params[:2] == ['x', 'y'] and params[2] != 'x2':
+            final_args = position + args
+        elif shape_type in (Polygon, BezierCurve):
+            raw = [(position[0] + p[0],  position[1] + p[1]) for p in args]
+            final_args = raw
+            print(shape_type.__name__, final_args)
+
+        elif shape_type in (Line, Triangle):
+            final_args = [
+                position[0] + args[0], position[1] + args[1],
+                position[0] + args[2], position[1] + args[3]]
+            if shape_type is Triangle:
+                final_args += [position[0] + args[4], position[1] + args[5]]
+            print(shape_type.__name__, final_args)
+
+        else:
+            raise TypeError("unhandled")
+
+        final_kwargs = dict(color=next(colors))
+        final_kwargs.update(kwargs)
+
+        label = pyglet.text.Label(
+            shape_type.__name__,
+            x=position[0], y=position[1] - padding,
+            batch=batch,
+            anchor_x='center',
+            **final_kwargs
+        )
+        shape = shape_type(*final_args, batch=batch, **final_kwargs)
+        shapes[shape_type] = shape
+        labels[shape_type] = label
+
+    _instructions = pyglet.text.Label(
+        INSTRUCTIONS,
+        x=window.width // 2, y=padding,
+        width=window.width,
+        anchor_x='center',
+        align='center',
+        batch=batch,
+        multiline=True
+    )
+
+    @window.event
+    def on_draw():
+        window.clear()
+        batch.draw()
+
+    @window.event
+    def on_key_press(symbol, modifiers):
+        if symbol == pyglet.window.key.MINUS:
+            for item in shapes.values():
+                item.rotation -= 20
+        elif symbol == pyglet.window.key.EQUAL:
+            for item in shapes.values():
+                item.rotation += 20
+
+    @window.event
+    def on_mouse_drag(x, y, dx, dy, buttons, modifiers):
+        if buttons == pyglet.window.mouse.LEFT:
+            for item in itertools.chain(shapes.values(), labels.values()):
+                item_x, item_y, *item_z = item.position
+                item.position = item_x + dx, item_y + dy, *item_z
+
+    # This line is crucial for 2.1 / the development branch
+    pyglet.clock.schedule_interval(window.draw, 1 / 60)
+    pyglet.app.run()
+
+
+if __name__ == "__main__":
+    main()

{pyglet-2.0.8 → pyglet-2.0.10}/tests/interactive/text/test_inline_elements.py

@@ -3,7 +3,7 @@ from tests.base.interactive import InteractiveTestCase
 
 import pyglet
 from pyglet.text import caret, document
-from pyglet.text.layout import TextDecorationGroup, IncrementalTextLayout
+from pyglet.text.layout import IncrementalTextLayout
 
 
 doctext = """ELEMENT.py test document.
@@ -70,28 +70,31 @@ Aliquam erat volutpat.
 class TestElement(document.InlineElement):
     vertex_list = None
 
-    def place(self, layout, x, y):
-        group = TextDecorationGroup(1, layout.top_group)
-        self.vertex_list = layout.batch.add_indexed(4, pyglet.gl.GL_TRIANGLES,
-                                                    group,
-                                                    [0, 1, 2, 0, 2, 3],
-                                                    'v2i', ('c4B', (200, 200, 200, 255) * 4))
+    def place(self, layout, x, y, z):
+        group = layout.foreground_decoration_group
+        program = pyglet.text.layout.get_default_decoration_shader()
+
+        self.vertex_list = program.vertex_list_indexed(4, pyglet.gl.GL_TRIANGLES,
+                                                       [0, 1, 2, 0, 2, 3],
+                                                       colors=('Bn', (200, 200, 200, 255) * 4),
+                                                       group=group, batch=layout.batch)
 
         y += self.descent
         w = self.advance
         h = self.ascent - self.descent
-        self.vertex_list.position[:] = (x, y,
-                                        x + w, y,
-                                        x + w, y + h,
-                                        x, y + h)
+        self.vertex_list.position[:] = (x, y, z,
+                                        x + w, y, z,
+                                        x + w, y + h, z,
+                                        x, y + h, z)
+
     def remove(self, layout):
         self.vertex_list.delete()
         del self.vertex_list
 
 
-class TestWindow(pyglet.window.Window):
+class BaseTestWindow(pyglet.window.Window):
     def __init__(self, *args, **kwargs):
-        super(TestWindow, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
         self.batch = pyglet.graphics.Batch()
         self.document = pyglet.text.decode_attributed(doctext)
@@ -108,7 +111,7 @@ class TestWindow(pyglet.window.Window):
         self.set_mouse_cursor(self.get_system_mouse_cursor('text'))
 
     def on_resize(self, width, height):
-        super(TestWindow, self).on_resize(width, height)
+        super().on_resize(width, height)
         self.layout.begin_update()
         self.layout.x = self.margin
         self.layout.y = self.margin
@@ -121,12 +124,12 @@ class TestWindow(pyglet.window.Window):
         self.layout.view_y += scroll_y * 16
 
     def on_draw(self):
-        pyglet.gl.glClearColor(0, 0, 0, 1)
+        pyglet.gl.glClearColor(1, 1, 1, 1)
         self.clear()
         self.batch.draw()
 
     def on_key_press(self, symbol, modifiers):
-        super(TestWindow, self).on_key_press(symbol, modifiers)
+        super().on_key_press(symbol, modifiers)
         if symbol == pyglet.window.key.TAB:
             self.caret.on_text('\t')
 
@@ -145,7 +148,7 @@ class InlineElementTestCase(InteractiveTestCase):
     def test_inline_elements(self):
         self.window = None
         try:
-            self.window = TestWindow(resizable=True, visible=False)
+            self.window = BaseTestWindow(resizable=True, visible=False)
             self.window.set_visible()
             pyglet.app.run()
             self.user_verify('Pass test?', take_screenshot=False)

{pyglet-2.0.8 → pyglet-2.0.10}/tests/interactive/text/test_inline_elements_style_change.py

@@ -1,9 +1,10 @@
 import pytest
+
 from tests.base.interactive import InteractiveTestCase
 
 import pyglet
-from pyglet.text import caret, document, layout
-from pyglet.text.layout import TextDecorationGroup, IncrementalTextLayout
+from pyglet.text import caret, document
+from pyglet.text.layout import IncrementalTextLayout
 
 
 doctext = """ELEMENT.py test document.
@@ -42,23 +43,23 @@ doctext = doctext.replace('[element here]', '')
 class TestElement(document.InlineElement):
     vertex_list = None
 
-    def place(self, layout, x, y):
-        ## assert layout.document.text[self._position] == '\x00'
-            ### in bug 538, this fails after two characters are deleted.
+    def place(self, layout, x, y, z):
+        group = layout.foreground_decoration_group
+        program = pyglet.text.layout.get_default_layout_shader()
 
-        group = TextDecorationGroup(1, layout.top_group)
-        self.vertex_list = layout.batch.add_indexed(4, pyglet.gl.GL_TRIANGLES,
-                                                    group,
-                                                    [0, 1, 2, 0, 2, 3],
-                                                    'v2i', ('c4B', [200, 200, 200, 255] * 4))
+        self.vertex_list = program.vertex_list_indexed(4, pyglet.gl.GL_TRIANGLES,
+                                                       [0, 1, 2, 0, 2, 3],
+                                                       colors=('Bn', (200, 200, 200, 255) * 4),
+                                                       group=group, batch=layout.batch)
 
         y += self.descent
         w = self.advance
         h = self.ascent - self.descent
-        self.vertex_list.position[:] = (x, y,
-                                        x + w, y,
-                                        x + w, y + h,
-                                        x, y + h)
+        self.vertex_list.position[:] = (x, y, z,
+                                        x + w, y, z,
+                                        x + w, y + h, z,
+                                        x, y + h, z)
+
     def remove(self, layout):
         self.vertex_list.delete()
         del self.vertex_list

{pyglet-2.0.8 → pyglet-2.0.10}/tests/interactive/text/test_multiline_wrap.py

@@ -11,27 +11,27 @@ from pyglet import window
 from pyglet.window import key, mouse
 
 nonewline_nowrap = """{font_size 24}Multiline=False\n
-{font_size 12}This paragraph contains a lots of newlines however,\n
+{font_size 12}This paragraph contains a lots of newlines, however\n
 the parameter multiline=False makes pyglet {font_size 16}ignore{font_size 12} it.\n
-For example this line should be not in a new line.\n
+For example this line should not be in a new line.\n
 And because the parameter multiline=False (ignoring wrap_lines) the {font_size 16}long lines are not broken{font_size 12}, as you can see in this line."""
 
 newline_nowrap = """{font_size 24}Multiline=True -- Wrap_line=False\n
-{font_size 12}This paragraph contains a lots of newlines however,\n
-the parameter multiline=True makes pyglet {font_size 16}accept{font_size 12} it.\n
+{font_size 12}This paragraph contains a lots of newlines, which\n
+pyglet {font_size 16}accepts{font_size 12} due to the parameter multiline=True.\n
 For example this line should be in a new line.\n
-And because the parameter wrap_lines=False the {font_size 16}long lines are not broken{font_size 12}, as you can see in this line."""
+And, because the parameter wrap_lines=False, the {font_size 16}long lines are not broken{font_size 12}, as you can see in this line."""
 
 newline_wrap = """{font_size 24}Multiline=True -- Wrap_line=True\n
-{font_size 12}This paragraph contains a lots of newlines however,\n
-the parameter multiline=True makes pyglet {font_size 16}accept{font_size 12} it.\n
+{font_size 12}This paragraph contains a lots of newlines, which\n
+pyglet {font_size 16}accepts{font_size 12} due to the parameter multiline=True.\n
 For example this line should be in a new line.\n
-And because the parameter wrap_lines=True the {font_size 16}long lines are broken{font_size 12}, as you can see in this line."""
+And, because the parameter wrap_lines=True the {font_size 16}long lines are broken{font_size 12}, as you can see in this line."""
 
 
-class TestWindow(window.Window):
+class BaseTestWindow(window.Window):
     def __init__(self, multiline, wrap_lines, msg, *args, **kwargs):
-        super(TestWindow, self).__init__(*args, **kwargs)
+        super(BaseTestWindow, self).__init__(*args, width=640, height=480, **kwargs)
 
         self.batch = graphics.Batch()
         self.document = text.decode_attributed(msg)
@@ -50,7 +50,7 @@ class TestWindow(window.Window):
         self.set_mouse_cursor(self.get_system_mouse_cursor('text'))
 
     def on_resize(self, width, height):
-        super(TestWindow, self).on_resize(width, height)
+        super(BaseTestWindow, self).on_resize(width, height)
         self.layout.begin_update()
         self.layout.x = self.margin
         self.layout.y = self.margin
@@ -69,7 +69,7 @@ class TestWindow(window.Window):
         self.batch.draw()
 
     def on_key_press(self, symbol, modifiers):
-        super(TestWindow, self).on_key_press(symbol, modifiers)
+        super(BaseTestWindow, self).on_key_press(symbol, modifiers)
         if symbol == key.TAB:
             self.caret.on_text('\t')
 
@@ -80,18 +80,18 @@ class MultilineWrapTestCase(InteractiveTestCase):
     incremental layout.
 
     Three windows will be open (one per test) showing:
-    - A paragraph in a single line, skipping newlines and no wrapping the line.
-    - A paragraph in multiple lines, but the long lines will no be wrapped.
+    - A paragraph in a single line, ignoring newlines and not wrapping the line.
+    - A paragraph in multiple lines, but the long lines will not be wrapped.
     - Last, a paragraph in multiple lines with wrapped lines.
 
-    You can edit the text in each window and you must press ESC to close the window
+    You can edit the text in each window, and you must press ESC to close the window
     and continue with the next window until finish the test.
 
     Press ESC to exit the test.
     """
 
     def testMultilineFalse(self):
-        self.window = TestWindow(
+        self.window = BaseTestWindow(
               multiline=False, wrap_lines=False,
               msg=nonewline_nowrap, resizable=True, visible=False)
         self.window.set_visible()
@@ -99,7 +99,7 @@ class MultilineWrapTestCase(InteractiveTestCase):
         self.user_verify('Pass test?', take_screenshot=False)
 
     def testMultilineTrueNoLimited(self):
-        self.window = TestWindow(
+        self.window = BaseTestWindow(
               multiline=True, wrap_lines=False,
               msg=newline_nowrap, resizable=True, visible=False)
         self.window.set_visible()
@@ -107,7 +107,7 @@ class MultilineWrapTestCase(InteractiveTestCase):
         self.user_verify('Pass test?', take_screenshot=False)
 
     def testMultilineTrueLimited(self):
-        self.window = TestWindow(
+        self.window = BaseTestWindow(
               multiline=True, wrap_lines=True,
               msg=newline_wrap, resizable=True, visible=False)
         self.window.set_visible()

{pyglet-2.0.8 → pyglet-2.0.10}/tests/interactive/text/test_plain.py

@@ -24,9 +24,9 @@ Duis arcu eros, iaculis ut, vehicula in, elementum a, sapien. Phasellus ut tellu
 """
 
 
-class TestWindow(window.Window):
+class BaseTestWindow(window.Window):
     def __init__(self, *args, **kwargs):
-        super(TestWindow, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
         self.batch = graphics.Batch()
         self.document = text.decode_text(doctext)
@@ -41,7 +41,7 @@ class TestWindow(window.Window):
         self.set_mouse_cursor(self.get_system_mouse_cursor('text'))
 
     def on_resize(self, width, height):
-        super(TestWindow, self).on_resize(width, height)
+        super().on_resize(width, height)
         self.layout.begin_update()
         self.layout.x = self.margin
         self.layout.y = self.margin
@@ -59,7 +59,7 @@ class TestWindow(window.Window):
         self.batch.draw()
 
     def on_key_press(self, symbol, modifiers):
-        super(TestWindow, self).on_key_press(symbol, modifiers)
+        super().on_key_press(symbol, modifiers)
         if symbol == key.TAB:
             self.caret.on_text('\t')
 
@@ -74,7 +74,7 @@ class PlainTextTestCase(InteractiveTestCase):
     Press ESC to exit the test.
     """
     def test_plain(self):
-        self.window = TestWindow(resizable=True, visible=False)
+        self.window = BaseTestWindow(resizable=True, visible=False)
         self.window.set_visible()
         app.run()
         self.user_verify('Pass test?', take_screenshot=False)

{pyglet-2.0.8 → pyglet-2.0.10}/tests/interactive/text/test_style.py

@@ -165,9 +165,9 @@ in culpa qui officia deserunt mollit anim id est laborum.{}
 """
 
 
-class TestWindow(window.Window):
+class BaseTestWindow(window.Window):
     def __init__(self, *args, **kwargs):
-        super(TestWindow, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
         self.batch = graphics.Batch()
         self.document = text.decode_attributed(doctext)
@@ -182,7 +182,7 @@ class TestWindow(window.Window):
         self.set_mouse_cursor(self.get_system_mouse_cursor('text'))
 
     def on_resize(self, width, height):
-        super(TestWindow, self).on_resize(width, height)
+        super().on_resize(width, height)
         self.layout.begin_update()
         self.layout.x = self.margin
         self.layout.y = self.margin
@@ -200,7 +200,7 @@ class TestWindow(window.Window):
         self.batch.draw()
 
     def on_key_press(self, symbol, modifiers):
-        super(TestWindow, self).on_key_press(symbol, modifiers)
+        super().on_key_press(symbol, modifiers)
         if symbol == key.TAB:
             self.caret.on_text('\t')
 
@@ -218,7 +218,7 @@ class TextStyleTestCase(InteractiveTestCase):
     Press ESC to exit the test.
     """
     def test(self):
-        self.window = TestWindow(resizable=True, visible=False)
+        self.window = BaseTestWindow(resizable=True, visible=False)
         self.window.set_visible()
         app.run()
         self.user_verify('Pass test?', take_screenshot=False)

{pyglet-2.0.8 → pyglet-2.0.10}/tests/unit/conftest.py

@@ -99,3 +99,8 @@ def new_rgba_color():
 @fixture(params=[NEW_RGB_COLOR, NEW_RGBA_COLOR])
 def new_rgb_or_rgba_color(request):
     return request.param
+
+
+@fixture(params=[180, -180])
+def new_nonzero_rotation(request) -> float:
+    return request.param

{pyglet-2.0.8 → pyglet-2.0.10}/tests/unit/shapes/test_shapes.py

@@ -23,8 +23,19 @@ from pyglet.shapes import *
     (Star, (1, 1, 20, 11, 5)),
     (Polygon, ((0, 0), (1, 1), (2, 2)))
 ])
-def shape_keywords_only(request):
-    class_, positional_args = request.param
+def shape_and_positionals(request):
+    return request.param
+
+
+# Enable type-specific behavior; just Line + rotation at the moment
+@pytest.fixture
+def shape_type(shape_and_positionals):
+    return shape_and_positionals[0]
+
+
+@pytest.fixture
+def shape_keywords_only(shape_and_positionals):
+    class_, positional_args = shape_and_positionals
     return partial(class_, *positional_args)
 
 
@@ -46,6 +57,17 @@ def test_init_sets_opacity_to_255_for_rgb_value_as_color_argument(shape_keywords
     assert shape_keywords_only(color=(0, 0, 0)).opacity == 255
 
 
+def test_init_sets_rotation_to_zero(rgb_or_rgba_shape, shape_type):
+    if shape_type is Line:
+        pytest.xfail("Rotation test not yet valid for line due to design ambiguity")
+    assert rgb_or_rgba_shape.rotation == 0
+
+
+def test_rotation_prop_sets_rotation(rgb_or_rgba_shape, new_nonzero_rotation):
+    rgb_or_rgba_shape.rotation = new_nonzero_rotation
+    assert rgb_or_rgba_shape.rotation == new_nonzero_rotation
+
+
 def test_setting_color_sets_color_rgb_channels(rgb_or_rgba_shape, new_rgb_or_rgba_color):
     rgb_or_rgba_shape.color = new_rgb_or_rgba_color
     assert rgb_or_rgba_shape.color[:3] == new_rgb_or_rgba_color[:3]