Passengers in the metro car are now actually rendered inside the metro car

Author: yanfengliu

PROGRESS.md

@@ -62,3 +62,7 @@
 - Improved random metro line color generation to prefer hues that are more distinct from already selected line colors.
 - Added color-distance helper utilities and tests for hue wrap distance and distinct hue selection behavior.
 - Changed station pool generation so new station positions are less likely to spawn far from the current station cluster center.
+- Changed metro rendering so passenger icons are displayed inside each metro car in a 2x3 grid that moves with the car.
+- Improved metro passenger icon spacing and rotated passenger icon placement to follow metro car orientation.
+- Rebalanced metro passenger slot layout to a uniform 3x2 in-car grid to prevent overlap while preserving car-aligned rotation.
+- Updated metro passenger slot spacing so row and column icon gaps match the side margins inside the metro car.

src/entity/metro.py

@@ -1,3 +1,6 @@
+import pygame
+from math import ceil
+
 from config import (
     metro_accel_time_ms,
     metro_boarding_time_per_passenger_ms,
@@ -7,10 +10,12 @@
     metro_passengers_per_row,
     metro_size,
     metro_speed_per_ms,
+    passenger_size,
 )
 from entity.holder import Holder
 from entity.segment import Segment
 from entity.station import Station
+from geometry.point import Point
 from geometry.rect import Rect
 from shortuuid import uuid  # type: ignore
 
@@ -38,3 +43,37 @@ def __init__(self) -> None:
         self.boarding_progress_ms = 0
         self.boarding_time_per_passenger_ms = metro_boarding_time_per_passenger_ms
         self.just_arrived_and_stopped = False
+
+    def draw(
+        self,
+        surface: pygame.surface.Surface,
+        current_time_ms: int | None = None,
+        passenger_max_wait_time_ms: int | None = None,
+    ) -> None:
+        self.shape.draw(surface, self.position)
+
+        grid_cols = self.passengers_per_row
+        grid_rows = ceil(self.capacity / grid_cols)
+        metro_width = 2 * self.size
+        metro_height = self.size
+        passenger_diameter = 2 * passenger_size
+        x_gap = (metro_width - (grid_cols * passenger_diameter)) / (grid_cols + 1)
+        y_gap = (metro_height - (grid_rows * passenger_diameter)) / (grid_rows + 1)
+        x_step = passenger_diameter + x_gap
+        y_step = passenger_diameter + y_gap
+        x_start = (-metro_width / 2) + x_gap + passenger_size
+        y_start = (-metro_height / 2) + y_gap + passenger_size
+        metro_degrees = getattr(self.shape, "degrees", 0.0)
+
+        for idx, passenger in enumerate(self.passengers):
+            col = idx % grid_cols
+            row = idx // grid_cols
+            x_offset = x_start + (col * x_step)
+            y_offset = y_start + (row * y_step)
+            rotated_offset = Point(x_offset, y_offset).rotate(metro_degrees)
+            passenger.position = self.position + rotated_offset
+            passenger.draw(
+                surface,
+                current_time_ms=current_time_ms,
+                max_wait_time_ms=passenger_max_wait_time_ms,
+            )

test/test_station.py

@@ -87,6 +87,60 @@ def test_holder_draw_positions_and_move(self):
         self.assertNotIn(passengers[1], station.passengers)
         self.assertIn(passengers[1], other_station.passengers)
 
+    def test_metro_draw_positions_passengers_in_3x2_grid(self):
+        metro = Metro()
+        metro.position = Point(100, 100)
+        passengers = [Passenger(Circle((0, 0, 0), 1)) for _ in range(6)]
+        for passenger in passengers:
+            passenger.draw = MagicMock()
+            metro.add_passenger(passenger)
+
+        metro.draw(self.screen)
+
+        grid_cols = metro.passengers_per_row
+        grid_rows = 2
+        metro_width = 2 * metro.size
+        metro_height = metro.size
+        passenger_diameter = 2 * passenger_size
+        x_gap = (metro_width - (grid_cols * passenger_diameter)) / (grid_cols + 1)
+        y_gap = (metro_height - (grid_rows * passenger_diameter)) / (grid_rows + 1)
+        x_step = passenger_diameter + x_gap
+        y_step = passenger_diameter + y_gap
+        x_start = (-metro_width / 2) + x_gap + passenger_size
+        y_start = (-metro_height / 2) + y_gap + passenger_size
+
+        for idx, passenger in enumerate(passengers):
+            col = idx % grid_cols
+            row = idx // grid_cols
+            x_offset = x_start + (col * x_step)
+            y_offset = y_start + (row * y_step)
+            expected_position = metro.position + Point(x_offset, y_offset).rotate(0)
+            self.assertEqual(passenger.position, expected_position)
+
+    def test_metro_draw_rotates_passenger_grid_with_metro(self):
+        metro = Metro()
+        metro.position = Point(200, 200)
+        metro.shape.set_degrees(90)
+        passenger = Passenger(Circle((0, 0, 0), 1))
+        passenger.draw = MagicMock()
+        metro.add_passenger(passenger)
+
+        metro.draw(self.screen)
+
+        grid_cols = metro.passengers_per_row
+        grid_rows = 2
+        metro_width = 2 * metro.size
+        metro_height = metro.size
+        passenger_diameter = 2 * passenger_size
+        x_gap = (metro_width - (grid_cols * passenger_diameter)) / (grid_cols + 1)
+        y_gap = (metro_height - (grid_rows * passenger_diameter)) / (grid_rows + 1)
+        x_start = (-metro_width / 2) + x_gap + passenger_size
+        y_start = (-metro_height / 2) + y_gap + passenger_size
+        x_offset = x_start
+        y_offset = y_start
+        expected_position = metro.position + Point(x_offset, y_offset).rotate(90)
+        self.assertEqual(passenger.position, expected_position)
+
     def test_travel_plan_methods(self):
         station = Station(Rect(station_color, station_size, station_size), Point(0, 0))
         plan = TravelPlan([Node(station)])