Migrate Entity to FRect

Author: Natuworkguy

docs/scripting.md

@@ -78,7 +78,7 @@ The `engine.core.Entity` class has the following properties:
 | `width` | Width in pixels | `float` |
 | `height` | Height in pixels | `float` |
 | `color` | RGB color value | `tuple[int, int, int]` |
-| `rect` | Pygame rect object on screen | `pygame.Rect` |
+| `rect` | Pygame rect object on screen | `pygame.FRect` |
 | `scriptfile` | Path to the attached script | `str` |
 | `image` | Image attached to entity | `EntityImage` or `None` |
 | `id` | Unique entity UUID | `str` |

engine/core/__init__.py

@@ -74,7 +74,7 @@ def __init__(
             int(clamp(color[2], 0, 255)),
         )
 
-        self.rect: pygame.Rect = pygame.Rect(self.x, self.y, self.width, self.height)
+        self.rect: pygame.FRect = pygame.FRect(self.x, self.y, self.width, self.height)
         self.id: str = str(uuid.uuid4())
 
         self.parent: Optional["Scene"] = None

engine/core/animation.py

@@ -8,7 +8,7 @@
 import bisect
 import pygame
 
-from typing import Optional
+from typing import Optional, Union
 
 
 class EntityAnim:
@@ -48,7 +48,7 @@ def __init__(self, anim_path: str, loop: bool = True) -> None:
         self._started_at: int = 0
 
         self._scaled: Optional[pygame.Surface] = None
-        self._scaled_key: Optional[tuple[int, int, int]] = None
+        self._scaled_key: Optional[tuple[int, float, float]] = None
 
         self.set_image(anim_path)
 
@@ -139,19 +139,19 @@ def _current_index(self) -> int:
 
         return bisect.bisect_right(self._starts, elapsed) - 1
 
-    def draw(self, surface: pygame.Surface, rect: pygame.Rect) -> None:
+    def draw(self, surface: pygame.Surface, rect: Union[pygame.Rect, pygame.FRect]) -> None:
         """
         Draw the current frame of the animation scaled to ``rect`` onto ``surface``.
 
         Args:
             surface (pygame.Surface): surface to draw onto
-            rect (pygame.Rect): rect to scale image to
+            rect (pygame.Rect | pygame.FRect): rect to scale image to
         """
 
         assert self.frames, "EntityAnim.frames was not initialized"  # nosec B101
 
         index: int = self._current_index()
-        key: tuple[int, int, int] = (index, rect.width, rect.height)
+        key: tuple[int, float, float] = (index, rect.width, rect.height)
 
         if key != self._scaled_key or self._scaled is None:
             self._scaled = pygame.transform.scale(self.frames[index], (rect.width, rect.height))

engine/core/image.py

@@ -7,7 +7,7 @@
 
 import pygame
 
-from typing import Optional
+from typing import Optional, Union
 
 
 class EntityImage:
@@ -44,13 +44,13 @@ def set_image(self, image_path: str) -> None:
 
         self.surface = pygame.image.load(image_path).convert_alpha()
 
-    def draw(self, surface: pygame.Surface, rect: pygame.Rect) -> None:
+    def draw(self, surface: pygame.Surface, rect: Union[pygame.Rect, pygame.FRect]) -> None:
         """
         Draw the image scaled to ``rect`` onto ``surface``.
 
         Args:
             surface (pygame.Surface): surface to draw onto
-            rect (pygame.Rect): rect to scale image to
+            rect (pygame.Rect | pygame.FRect): rect to scale image to
         """
 
         assert self.surface is not None, "EntityImage.surface was not initialized"  # nosec B101

engine/core/text.py

@@ -75,7 +75,7 @@ def _update_text_surface(self) -> None:
         """
 
         self.text_surface = self.font.render(self.text, self.antialias, self.color, self.bgcolor)
-        self.text_rect = self.text_surface.get_rect(x=self.x, y=self.y)
+        self.text_rect = self.text_surface.get_frect(x=self.x, y=self.y)
 
     def center(self, pos: tuple[float, float]) -> None:
         """