Skip to content
Original file line number Diff line number Diff line change
Expand Up @@ -67,29 +67,34 @@ def get_current_trajectory():
VEHICLE_HEIGHT = 0.25 # 车辆显示高度

# ==================== 视角配置 ====================
TOP_DOWN_HEIGHT = 30.0 # 俯视视角高度(提高)
TOP_DOWN_PITCH = -85.0 # 俯视角 (几乎垂直向下,-90是完全垂直)
SMOOTH_FOLLOW_FACTOR = 0.01 # 视角平滑系数 (0-1,越小越平滑)
MIN_SMOOTH_FACTOR = 0.001 # 最小平滑系数
TOP_DOWN_HEIGHT = 5.0 # 俯视视角高度(提高)
TOP_DOWN_PITCH = -30.0 # 俯视角 (几乎垂直向下,-90是完全垂直)
SMOOTH_FOLLOW_FACTOR = 0.01 # 视角平滑系数 (0-1,越小越平滑)
MIN_SMOOTH_FACTOR = 0.001 # 最小平滑系数
MAX_SMOOTH_FACTOR = 0.3 # 最大平滑系数
SMOOTH_FACTOR_ADAPTIVE = True # 是否自适应平滑系数
DISTANCE_THRESHOLD = 5.0 # 距离阈值,超过此值加大平滑系数

DISTANCE_THRESHOLD = 1.0 # 距离阈值,超过此值加大平滑系数
FOLLOW_DISTANCE= 8.0 # 跟随距离(米)
FOLLOW_HEIGHT = 3.0 # 跟随高度(米)
FOLLOW_PITCH = -20.0 # 俯视角(度)
VIEW_UPDATE_ENABLED = True # 是否启用视角更新
VIEW_UPDATE_FPS = 60 # 视角更新频率 (Hz)
VIEW_UPDATE_THREADED = True # 是否使用独立线程更新视角
# ==================== 性能配置 ====================
DEBUG_MODE = True # 调试模式
FPS_LIMIT = 120 # FPS限制 (0为无限制,提高性能)
FPS_LIMIT = 60 # FPS限制 (0为无限制,提高性能)
UPDATE_RATE = 0.5 # 更新率 (1.0 = 每步更新)
USE_SMOOTH_INTERPOLATION = True # 使用平滑插值
INTERPOLATION_STEPS = 5 # 插值步数
MAX_FRAME_SKIP = 2 # 最大跳帧数
MAX_FRAME_SKIP = 1 # 最大跳帧数

# ==================== CARLA配置 ====================
CARLA_HOST = "localhost"
CARLA_PORT = 2000
CARLA_TIMEOUT = 20.0

# ==================== 仿真配置 ====================
FIXED_DELTA_SECONDS = 0.0166 # 固定时间步长 (~30 FPS)
FIXED_DELTA_SECONDS = 0.0166 # 固定时间步长 (~60 FPS)
SYNCHRONOUS_MODE = False # 同步模式(影响性能,暂不启用)
NO_RENDERING_MODE = False # 无渲染模式

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

#!/usr/bin/env python3
"""
主程序 - 简化版
Expand Down Expand Up @@ -134,8 +133,8 @@ def run_episode(env, traffic_mgr, visualizer, tracker, episode_num):
print("未找到车辆")
return False

# 设置俯视视角
tracker.set_top_down_view(ego_vehicle)
# 设置后方跟随视角(启动独立线程)
tracker.set_follow_view(ego_vehicle)

# 绘制路线
if hasattr(env, 'path') and env.path:
Expand All @@ -145,7 +144,7 @@ def run_episode(env, traffic_mgr, visualizer, tracker, episode_num):
route_points.append((location.x, location.y, location.z))
visualizer.draw_planned_route(route_points)

# 运行循环
# 运行循环 - 不再在主循环中更新视角
step_count = 0
done = False
fps_counter = deque(maxlen=30)
Expand All @@ -154,8 +153,8 @@ def run_episode(env, traffic_mgr, visualizer, tracker, episode_num):
step_count += 1
step_start = time.time()

# 每步都更新视角
tracker.smooth_follow_vehicle(ego_vehicle)
# 注意:不再调用 tracker.smooth_follow_vehicle(ego_vehicle)
# 视角更新由独立线程处理

# 更新车辆显示
vehicle_state = tracker.get_vehicle_state(ego_vehicle)
Expand All @@ -182,12 +181,16 @@ def run_episode(env, traffic_mgr, visualizer, tracker, episode_num):

if cfg.DEBUG_MODE and step_count % 50 == 0:
fps = len(fps_counter) / sum(fps_counter) if fps_counter else 0
print(f"步骤 {step_count}, FPS: {fps:.1f}, 动作: {cfg.ACTION_NAMES[action]}")
vehicle_speed = vehicle_state.get('speed_2d', 0) if vehicle_state else 0
print(f"步骤 {step_count}, FPS: {fps:.1f}, 速度: {vehicle_speed:.1f}m/s, 动作: {cfg.ACTION_NAMES[action]}")

if done:
print(f"Episode {episode_num} 完成,步数: {step_count}")
break

# 清理跟踪器资源
tracker.cleanup()

return True

def main():
Expand All @@ -199,19 +202,22 @@ def main():

env, traffic_mgr, visualizer, tracker, trajectory = result

# 运行episode
for episode in range(cfg.TOTAL_EPISODES):
success = run_episode(env, traffic_mgr, visualizer, tracker, episode + 1)

if episode < cfg.TOTAL_EPISODES - 1:
print(f"等待 {cfg.EPISODE_INTERVAL} 秒...")
time.sleep(cfg.EPISODE_INTERVAL)

# 清理
if traffic_mgr:
traffic_mgr.cleanup()
try:
# 运行episode
for episode in range(cfg.TOTAL_EPISODES):
success = run_episode(env, traffic_mgr, visualizer, tracker, episode + 1)

if episode < cfg.TOTAL_EPISODES - 1:
print(f"等待 {cfg.EPISODE_INTERVAL} 秒...")
time.sleep(cfg.EPISODE_INTERVAL)
finally:
# 确保清理
if tracker:
tracker.cleanup()
if traffic_mgr:
traffic_mgr.cleanup()

print("\n程序结束")

if __name__ == '__main__':
main()
main()
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

"""
交通管理器 - 简化版
交通管理器-生成行人和车辆
"""

import sys
Expand Down
Loading
Loading