From 45e81b7182fcf9010ff44ee56ddc6fa4a16865dd Mon Sep 17 00:00:00 2001 From: ThisBirchWood Date: Sat, 19 Apr 2025 19:26:58 +0200 Subject: [PATCH] ADD rudementary main menu, needs refinement --- __init__.py | 0 controllers/start_menu_controller.py | 4 ++ main.py | 59 +++++++++++------- requirements.txt | 4 ++ states/game.py | 29 +++++++++ states/game_state.py | 13 ++++ states/start_menu.py | 93 ++++++++++++++++++++++++++++ widgets/button.py | 26 +++++--- 8 files changed, 195 insertions(+), 33 deletions(-) create mode 100644 __init__.py create mode 100644 controllers/start_menu_controller.py create mode 100644 states/game.py create mode 100644 states/game_state.py create mode 100644 states/start_menu.py diff --git a/__init__.py b/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/controllers/start_menu_controller.py b/controllers/start_menu_controller.py new file mode 100644 index 0000000..b73d992 --- /dev/null +++ b/controllers/start_menu_controller.py @@ -0,0 +1,4 @@ +class StartMenuController: + def __init__(self, start_menu_view, game_controller): + self.start_menu_view = start_menu_view + self.game_controller = game_controller \ No newline at end of file diff --git a/main.py b/main.py index db6177c..2dc4842 100644 --- a/main.py +++ b/main.py @@ -1,31 +1,44 @@ -from models.game import Game -from models.match import Match -from models.player import Player -from models.team import Team +import pygame +from states.game import Game +from states.start_menu import StartMenu + def main(): - import demoparser2 + pygame.init() + screen = pygame.display.set_mode((720, 720)) + clock = pygame.time.Clock() - demo_parser = demoparser2.DemoParser("the-mongolz-vs-natus-vincere-m1-dust2.dem") - game_info = demo_parser.parse_ticks(["X", "Y", "Z", "pitch", "yaw", "is_alive", "team", "player_steamid", - "team_rounds_total", "team_num", "total_rounds_played", "shots_fired", - "health"]) - header_info = demo_parser.parse_header() - map_name = header_info['map_name'] - players = demo_parser.parse_player_info() + states = {} + current_state = None - team_1 = Team() - team_1.set_ct() - team_2 = Team() - m = Match(map_name, game_info, team_1, team_2) - for index, row in players.iterrows(): - if row["team_number"] == 2: - team_1.add_player(Player(row["name"], row["steamid"])) - elif row["team_number"] == 3: - team_2.add_player(Player(row["name"], row["steamid"])) + def switch_state(state_name, data=None): + nonlocal current_state + if state_name == "game": + match = data.get("match") + current_state = Game(switch_state, screen, match) + states[state_name] = current_state - game = Game(m) - game.run() + current_state = states[state_name] + + # Initialize states + states["start_menu"] = StartMenu(switch_state, screen) + switch_state("start_menu") + + running = True + while running: + events = pygame.event.get() + for event in events: + if event.type == pygame.QUIT: + running = False + + current_state.handle_events(events) + current_state.update() + current_state.draw() + + pygame.display.flip() + clock.tick(60) + + pygame.quit() if __name__ == "__main__": main() \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index a268d88..55b7586 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,3 +9,7 @@ pytz==2025.1 six==1.17.0 tqdm==4.67.1 tzdata==2025.1 +pygame_gui==0.6.13 +pygame-ce==2.5.3 +pygame-pgu==0.21 +python-i18n==0.3.9 \ No newline at end of file diff --git a/states/game.py b/states/game.py new file mode 100644 index 0000000..0add090 --- /dev/null +++ b/states/game.py @@ -0,0 +1,29 @@ +from states.game_state import GameState +from render.renderer import Renderer +from controllers.player_controller import PlayerController +import pygame + +class Game(GameState): + def __init__(self, switch_state_callback, screen, match): + super().__init__(switch_state_callback, screen) + self.match = match + + self.renderer = Renderer(self.match, screen) + self.player_controller = PlayerController(self.renderer.player_render, self.match) + + def handle_events(self, events): + """Handles user inputs.""" + for event in events: + if event.type == pygame.KEYDOWN and event.key == pygame.K_ESCAPE: + self.switch_state("menu") + self.renderer.slider.handle_event(event) + self.player_controller.update(event) + + def update(self): + """Updates game objects.""" + self.match.next_tick() + + def draw(self): + """Draws everything on screen.""" + self.renderer.render() + pygame.display.flip() \ No newline at end of file diff --git a/states/game_state.py b/states/game_state.py new file mode 100644 index 0000000..3822fb4 --- /dev/null +++ b/states/game_state.py @@ -0,0 +1,13 @@ +class GameState: + def __init__(self, switch_state_callback, screen): + self.switch_state = switch_state_callback + self.screen = screen + + def handle_events(self, events): + pass + + def update(self): + pass + + def draw(self): + pass \ No newline at end of file diff --git a/states/start_menu.py b/states/start_menu.py new file mode 100644 index 0000000..3a5751e --- /dev/null +++ b/states/start_menu.py @@ -0,0 +1,93 @@ +from states.game_state import GameState +from widgets.button import Button +from models.match import Match +from models.player import Player +from models.team import Team +from pgu import gui +import demoparser2 +import pygame +import pygame_gui + +class StartMenu(GameState): + def __init__(self, switch_state_callback, screen): + super().__init__(switch_state_callback, screen) + self.screen = screen + self.manager = pygame_gui.UIManager((screen.get_width(), screen.get_height())) + + self.default_button_start_x = self.screen.get_width() * 0.1 + self.default_button_width = screen.get_width() * 0.8 + + # buttons + self.button = Button(self.default_button_start_x, + 100, + self.default_button_width, + 50, + self._get_demo) + self.button.set_text("Upload Demo") + self.button.set_font_size(40) + + # file dialog + self.file_dialog = None + self.demo_file = None + + + def _get_demo(self): + """Loads a demo file.""" + # pygame-pgu + self.file_dialog = pygame_gui.windows.UIFileDialog( + rect=pygame.Rect(160, 50, 440, 500), + manager=self.manager, + window_title='Pick a .dem file' + ) + + def _start_game_callback(self): + """Starts the game.""" + match = self._setup_game(self.demo_file) + self.switch_state("game", {"match": match}) + + def _setup_game(self, demo_file: str) -> Match: + demo_parser = demoparser2.DemoParser(demo_file) + game_info = demo_parser.parse_ticks(["X", "Y", "Z", "pitch", "yaw", "is_alive", "team", "player_steamid", + "team_rounds_total", "team_num", "total_rounds_played", "shots_fired", + "health"]) + header_info = demo_parser.parse_header() + map_name = header_info['map_name'] + players = demo_parser.parse_player_info() + + team_1 = Team() + team_1.set_ct() + team_2 = Team() + m = Match(map_name, game_info, team_1, team_2) + for index, row in players.iterrows(): + if row["team_number"] == 2: + team_1.add_player(Player(row["name"], row["steamid"])) + elif row["team_number"] == 3: + team_2.add_player(Player(row["name"], row["steamid"])) + + return m + + + def handle_events(self, events): + """Handles user inputs.""" + for event in events: + if event.type == pygame.QUIT: + pygame.quit() + self.button.handle_event(event) + self.manager.process_events(event) + # Handle file dialog interaction + if event.type == pygame_gui.UI_FILE_DIALOG_PATH_PICKED: + self.file_dialog.kill() + self.demo_file = event.text + self._start_game_callback() + + def update(self): + self.manager.update(0.1) + + def draw(self): + """Draws everything on screen.""" + self.button.draw(self.screen) + self.manager.draw_ui(self.screen) + + + + \ No newline at end of file diff --git a/widgets/button.py b/widgets/button.py index a51b530..1943369 100644 --- a/widgets/button.py +++ b/widgets/button.py @@ -1,8 +1,7 @@ import pygame class Button: - def __init__(self, screen, x, y, width, height, action): - self.screen = screen + def __init__(self, x, y, width, height, action): self.x = x self.y = y self.width = width @@ -15,7 +14,9 @@ class Button: ## Default values self.font_size = 20 self.colour = (255, 255, 255) + self.pressed_colour = (200, 200, 200) self.pressed = False + self.border_radius = 3 ## Getters and setters def get_font_size(self) -> int: @@ -24,12 +25,18 @@ class Button: def get_text(self) -> str: return self.text + def get_border_radius(self) -> int: + return self.border_radius + def set_font_size(self, font_size: int) -> None: self.font_size = font_size def set_text(self, text: str) -> None: self.text = text + def set_border_radius(self, border_radius: int) -> None: + self.border_radius = border_radius + def set_image(self, image_path: str) -> None: self._load_image(image_path) @@ -41,11 +48,11 @@ class Button: self.image = pygame.image.load(image_path) self.image = pygame.transform.scale(self.image, (self.width, self.height)) - def _draw_text(self, text: str, font_size: int) -> None: + def _draw_text(self, screen, text: str, font_size: int) -> None: font = pygame.font.Font(None, font_size) text_surface = font.render(text, True, (0, 0, 0)) text_rect = text_surface.get_rect(center=(self.x + self.width // 2, self.y + self.height // 2)) - self.screen.blit(text_surface, text_rect) + screen.blit(text_surface, text_rect) def _button_press_down(self) -> None: self.pressed = True @@ -54,7 +61,6 @@ class Button: def _button_press_up(self) -> None: self.pressed = False - pass ## Public methods def handle_event(self, event: pygame.event.Event) -> None: @@ -65,17 +71,17 @@ class Button: if self.pressed and event.type == pygame.MOUSEBUTTONUP: self._button_press_up() - def draw(self) -> None: + def draw(self, screen) -> None: if self.pressed: - pygame.draw.rect(self.screen, (200, 200, 200), (self.x, self.y, self.width, self.height)) + pygame.draw.rect(screen, self.pressed_colour, (self.x, self.y, self.width, self.height), border_radius=self.border_radius) else: - pygame.draw.rect(self.screen, self.colour, (self.x, self.y, self.width, self.height)) + pygame.draw.rect(screen, self.colour, (self.x, self.y, self.width, self.height), border_radius=self.border_radius) if self.image: - self.screen.blit(self.image, (self.x, self.y)) + screen.blit(self.image, (self.x, self.y)) if self.text: - self._draw_text(self.text, self.font_size) + self._draw_text(screen, self.text, self.font_size) if __name__ == "__main__": pygame.init()