REFACTOR: moved render components into seperate module

ADD: Health bar

render/player_render.py

@@ -0,0 +1,49 @@
+import pygame, math
+from models.match import Match
+from utils.utils import mapped_value
+
+class PlayerRender:
+    def __init__(self, screen, match: Match, map_coord_controller, player_font):
+        self.screen = screen
+        self.match = match
+        self.map_coord_controller = map_coord_controller
+        self.player_font = player_font
+
+        self.player_radius = 5
+
+        self.health_bar_foreground = (0, 255, 0)
+        self.health_bar_background = (255, 0, 0)
+
+    def _render_circle(self, player, team):
+        x, y = self.map_coord_controller.map_to_screen(player.x, player.y)
+        pygame.draw.circle(self.screen, team.colour, (x, y), self.player_radius)
+
+    def _render_text(self, player):
+        x, y = self.map_coord_controller.map_to_screen(player.x, player.y)
+        text = self.player_font.render(player.name, True, (255, 255, 255))
+        self.screen.blit(text, (x-(text.get_width()/2), y+5))
+
+    def _render_yaw(self, player, team):
+        if player.is_shooting:
+            mapped_x, mapped_y = self.map_coord_controller.map_to_screen(player.x, player.y)
+            player_yaw = math.radians(player.yaw)
+            end_x = mapped_x + (100 * math.cos(player_yaw))
+            end_y = mapped_y - (100 * math.sin(player_yaw))
+            pygame.draw.line(self.screen, team.colour, (mapped_x, mapped_y), (end_x, end_y), 2)
+
+    def _render_health(self, player):
+        x, y = self.map_coord_controller.map_to_screen(player.x, player.y)
+        pygame.draw.rect(self.screen, self.health_bar_background, (x-10, y-10, 20, 5))
+        pygame.draw.rect(self.screen, self.health_bar_foreground, (x-10, y-10, mapped_value(player.health, 0, 100, 0, 20), 5))
+     
+
+    def render(self):
+        for team in self.match.get_teams():
+            for player in team.players:
+                if player.dead:
+                    continue
+
+                self._render_circle(player, team)
+                self._render_text(player)
+                self._render_yaw(player, team)
+                self._render_health(player)

render/renderer.py

@@ -0,0 +1,77 @@
+import pygame
+from widgets.slider import HorizontalSlider
+from models.match import Match
+from controllers.map_coord_controller import MapCoordController
+from render.player_render import PlayerRender
+from utils.json_object import JSONObject
+
+class Renderer:
+    def __init__(self, match: Match, screen):
+        self.screen = screen
+        self.match = match
+        self.font = pygame.font.Font(None, 36)
+        self.small_font = pygame.font.Font(None, 15)
+
+        # Load map data from json file
+        try:
+            self.json_object = JSONObject(f"maps/{match.map_name}.json")
+        except FileNotFoundError:
+            raise NotImplementedError(f"Map {match.map_name} not implemented.")
+        
+        # Load map data from json object
+        self.top_left_x = self.json_object.get("pos_x")
+        self.top_left_y = self.json_object.get("pos_y")
+        self.scale = self.json_object.get("scale")
+        self.rotation = self.json_object.get("rotate")
+        self.image_path = self.json_object.get("material")
+
+        # Load map image
+        self.map_image = pygame.image.load(self.image_path)
+        self.image_width = self.map_image.get_width()
+        self.image_height = self.map_image.get_height()
+
+        # Calculate bottom right coordinates for map coord controller
+        self.bottom_right_x = self.top_left_x + (self.image_width * self.scale)
+        self.bottom_right_y = self.top_left_y - (self.image_height * self.scale)
+        
+    
+        self.map_coord_controller = MapCoordController(self.screen.get_width(), self.screen.get_height(), 
+                                                       self.top_left_x, self.bottom_right_x, self.top_left_y, self.bottom_right_y)
+        
+        self.slider = HorizontalSlider(self.screen, 50, 650, self.screen.get_width()-100, 20, 1, self.match.max_tick)
+
+        self.player_render = PlayerRender(self.screen, self.match, self.map_coord_controller, self.small_font)
+
+    def render_text(self):
+        # Draw current tick
+        text = self.font.render(f"Tick: {self.match.tick}/{self.match.max_tick}", True, (255, 255, 255))
+        self.screen.blit(text, (10, 10))
+
+        # Draw team scores
+        text = self.font.render(f"Score: {self.match.team_1.score} - {self.match.team_2.score}", True, (255, 255, 255))
+        self.screen.blit(text, (10, 40))
+
+    def render_map(self):
+        # Scale and rotate map image
+        self.map_image = pygame.transform.scale(self.map_image, (self.screen.get_width(), self.screen.get_height()))
+
+        # Draw map image
+        self.screen.blit(self.map_image, (0, 0))
+
+    def render_slider(self):
+        # Update slider value
+        if self.slider.dragging:
+            # Set match tick if slider is being dragged
+            self.match.set_tick(int(self.slider.value))
+        else:
+            # Set slider value if slider is not being dragged
+            self.slider.set_value(self.match.tick)
+        self.slider.draw()
+
+    def render(self):
+        self.screen.fill((30, 30, 30))  # Clear screen
+        self.map_coord_controller.update_screen_size(self.screen.get_width(), self.screen.get_height())
+        self.render_slider()
+        self.render_map()
+        self.render_text()
+        self.player_render.render()