mirror of
https://github.com/MarekZegare4/MeshCore-Solo.git
synced 2026-08-02 02:06:11 +00:00
MarekZegare4andClaude Opus 4.8
d2c9f2e19b
The Home "Map" page preview only plotted each trail vertex as a single pixel, leaving gaps wherever the streaming simplifier collapsed a straight stretch to its two endpoints — so a route looked like scattered dots instead of a path. The stale "gfx isn't available this early in the TU" comment no longer holds: GfxUtils.h is already reachable here, so draw the same Bresenham line the full Trail map uses. Extracted the shared "walk points, draw a line, break on TRAIL_FLAG_SEG_START" loop into gfx::drawTrail() (GfxUtils.h) so the full map and the mini-map preview don't carry two copies of it; they differ only in their projection and what (if anything) they draw at a segment break. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
63 lines
2.5 KiB
C++
63 lines
2.5 KiB
C++
#pragma once
|
|
// Small 1-px drawing primitives the DisplayDriver abstraction doesn't provide
|
|
// (no line / circle in the GFX wrapper used here). Shared by the map and the
|
|
// compass so the Bresenham / midpoint routines aren't copy-pasted per screen.
|
|
// Everything is plotted as 1x1 fillRect to stay within DisplayDriver's API.
|
|
|
|
#include <helpers/ui/DisplayDriver.h>
|
|
#include <stdlib.h> // abs
|
|
#include "../Trail.h"
|
|
|
|
namespace gfx {
|
|
|
|
// Bresenham line between two points.
|
|
static inline void drawLine(DisplayDriver& d, int x0, int y0, int x1, int y1) {
|
|
int dx = abs(x1 - x0), sx = x0 < x1 ? 1 : -1;
|
|
int dy = -abs(y1 - y0), sy = y0 < y1 ? 1 : -1;
|
|
int err = dx + dy;
|
|
while (true) {
|
|
d.fillRect(x0, y0, 1, 1);
|
|
if (x0 == x1 && y0 == y1) break;
|
|
int e2 = err * 2;
|
|
if (e2 >= dy) { err += dy; x0 += sx; }
|
|
if (e2 <= dx) { err += dx; y0 += sy; }
|
|
}
|
|
}
|
|
|
|
// Midpoint-circle outline.
|
|
static inline void drawCircle(DisplayDriver& d, int cx, int cy, int r) {
|
|
int x = r, y = 0, err = 1 - r;
|
|
while (x >= y) {
|
|
d.fillRect(cx + x, cy + y, 1, 1); d.fillRect(cx + y, cy + x, 1, 1);
|
|
d.fillRect(cx - y, cy + x, 1, 1); d.fillRect(cx - x, cy + y, 1, 1);
|
|
d.fillRect(cx - x, cy - y, 1, 1); d.fillRect(cx - y, cy - x, 1, 1);
|
|
d.fillRect(cx + y, cy - x, 1, 1); d.fillRect(cx + x, cy - y, 1, 1);
|
|
y++;
|
|
if (err < 0) err += 2 * y + 1;
|
|
else { x--; err += 2 * (y - x) + 1; }
|
|
}
|
|
}
|
|
|
|
// Walks a TrailStore and renders it as a connected polyline via drawLine(),
|
|
// breaking the line at each TRAIL_FLAG_SEG_START point (trail paused/
|
|
// restarted) instead of bridging the dead-time gap. Shared by the full Trail
|
|
// map and the Home screen's mini-map preview, which only differ in how they
|
|
// project lat/lon to screen coords and what (if anything) they draw at a
|
|
// break. `project(lat, lon, x, y)` fills the screen coords for one point;
|
|
// `on_break(x_prev_end, y_prev_end, x_new_start, y_new_start)` runs at each
|
|
// break instead of drawLine() — pass a no-op lambda for a silent gap.
|
|
template <typename Project, typename OnBreak>
|
|
static void drawTrail(DisplayDriver& d, TrailStore& tr, Project project, OnBreak on_break) {
|
|
if (tr.count() == 0) return;
|
|
int x0, y0; project(tr.at(0).lat_1e6, tr.at(0).lon_1e6, x0, y0);
|
|
for (int i = 1; i < tr.count(); i++) {
|
|
const TrailPoint& pt = tr.at(i);
|
|
int x1, y1; project(pt.lat_1e6, pt.lon_1e6, x1, y1);
|
|
if (pt.flags & TRAIL_FLAG_SEG_START) on_break(x0, y0, x1, y1);
|
|
else drawLine(d, x0, y0, x1, y1);
|
|
x0 = x1; y0 = y1;
|
|
}
|
|
}
|
|
|
|
} // namespace gfx
|