arcade 3.0.0.dev36__tar.gz → 3.0.0.dev37__tar.gz

{arcade-3.0.0.dev36 → arcade-3.0.0.dev37}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arcade
-Version: 3.0.0.dev36
+Version: 3.0.0.dev37
 Summary: Arcade Game Development Library
 Author-email: Paul Vincent Craven <paul@cravenfamily.com>
 License: License
@@ -36,9 +36,9 @@ Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
-Requires-Dist: pyglet==2.1.dev5
-Requires-Dist: pillow~=10.2.0
-Requires-Dist: pymunk~=6.6.0
+Requires-Dist: pyglet==2.1.dev6
+Requires-Dist: pillow~=10.4.0
+Requires-Dist: pymunk~=6.8.1
 Requires-Dist: pytiled-parser~=2.2.5
 Provides-Extra: dev
 Requires-Dist: sphinx==7.3.7; extra == "dev"

arcade-3.0.0.dev37/arcade/VERSION

@@ -0,0 +1 @@
+3.0.0-dev.37

{arcade-3.0.0.dev36 → arcade-3.0.0.dev37}/arcade/application.py

@@ -150,7 +150,7 @@ class Window(pyglet.window.Window):
         update_rate: float = 1 / 60,
         antialiasing: bool = True,
         gl_version: tuple[int, int] = (3, 3),
-        screen: pyglet.display.Screen | None = None,
+        screen: Screen | None = None,
         style: str | None = pyglet.window.Window.WINDOW_STYLE_DEFAULT,
         visible: bool = True,
         vsync: bool = False,

{arcade-3.0.0.dev36 → arcade-3.0.0.dev37}/arcade/context.py

@@ -22,6 +22,7 @@ from arcade.gl.compute_shader import ComputeShader
 from arcade.gl.framebuffer import Framebuffer
 from arcade.gl.program import Program
 from arcade.gl.texture import Texture2D
+from arcade.gl.types import PyGLenum
 from arcade.gl.vertex_array import Geometry
 from arcade.texture_atlas import DefaultTextureAtlas, TextureAtlasBase
 
@@ -451,8 +452,12 @@ class ArcadeContext(Context):
         path: str | Path,
         *,
         flip: bool = True,
+        wrap_x: PyGLenum | None = None,
+        wrap_y: PyGLenum | None = None,
+        filter: tuple[PyGLenum, PyGLenum] | None = None,
         build_mipmaps: bool = False,
         internal_format: int | None = None,
+        immutable: bool = False,
         compressed: bool = False,
     ) -> Texture2D:
         """
@@ -479,6 +484,12 @@ class ArcadeContext(Context):
                 Path to texture
             flip:
                 Flips the image upside down. Default is ``True``.
+            wrap_x:
+                The wrap mode for the x-axis. Default is ``None``.
+            wrap_y:
+                The wrap mode for the y-axis. Default is ``None``.
+            filter:
+                The min and mag filter. Default is ``None``.
             build_mipmaps:
                 Build mipmaps for the texture. Default is ``False``.
             internal_format (optional):
@@ -492,7 +503,7 @@ class ArcadeContext(Context):
 
         path = resolve(path)
 
-        image = Image.open(str(path))
+        image: Image.Image = Image.open(str(path))  # type: ignore
 
         if flip:
             image = image.transpose(Image.Transpose.FLIP_TOP_BOTTOM)
@@ -501,7 +512,11 @@ class ArcadeContext(Context):
             image.size,
             components=4,
             data=image.convert("RGBA").tobytes(),
+            wrap_x=wrap_x,
+            wrap_y=wrap_y,
+            filter=filter,
             internal_format=internal_format,
+            immutable=immutable,
             compressed=compressed,
         )
         image.close()

{arcade-3.0.0.dev36 → arcade-3.0.0.dev37}/arcade/draw/rect.py

@@ -56,19 +56,21 @@ def draw_texture_rect(
         ctx.disable(ctx.BLEND)
 
     atlas = atlas or ctx.default_atlas
+    program = ctx.sprite_program_single
 
     texture_id, _ = atlas.add(texture)
     if pixelated:
         atlas.texture.filter = gl.NEAREST, gl.NEAREST
+        program.set_uniform_safe("uv_offset_bias", 0.0)
     else:
         atlas.texture.filter = gl.LINEAR, gl.LINEAR
+        program.set_uniform_safe("uv_offset_bias", 1.0)
 
     atlas.texture.use(unit=0)
     atlas.use_uv_texture(unit=1)
 
     geometry = ctx.geometry_empty
-    program = ctx.sprite_program_single
-    program["pos"] = rect.center_x, rect.center_y, 0
+    program["pos"] = rect.x, rect.y, 0
     program["color"] = color.normalized
     program["size"] = rect.width, rect.height
     program["angle"] = angle
@@ -297,27 +299,71 @@ def draw_rect_outline(
     """
 
     HALF_BORDER = border_width / 2
