diff --git a/src/tracking_car/config.yaml b/src/tracking_car/config.yaml index c3172b2713..209856d86a 100644 --- a/src/tracking_car/config.yaml +++ b/src/tracking_car/config.yaml @@ -55,8 +55,7 @@ det_label_font_scale: 0.5 det_label_padding: 5 view: -default_mode: "satellite" # 默认视角模式: satellite, behind, first_person -satellite_height: 50.0 # 卫星视角高度(米) -behind_distance: 10.0 # 后方视角距离(米) -first_person_height: 1.6 # 第一人称视角高度 -update_frequency: 1.0 # 视角更新频率(Hz),1.0=每秒更新一次 \ No newline at end of file +default_mode: "satellite" # 默认视角模式: satellite, behind, first_person +satellite_height: 50.0 # 卫星视角高度(米) +behind_distance: 10.0 # 后方视角距离(米) +first_person_height: 1.6 # 第一人称视角高度(米) \ No newline at end of file diff --git a/src/tracking_car/sensors.py b/src/tracking_car/sensors.py index 99e863441d..7270c7135e 100644 --- a/src/tracking_car/sensors.py +++ b/src/tracking_car/sensors.py @@ -386,9 +386,11 @@ def __init__(self, world, ego_vehicle, config): self.ego_vehicle = ego_vehicle self.config = config self.spectator = None - self.view_mode = 'satellite' # 视角模式: 'satellite', 'behind', 'first_person' - self.view_height = 50.0 # 卫星视角高度 - self.follow_distance = 10.0 # 后方视角距离 + view_config = config.get('view', {}) + self.view_mode = view_config.get('default_mode', 'satellite') + self.view_height = view_config.get('satellite_height', 50.0) + self.follow_distance = view_config.get('behind_distance', 10.0) + self.first_person_height = view_config.get('first_person_height', 1.6) def setup(self): """设置视角""" @@ -502,7 +504,7 @@ def _set_first_person_view(self): location = carla.Location( x=vehicle_transform.location.x, y=vehicle_transform.location.y, - z=vehicle_transform.location.z + 1.6 # 驾驶员眼睛高度 + z=vehicle_transform.location.z + self.first_person_height # 改为使用配置 ) # 使用车辆的方向