ADD global context for each game state

This commit is contained in:
2025-04-19 19:51:05 +02:00
parent f96b0d579f
commit 4148e59db1
4 changed files with 38 additions and 17 deletions

View File

@@ -4,11 +4,10 @@ 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
def __init__(self, switch_state_callback, context):
super().__init__(switch_state_callback, context)
self.renderer = Renderer(self.match, screen)
self.renderer = Renderer(self.match, self.screen)
self.player_controller = PlayerController(self.renderer.player_render, self.match)
def handle_events(self, events):

View File

@@ -1,7 +1,16 @@
import pygame
class GameState:
def __init__(self, switch_state_callback, screen):
def __init__(self, switch_state_callback, context: dict):
self.switch_state = switch_state_callback
self.screen = screen
self.context = context
self.screen = self.context.get("screen")
self.match = self.context.get("match", None)
self.font = self.context.get("font", pygame.font.Font(None, 36))
self.small_font = self.context.get("small_font", pygame.font.Font(None, 15))
self.options = self.context.get("options", {
"show_yaw": True
})
def handle_events(self, events):
pass

View File

@@ -9,13 +9,12 @@ 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()))
def __init__(self, switch_state_callback, context):
super().__init__(switch_state_callback, context)
self.manager = pygame_gui.UIManager((self.screen.get_width(), self.screen.get_height()))
self.default_button_start_x = self.screen.get_width() * 0.1
self.default_button_width = screen.get_width() * 0.8
self.default_button_width = self.screen.get_width() * 0.8
# buttons
self.button = Button(self.default_button_start_x,
@@ -43,7 +42,8 @@ class StartMenu(GameState):
def _start_game_callback(self):
"""Starts the game."""
match = self._setup_game(self.demo_file)
self.switch_state("game", {"match": match})
self.context["match"] = match
self.switch_state("game")
def _setup_game(self, demo_file: str) -> Match:
demo_parser = demoparser2.DemoParser(demo_file)