From f98d32a75d7b687893e01f9840ba2ac5994ef81c Mon Sep 17 00:00:00 2001
From: fheinrich <fheinrich@techfak.uni-bielefeld.de>
Date: Wed, 7 Feb 2024 10:49:33 +0100
Subject: [PATCH] Fixed main merged, adjusted polygon
---
overcooked_simulator/gui_2d_vis/drawing.py | 4 +++-
overcooked_simulator/overcooked_environment.py | 11 +++++++----
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/overcooked_simulator/gui_2d_vis/drawing.py b/overcooked_simulator/gui_2d_vis/drawing.py
index 7a61794d..5472397e 100644
--- a/overcooked_simulator/gui_2d_vis/drawing.py
+++ b/overcooked_simulator/gui_2d_vis/drawing.py
@@ -165,14 +165,16 @@ class Visualizer:
screen,
colors["black"],
(
- pos - (direction * grid_size * 0.8),
+ pos - (direction * grid_size * 0.6),
left_beam,
+ left_beam + (direction.rotate(90) * rect_scale),
pos
- (direction * rect_scale * 2)
+ (direction.rotate(90) * rect_scale),
pos
- (direction * rect_scale * 2)
+ (direction.rotate(-90) * rect_scale),
+ right_beam + (direction.rotate(-90) * rect_scale),
right_beam,
),
)
diff --git a/overcooked_simulator/overcooked_environment.py b/overcooked_simulator/overcooked_environment.py
index 12c1d20c..444163d5 100644
--- a/overcooked_simulator/overcooked_environment.py
+++ b/overcooked_simulator/overcooked_environment.py
@@ -754,7 +754,8 @@ class Environment:
def get_json_state(self, player_id: str = None) -> str:
if player_id in self.players:
- self.hook(PRE_STATE, player_id=player_id)state = {
+ self.hook(PRE_STATE, player_id=player_id)
+ state = {
"players": [p.to_dict() for p in self.players.values()],
"counters": [c.to_dict() for c in self.counters],
"kitchen": {"width": self.kitchen_width, "height": self.kitchen_height},
@@ -768,12 +769,14 @@ class Environment:
"view_restriction": [
self.players[player_id].facing_direction.tolist(),
self.players[player_id].pos.tolist(),
- 40.0,
+ 35.0,
]
if FOG_OF_WAR
else None,
- }self.hook(STATE_DICT, state=state, player_id=player_id)
- json_data = json.dumps(state)self.hook(JSON_STATE, json_data=json_data, player_id=player_id)
+ }
+ self.hook(STATE_DICT, state=state, player_id=player_id)
+ json_data = json.dumps(state)
+ self.hook(JSON_STATE, json_data=json_data, player_id=player_id)
assert StateRepresentation.model_validate_json(json_data=json_data)
return json_data
raise ValueError(f"No valid {player_id=}")
--
GitLab