ADD: abstract rendering functionality to different class

models/game.py

@@ -2,10 +2,7 @@ import pygame
 from models.match import Match
 from models.player import Player
 from models.team import Team
-from controllers.map_coord_controller import MapCoordController
-from controllers.image_coord_controller import ImageCoordController
-from utils.json_object import JSONObject
-from utils.utils import mapped_value
+from models.renderer import Renderer
 
 WIDTH, HEIGHT = 700, 700
 FPS = 60
@@ -23,24 +20,8 @@ class Game:
         self.running = True
 
         self.match = match
-
-        try:
-            self.json_object = JSONObject(f"maps/{match.map_name}.json")
-        except FileNotFoundError:
-            raise NotImplementedError(f"Map {match.map_name} not implemented.")
+        self.renderer = Renderer(self.match, self.screen)
         
-        self.image_path = self.json_object.get("image_path")
-        self.image_width = self.json_object.get("image_width")
-        self.image_height = self.json_object.get("image_height")
-        self.ingame_zero_x = self.json_object.get("middle_x")
-        self.ingame_zero_y = self.json_object.get("middle_y")
-        self.rotation_degrees = self.json_object.get("rotation")
-        self.scaler = self.json_object.get("scale")
-    
-        self.map_coord_controller = MapCoordController(WIDTH, HEIGHT, -3000, 3000, -3000, 3000)
-        self.image_coord_controller = ImageCoordController(self.image_width, self.image_height, WIDTH, HEIGHT, self.ingame_zero_x, self.ingame_zero_y)
-        self.image_coord_controller.scale(self.scaler)
-        self.image_coord_controller.rotate(self.rotation_degrees)
 
     def handle_events(self):
         """Handles user inputs."""
@@ -54,35 +35,7 @@ class Game:
 
     def draw(self):
         """Draws everything on screen."""
-        self.screen.fill((30, 30, 30))  # Clear screen
-        
-        # Draw map from image
-        map_image = pygame.image.load(self.image_path)
-
-        # Scale and rotate map image
-        map_image = pygame.transform.scale(map_image, (self.image_width*self.scaler, self.image_height*self.scaler))
-        map_image = pygame.transform.rotate(map_image, self.rotation_degrees)
-
-        # Draw map image
-        self.screen.blit(map_image, self.image_coord_controller.top_left_screen())
-
-        # 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))
-
-        for player in self.match.get_players():
-            if player.dead:
-                continue
-            mapped_x, mapped_y = self.map_coord_controller.map_to_screen(player.x, player.y)
-            pygame.draw.circle(self.screen, (255, 255, 255), (mapped_x, mapped_y), 5)
-
-            # Draw player name
-            text = self.small_font.render(player.name, True, (255, 255, 255))
-            self.screen.blit(text, (mapped_x + 10, mapped_y))
+        self.renderer.render()
 
         pygame.display.flip()  # Update display