From 401794d41fbef1c291921475f8b3f765cedeb4be Mon Sep 17 00:00:00 2001
From: fheinrich <fheinrich@techfak.uni-bielefeld.de>
Date: Mon, 29 Jan 2024 15:03:01 +0100
Subject: [PATCH] Fixed border for all layouts
---
overcooked_simulator/gui_2d_vis/overcooked_gui.py | 6 +++---
overcooked_simulator/gui_2d_vis/visualization.yaml | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/overcooked_simulator/gui_2d_vis/overcooked_gui.py b/overcooked_simulator/gui_2d_vis/overcooked_gui.py
index 25f9ccde..3a6d9cea 100644
--- a/overcooked_simulator/gui_2d_vis/overcooked_gui.py
+++ b/overcooked_simulator/gui_2d_vis/overcooked_gui.py
@@ -367,7 +367,7 @@ class PyGameGUI:
config=self.visualization_config,
)
- border = self.visualization_config["GameWindow"]["black_border_size"]
+ border = self.visualization_config["GameWindow"]["game_border_size"]
border_rect = pygame.Rect(
self.window_width // 2 - (self.game_width // 2) - border,
self.window_height // 2 - (self.game_height // 2) - border,
@@ -376,9 +376,9 @@ class PyGameGUI:
)
pygame.draw.rect(
self.main_window,
- colors["black"],
+ colors[self.visualization_config["GameWindow"]["game_border_color"]],
border_rect,
- width=self.visualization_config["GameWindow"]["black_border_size"],
+ width=border,
)
self.update_score_label(state)
diff --git a/overcooked_simulator/gui_2d_vis/visualization.yaml b/overcooked_simulator/gui_2d_vis/visualization.yaml
index 25dca13f..21005007 100644
--- a/overcooked_simulator/gui_2d_vis/visualization.yaml
+++ b/overcooked_simulator/gui_2d_vis/visualization.yaml
@@ -12,7 +12,8 @@ GameWindow:
order_bar_height: 100
order_size: 50
- black_border_size: 1
+ game_border_size: 1
+ game_border_color: black
background_color: lemonchiffon1
Kitchen:
--
GitLab