From f5c20ac2d5fa425ad23fa5b1ee9d4d52d8af5252 Mon Sep 17 00:00:00 2001
From: fheinrich <fheinrich@techfak.uni-bielefeld.de>
Date: Thu, 4 Jan 2024 14:38:15 +0100
Subject: [PATCH] Fixed missing int conversion
---
overcooked_simulator/gui_2d_vis/overcooked_gui.py | 8 +++-----
overcooked_simulator/gui_2d_vis/visualization.yaml | 4 ++--
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/overcooked_simulator/gui_2d_vis/overcooked_gui.py b/overcooked_simulator/gui_2d_vis/overcooked_gui.py
index 1cae4e0d..95ac1956 100644
--- a/overcooked_simulator/gui_2d_vis/overcooked_gui.py
+++ b/overcooked_simulator/gui_2d_vis/overcooked_gui.py
@@ -118,10 +118,7 @@ class PyGameGUI:
self.window_height = self.visualization_config["GameWindow"]["start_height"]
self.main_window = pygame.display.set_mode(
- (
- self.window_width,
- self.window_height,
- )
+ (self.window_width, self.window_height)
)
self.game_width, self.game_height = 0, 0
@@ -141,6 +138,7 @@ class PyGameGUI:
)
game_height = int(game_width * kitchen_aspect_ratio)
grid_size = int(game_width / self.simulator.env.kitchen_width)
+
elif self.visualization_config["GameWindow"]["WhatIsFixed"] == "grid":
grid_size = self.visualization_config["GameWindow"]["size"]
game_width, game_height = (
@@ -156,7 +154,7 @@ class PyGameGUI:
game_height + (2 * self.screen_margin),
)
- return window_width, window_height, game_width, game_height, grid_size
+ return int(window_width), int(window_height), game_width, game_height, grid_size
def create_player_colors(self) -> list[Color]:
number_player = len(self.simulator.env.players)
diff --git a/overcooked_simulator/gui_2d_vis/visualization.yaml b/overcooked_simulator/gui_2d_vis/visualization.yaml
index bd1a09ae..79df279b 100644
--- a/overcooked_simulator/gui_2d_vis/visualization.yaml
+++ b/overcooked_simulator/gui_2d_vis/visualization.yaml
@@ -1,8 +1,8 @@
# colors: https://www.webucator.com/article/python-color-constants-module/
GameWindow:
- WhatIsFixed: window_width # entweder grid oder window_width
- size: 600
+ WhatIsFixed: grid # entweder grid oder window_width
+ size: 65
screen_margin: 100
start_width: 600
start_height: 600
--
GitLab