+    # Extremely unrolled code below
 
     # fmt: off
-    i_lb = rect.bottom_left.x  + HALF_BORDER, rect.bottom_left.y  + HALF_BORDER
-    i_rb = rect.bottom_right.x - HALF_BORDER, rect.bottom_right.y + HALF_BORDER
-    i_rt = rect.top_right.x    - HALF_BORDER, rect.top_right.y    - HALF_BORDER
-    i_lt = rect.top_left.x     + HALF_BORDER, rect.top_left.y     - HALF_BORDER
-    o_lb = rect.bottom_left.x  - HALF_BORDER, rect.bottom_left.y  - HALF_BORDER
-    o_rb = rect.bottom_right.x + HALF_BORDER, rect.bottom_right.y - HALF_BORDER
-    o_rt = rect.top_right.x    + HALF_BORDER, rect.top_right.y    + HALF_BORDER
-    o_lt = rect.top_left.x     - HALF_BORDER, rect.top_right.y    + HALF_BORDER
+    left   = rect.left
+    right  = rect.right
+    bottom = rect.bottom
+    top    = rect.top
+    x      = rect.x
+    y      = rect.y
+
+    # o = outer, i = inner
+    #
+    # o_left, o_top                  o_right, o_top
+    #  +----------------------------------------+
+    #  | i_left, i_top          i_right, i_top  |
+    #  |  +----------------------------------+  |
+    #  |  |                                  |  |
+    #  |  |                                  |  |
+    #  |  |                                  |  |
+    #  |  +----------------------------------+  |
+    #  | i_left, i_bottom    i_right , i_bottom |
+    #  +----------------------------------------+
+    # o_left, o_bottom               o_right, o_bottom
+
+    i_left   = left   + HALF_BORDER
+    i_bottom = bottom + HALF_BORDER
+    i_right  = right  - HALF_BORDER
+    i_top    = top    - HALF_BORDER
+
+    o_left   = left   - HALF_BORDER
+    o_bottom = bottom - HALF_BORDER
+    o_right  = right  + HALF_BORDER
+    o_top    = top    + HALF_BORDER
+
+    # Declared separately because the code below seems to break mypy
+    point_list: Point2List
+
+    # This is intentionally unrolled to minimize repacking tuples
+    if tilt_angle == 0:
+        point_list = (
+            (o_left  , o_top   ),
+            (i_left  , i_top   ),
+            (o_right , o_top   ),
+            (i_right , i_top   ),
+            (o_right , o_bottom),
+            (i_right , i_bottom),
+            (o_left  , o_bottom),
+            (i_left  , i_bottom),
+            (o_left  , o_top   ),
+            (i_left  , i_top   )
+        )
+    else:
+        point_list = (
+            rotate_point(o_left   , o_top   , x, y, tilt_angle),
+            rotate_point(i_left   , i_top   , x, y, tilt_angle),
+            rotate_point(o_right  , o_top   , x, y, tilt_angle),
+            rotate_point(i_right  , i_top   , x, y, tilt_angle),
+            rotate_point(o_right  , o_bottom, x, y, tilt_angle),
+            rotate_point(i_right  , i_bottom, x, y, tilt_angle),
+            rotate_point(o_left   , o_bottom, x, y, tilt_angle),
+            rotate_point(i_left   , i_bottom, x, y, tilt_angle),
+            rotate_point(o_left   , o_top   , x, y, tilt_angle),
+            rotate_point(i_left   , i_top   , x, y, tilt_angle)
+        )
     # fmt: on
-
-    point_list: Point2List = (o_lt, i_lt, o_rt, i_rt, o_rb, i_rb, o_lb, i_lb, o_lt, i_lt)
-
-    if tilt_angle != 0:
-        point_list_2 = []
-        for point in point_list:
-            new_point = rotate_point(point[0], point[1], rect.x, rect.y, tilt_angle)
-            point_list_2.append(new_point)
-        point_list = point_list_2
-
     _generic_draw_line_strip(point_list, color, gl.TRIANGLE_STRIP)
 
 

{arcade-3.0.0.dev36 → arcade-3.0.0.dev37}/arcade/examples/gl/bindless_texture.py

@@ -151,9 +151,12 @@ class BindlessTexture(arcade.Window):
 
         # Load enough textures to cover for each point/sprite
         for i in range(16 * 9):
-            texture = self.ctx.load_texture(next(resource_cycle))
-            texture.wrap_x = self.ctx.CLAMP_TO_EDGE
-            texture.wrap_y = self.ctx.CLAMP_TO_EDGE
+            texture = self.ctx.load_texture(
+                next(resource_cycle),
+                immutable=True,
+                wrap_x=self.ctx.CLAMP_TO_EDGE,
+                wrap_y=self.ctx.CLAMP_TO_EDGE,
+            )
             # Make sure we keep a reference to the texture to avoid GC
             self.textures.append(texture)
             # Create a texture handle and make it resident.

