From f6d639e1f463e37019cabbdd0d0f90bdc8c22cb7 Mon Sep 17 00:00:00 2001
From: fheinrich <fheinrich@techfak.uni-bielefeld.de>
Date: Wed, 20 Dec 2023 14:26:49 +0100
Subject: [PATCH] Fixed initializing facing point of player
---
overcooked_simulator/overcooked_environment.py | 1 +
overcooked_simulator/player.py | 5 ++++-
overcooked_simulator/pygame_gui/pygame_gui.py | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/overcooked_simulator/overcooked_environment.py b/overcooked_simulator/overcooked_environment.py
index 0e71fd9a..ab268ccd 100644
--- a/overcooked_simulator/overcooked_environment.py
+++ b/overcooked_simulator/overcooked_environment.py
@@ -375,6 +375,7 @@ class Environment:
del self.free_positions[free_idx]
else:
log.debug("No free positions left in kitchens")
+ player.update_facing_point()
def detect_collision_world_bounds(self, player: Player):
"""Checks for detections of the player and the world bounds.
diff --git a/overcooked_simulator/player.py b/overcooked_simulator/player.py
index fa59cf03..b1394f60 100644
--- a/overcooked_simulator/player.py
+++ b/overcooked_simulator/player.py
@@ -50,7 +50,7 @@ class Player:
] = None # needed to stop progress when moved away
self.current_nearest_counter: Optional[Counter] = None
- self.facing_point: npt.NDArray[float] = np.array(self.pos)
+ self.facing_point: npt.NDArray[float] = np.zeros([0, 0], float)
def move(self, movement: npt.NDArray[float]):
"""Moves the player position by the given movement vector.
@@ -81,6 +81,9 @@ class Player:
"""
if np.linalg.norm(direction) != 0:
self.facing_direction = direction / np.linalg.norm(direction)
+ self.update_facing_point()
+
+ def update_facing_point(self):
self.facing_point = self.pos + (
self.facing_direction * self.radius * self.grid_size * 0.5
)
diff --git a/overcooked_simulator/pygame_gui/pygame_gui.py b/overcooked_simulator/pygame_gui/pygame_gui.py
index ed435c5a..b18ee832 100644
--- a/overcooked_simulator/pygame_gui/pygame_gui.py
+++ b/overcooked_simulator/pygame_gui/pygame_gui.py
@@ -280,7 +280,7 @@ class PyGameGUI:
self.counter_size,
self.counter_size,
),
- width=1,
+ width=2,
)
def draw_thing(
--
GitLab