From 0e89e7024d544ee07df7d9142625a0f216b66e5c Mon Sep 17 00:00:00 2001 From: fheinrich <fheinrich@techfak.de> Date: Mon, 12 Feb 2024 10:30:04 +0100 Subject: [PATCH] Sorted layouts in selection list --- overcooked_simulator/gui_2d_vis/overcooked_gui.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/overcooked_simulator/gui_2d_vis/overcooked_gui.py b/overcooked_simulator/gui_2d_vis/overcooked_gui.py index 2ab2e900..26fa56ec 100644 --- a/overcooked_simulator/gui_2d_vis/overcooked_gui.py +++ b/overcooked_simulator/gui_2d_vis/overcooked_gui.py @@ -1,10 +1,12 @@ import argparse import dataclasses +import glob import json import logging import random import sys from enum import Enum +from pathlib import Path from subprocess import Popen import numpy as np @@ -357,16 +359,9 @@ class PyGameGUI: self.layout_file_paths = { str(p.name): p - for p in (ROOT_DIR / "game_content" / "layouts").glob("*.layout") + for p in [Path(f) for f in sorted((ROOT_DIR / "game_content" / "layouts").rglob("*.layout"))] } - self.layout_file_paths.update( - { - str(p.name): p - for p in (ROOT_DIR / "game_content" / "layouts" / "overcooked-1").glob( - "*.layout" - ) - } - ) + assert len(self.layout_file_paths) != 0, "No layout files." dropdown_width, dropdown_height = 200, 40 self.layout_selection = pygame_gui.elements.UIDropDownMenu( -- GitLab