This commit is contained in:
Your Name
2024-05-17 13:10:50 -05:00
parent 55f89010b9
commit 70ee6e6791
3 changed files with 20 additions and 145 deletions

View File

@@ -113,11 +113,10 @@ void update_model(UIState *s,
// update path
float path;
if (scene.dynamic_path_width) {
float multiplier = scene.enabled ? 1.0f : scene.always_on_lateral_active ? 0.75f : 0.50f;
path = scene.path_width * multiplier;
} else {
path = scene.path_width;
if (paramsMemory.getInt("no_lat_lane_change")) {
path = LANE_CHANGE_NO_LAT_PATH_WIDTH;
}
path = CENTER_PATH_WIDTH;
}
auto lead_count = model.getLeadsV3().size();
@@ -360,8 +359,8 @@ void ui_update_frogpilot_params(UIState *s) {
scene.lane_line_width = params.getInt("LaneLinesWidth") * (scene.is_metric ? 1.0f : INCH_TO_CM) / 200.0f;
// CLEARPILOT - either disable these options, or set them as defaults and restore them
scene.path_edge_width = params.getInt("PathEdgeWidth");
// scene.path_edge_width = /* params.getInt("PathEdgeWidth"); */ OTHER_LANE_WIDTH;
scene.path_width = /* params.getInt("PathWidth") */ CENTER_LANE_WIDTH / 10.0f * (scene.is_metric ? 1.0f : FOOT_TO_METER) / 2.0f;
// scene.path_edge_width = /* params.getInt("PathEdgeWidth"); */ EDGE_PATH_WIDTH;
scene.path_width = /* params.getInt("PathWidth") */ CENTER_PATH_WIDTH / 10.0f * (scene.is_metric ? 1.0f : FOOT_TO_METER) / 2.0f;
scene.road_edge_width = params.getInt("RoadEdgesWidth") * (scene.is_metric ? 1.0f : INCH_TO_CM) / 200.0f;
scene.unlimited_road_ui_length = scene.model_ui && params.getBool("UnlimitedLength");