mawei/StarPilot
1
0
Fork 0
mirror of https://github.com/firestar5683/StarPilot.git synced 2026-07-06 14:16:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove std::clamp (#2530)

Browse Source 
old-commit-hash: 91f79acac3ef63d28d5884bf2947eb7b692666cc
This commit is contained in:
Dean Lee
2020-11-13 03:30:04 +08:00
committed by GitHub
parent a8f5a9834a
commit ed4c4cd8b3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/ui/paint.cc
+3 -3
View File
@@ -53,7 +53,7 @@ bool car_space_to_full_frame(const UIState *s, float in_x, float in_y, float in_
*out_x = KEp.v[0] / KEp.v[2];
*out_y = KEp.v[1] / KEp.v[2];
return *out_x >= 0 && *out_y >= 0;
return *out_x >= 0 && *out_x <= s->fb_w && *out_y >= 0 && *out_y <= s->fb_h;
}
@@ -133,9 +133,9 @@ static void ui_draw_line(UIState *s, const vertex_data *v, const int cnt, NVGcol
if (cnt == 0) return;
nvgBeginPath(s->vg);
nvgMoveTo(s->vg, std::clamp<float>(v[0].x, 0, s->fb_w), std::clamp<float>(v[0].y, 0, s->fb_h));
nvgMoveTo(s->vg, v[0].x, v[0].y);
for (int i = 1; i < cnt; i++) {
nvgLineTo(s->vg, std::clamp<float>(v[i].x, 0, s->fb_w), std::clamp<float>(v[i].y, 0, s->fb_h));
nvgLineTo(s->vg, v[i].x, v[i].y);
}
nvgClosePath(s->vg);
if (color) {