From ef3b384d09616e905e8849324d82cf1e8d943a85 Mon Sep 17 00:00:00 2001
From: fheinrich <fheinrich@techfak.uni-bielefeld.de>
Date: Tue, 6 Feb 2024 13:08:29 +0100
Subject: [PATCH] Fix merge
---
overcooked_simulator/gui_2d_vis/drawing.py | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/overcooked_simulator/gui_2d_vis/drawing.py b/overcooked_simulator/gui_2d_vis/drawing.py
index 77f05c05..19bd37cf 100644
--- a/overcooked_simulator/gui_2d_vis/drawing.py
+++ b/overcooked_simulator/gui_2d_vis/drawing.py
@@ -1,7 +1,6 @@
import argparse
import colorsys
import json
-import math
from datetime import datetime, timedelta
from pathlib import Path
@@ -486,20 +485,14 @@ class Visualizer:
item_scale = self.config["Dispenser"]["item_scale"]
self.draw_counter_occupier(
- screen,
- counter["occupied_by"],
- grid_size,
- np.array(counter["pos"]) * grid_size + (grid_size / 2),
- np.array(item_pos) * grid_size,
- item_scale,
+ screen=screen,
+ occupied_by=counter["occupied_by"],
+ grid_size=grid_size,
+ pos=np.array(counter["pos"]) * grid_size + (grid_size / 2),
+ item_scale=item_scale,
)
if SHOW_COUNTER_CENTERS:
- pygame.draw.circle(
- screen,
- colors["green1"],
- np.array(counter["pos"]) * grid_size + (grid_size / 2),
- 3,
pos = np.array(counter["pos"]) * grid_size
pygame.draw.circle(screen, colors["green1"], pos, 3)
pygame.draw.circle(screen, colors["green1"], pos, 3)
--
GitLab