{arcade-3.0.0.dev36 → arcade-3.0.0.dev37}/arcade/examples/gui/0_basic_setup.py

@@ -14,6 +14,7 @@ from arcade.gui import (
     UIManager,
     UITextureButton,
     UIAnchorLayout,
+    UIView,
 )
 
 # Preload textures, because they are mostly used multiple times, so they are not
@@ -70,7 +71,7 @@ class GreenView(arcade.View):
         # ...
 
 
-class BlueView(arcade.gui.UIView):
+class BlueView(UIView):
     """Uses the arcade.gui.UIView which takes care about the UIManager setup."""
 
     def __init__(self):

{arcade-3.0.0.dev36 → arcade-3.0.0.dev37}/arcade/examples/gui/1_layouts.py

@@ -14,7 +14,7 @@ Content:
 from datetime import datetime
 
 import arcade
-from arcade.gui import UIAnchorLayout
+from arcade.gui import UIAnchorLayout, UIImage, UITextArea
 
 arcade.resources.load_system_fonts()
 
@@ -59,6 +59,36 @@ Some widgets calculate their minimum size based on their content like UILabel
 and layouts in general.
 """
 
+TEX_SCROLL_DOWN = arcade.load_texture(":resources:gui_basic_assets/scroll/indicator_down.png")
+TEX_SCROLL_UP = arcade.load_texture(":resources:gui_basic_assets/scroll/indicator_up.png")
+
+
+class ScrollableTextArea(UITextArea, UIAnchorLayout):
+    """This widget is a text area that can be scrolled, like a UITextLayout, but shows indicator,
+    that the text can be scrolled."""
+
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+
+        indicator_size = 22
+        self._down_indicator = UIImage(
+            texture=TEX_SCROLL_DOWN, size_hint=None, width=indicator_size, height=indicator_size
+        )
+        self._down_indicator.visible = False
+        self.add(self._down_indicator, anchor_x="right", anchor_y="bottom", align_x=-3)
+
+        self._up_indicator = UIImage(
+            texture=TEX_SCROLL_UP, size_hint=None, width=indicator_size, height=indicator_size
+        )
+        self._up_indicator.visible = False
+        self.add(self._up_indicator, anchor_x="right", anchor_y="top", align_x=-3)
+
+    def on_update(self, dt):
+        self._up_indicator.visible = self.layout.view_y < 0
+        self._down_indicator.visible = (
+            abs(self.layout.view_y) < self.layout.content_height - self.layout.height
+        )
+
 
 class LayoutView(arcade.gui.UIView):
     """This view demonstrates the use of layouts."""
@@ -71,7 +101,7 @@ class LayoutView(arcade.gui.UIView):
         self.anchor = self.add_widget(UIAnchorLayout())
 
         # Add describing text in center
-        text_area = arcade.gui.UITextArea(
+        text_area = ScrollableTextArea(
             text=DESCRIPTION,
             text_color=arcade.uicolor.WHITE_CLOUDS,
             font_name=("Lato", "proxima-nova", "Helvetica Neue", "Arial", "sans-serif"),
@@ -79,8 +109,8 @@ class LayoutView(arcade.gui.UIView):
             size_hint=(0.5, 0.8),
         )
         self.anchor.add(text_area, anchor_x="center_x", anchor_y="center_y")
-        text_area.with_border(color=arcade.uicolor.GRAY_CONCRETE)
-        text_area.with_background(color=arcade.uicolor.GRAY_CONCRETE.replace(a=125))
+        text_area.with_border(color=arcade.uicolor.DARK_BLUE_MIDNIGHT_BLUE)
+        text_area.with_background(color=arcade.uicolor.DARK_BLUE_MIDNIGHT_BLUE.replace(a=125))
         text_area.with_padding(left=5)
 
         # add a grid layout with the window and grid size and grid position
@@ -89,8 +119,8 @@ class LayoutView(arcade.gui.UIView):
             row_count=2,
             align_horizontal="left",
         )
-        self.grid.with_background(color=arcade.uicolor.GRAY_CONCRETE)
-        self.grid.with_border(color=arcade.uicolor.GRAY_ASBESTOS)
+        self.grid.with_background(color=arcade.uicolor.GRAY_ASBESTOS)
+        self.grid.with_border(color=arcade.uicolor.GRAY_CONCRETE)
         self.grid.with_padding(all=10)
         self.anchor.add(self.grid, anchor_x="left", anchor_y="top", align_x=10, align_y=-10)
         self.grid.add(