Compare commits
6
Commits
car-2.45.0
...
car-2.46.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cdf78c6d32 | ||
|
|
a445fef407 | ||
|
|
f9813c2afd | ||
|
|
3a532cd498 | ||
|
|
06a61282a6 | ||
|
|
ed32fbbc1f |
@@ -77,7 +77,7 @@ Repository: `ssh://git@git.stinnesbeck.com:2222/nils/mg4.git` (remote `origin`),
|
||||
|
||||
| Tab | Contents |
|
||||
|---|---|
|
||||
| Overview | value tiles (battery, range, range/usage/energy since start, 5-min averages of range, usage, power, speed, and under the battery what plays: `NowPlaying` picks from the media sessions `NowPlayingWatcher` follows — listened to only, never connected to, nothing logged or sent; Tiles and Halloween, Settings → "Show what's playing", `PREF_NOW_PLAYING`, on by default), vehicle info (odometer, lease allowance and the odometer against it), tyre pressures; read every 0.2 s on a background thread. Styles (Settings → Overview style): Tiles, Gauges (`GaugeView` needles), Cockpit (`RingView` rings, `TraceView` power trace), Retro (`RetroView`, seven-segment VFD), Futuristic (`FlowView`, animated energy flow), Sci-fi (`SciFiView`, starship console), Cartoon (`CartoonView`), MG (`OctagonView`, octagonal dials after the classic MG dashboards), and on `ClusterCanvasView`: Minimal, Terminal, Nixie tubes, Chronograph, Grid (`GridView`, neon lines over a moving grid floor, power as a light-cycle trail from `ClusterValues.powerTrail`), Grid with map (the same `GridView` over the roads round the car, top-down: GPS while it is shown, tiles from the server's `/v1/map/roads` through `MapRoads`, cached in `files/map`; `RoadTile`, `MapGeometry`; the map is `MapLayerView`, a hardware layer drawn once and moved and turned by the GPU every display frame), Time circuits (`TimeCircuitsView`, the time machine's LED rows with `Segments14` letters and a flux capacitor), Quest (`QuestView`, a fantasy game interface), Visor (`VisorView`, a helmet display with a motion tracker of the power trail), Empire (`EmpireView`, a strategy game with an isometric world and ages by odometer, `EmpireAge`), Día de Muertos (`MuertosView`, an ofrenda: papel picado, candles, a calavera in a ring of marigolds), Halloween (`HalloweenView`, a jack-o'-lantern, a potion flask, a tombstone on a graveyard hill), both counting with `Tally`, the pumpkin's light flaring on the kick drum while on screen, when "Pumpkin light follows the music" is on (off by default, `PREF_MUSIC_LIGHT`; `MusicTap`, `MusicPulse`: Android's audio analyser, 40–120 Hz, jumps not levels; Bluetooth and CarPlay, not the radio); the drawn styles share `ClusterValues`. A style shown in its own palette (Sci-fi, Cartoon, Nixie, Time circuits, Quest, Empire, Día de Muertos, Halloween; Retro, Terminal, Grid and Visor with "Original") gives the whole app its colours (`StylePalette`, `res/values/style_palettes.xml`) instead of the accent colour. A button in the navigation's header hides the navigation for a full-width Overview (`PREF_OVERVIEW_FULLSCREEN`); a swipe in from the left edge (`EdgeSwipe`) brings it back; without the app's own full screen the car's sidebar takes that edge, so a tab at the left edge (`edge_tab`) is tapped or swiped instead. Pages change only by the navigation (the pager's own swiping is off) |
|
||||
| Overview | value tiles (battery, range, range/usage/energy since start, 5-min averages of range, usage, power, speed, and under the battery what plays: `NowPlaying` picks from the media sessions `NowPlayingWatcher` follows — listened to only, never connected to, nothing logged or sent; Tiles, Día de Muertos and Halloween, Settings → "Show what's playing", `PREF_NOW_PLAYING`, on by default), vehicle info (odometer, lease allowance and the odometer against it), tyre pressures; read every 0.2 s on a background thread. Styles (Settings → Overview style): Tiles, Gauges (`GaugeView` needles), Cockpit (`RingView` rings, `TraceView` power trace), Retro (`RetroView`, seven-segment VFD), Futuristic (`FlowView`, animated energy flow), Sci-fi (`SciFiView`, starship console), Cartoon (`CartoonView`), MG (`OctagonView`, octagonal dials after the classic MG dashboards), and on `ClusterCanvasView`: Minimal, Terminal, Nixie tubes, Chronograph, Grid (`GridView`, neon lines over a moving grid floor, power as a light-cycle trail from `ClusterValues.powerTrail`), Grid with map (the same `GridView` over the roads round the car, top-down: GPS while it is shown, tiles from the server's `/v1/map/roads` through `MapRoads`, cached in `files/map`; `RoadTile`, `MapGeometry`; the map is `MapLayerView`, a hardware layer drawn once and moved and turned by the GPU every display frame), Time circuits (`TimeCircuitsView`, the time machine's LED rows with `Segments14` letters and a flux capacitor), Quest (`QuestView`, a fantasy game interface), Visor (`VisorView`, a helmet display with a motion tracker of the power trail), Empire (`EmpireView`, a strategy game with an isometric world and ages by odometer, `EmpireAge`), Día de Muertos (`MuertosView`, an ofrenda: papel picado, candles, a calavera in a ring of marigolds), Halloween (`HalloweenView`, a jack-o'-lantern, a potion flask, a tombstone on a graveyard hill), both counting with `Tally`, the pumpkin's light flaring on the kick drum while on screen, when "Pumpkin light follows the music" is on (off by default, `PREF_MUSIC_LIGHT`; `MusicTap`, `MusicPulse`: Android's audio analyser, 40–120 Hz, jumps not levels; Bluetooth and CarPlay, not the radio); the drawn styles share `ClusterValues`. A style shown in its own palette (Sci-fi, Cartoon, Nixie, Time circuits, Quest, Empire, Día de Muertos, Halloween; Retro, Terminal, Grid and Visor with "Original") gives the whole app its colours (`StylePalette`, `res/values/style_palettes.xml`) instead of the accent colour. A button in the navigation's header hides the navigation for a full-width Overview (`PREF_OVERVIEW_FULLSCREEN`); a swipe in from the left edge (`EdgeSwipe`) brings it back; without the app's own full screen the car's sidebar takes that edge, so a tab at the left edge (`edge_tab`) is tapped or swiped instead. Pages change only by the navigation (the pager's own swiping is off) |
|
||||
| Consumption / Charging | period totals, daily log, charging sessions and curve |
|
||||
| Live data | on/off, ABRP API key and user token, upload frequency |
|
||||
| Server | URL, pairing by QR, ingest token, installation ID (read-only), config import |
|
||||
|
||||
@@ -140,6 +140,12 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
|
||||
confirmed car facts, app structure, UI conventions, build/test/ship, documents. It replaces
|
||||
upstream's EVABRPUploader text. The test emulator is now in the flake: `nix run .#car-emulator`
|
||||
(Android 9 AOSP at 1920×720, 160 dpi; the car build installs as the system user — checked).
|
||||
- 2026-11-02 — App 2.46.0: **Día de Muertos shows what plays** (owner: "Can we also put that into the dia de muertos theme?", then "switch between monarch and alebrije", "one color per song"). A strip of papel picado (zigzag-cut edges) with "♪ title — artist" waves across the sky between the flags and the ring, behind the ring and the clock; a monarch butterfly and an alebrije (a painted horned creature with feathered wings and a curled tail) tow it on alternate passes. The paper's colour is one of the flags', fixed by the song (hash of title and artist, never logged). The banner moved out of `HalloweenView` into the shared `SongBanner`; Halloween looks as before. Same switch as Tiles and Halloween (Settings → "Show what's playing"). Tested: unit tests, lint, emulator with the throwaway fake session. Not tried on the car.
|
||||
- 2026-11-02 — App 2.45.2 published (`car-2.45.2`).
|
||||
- 2026-11-02 — App 2.45.2: Halloween's song banner **waves** (owner: "Can it also be a bit wavy?"): waves run from the bat to the tail, still where the bat holds it and up to 7 units at the tail, and the text follows them (`drawTextOnPath`). Tested: emulator with the throwaway fake session, unit tests, lint. Not tried on the car.
|
||||
- 2026-11-02 — App 2.45.1 published (`car-2.45.1`).
|
||||
- 2026-11-02 — App 2.45.1: **Halloween's song flies through the sky** (owner: "Instead of taking up screen space on the bottom, can we somehow include the title in the theme itself? ... have text fly through the air"). A bat tows a parchment banner with "♪ title — artist" from left to right across the strip of sky above the sign, behind the moon, one pass about every half minute, again and again while something plays (the title is cut first so the artist stays); the line at the foot of the hill is gone. While a banner flies the view draws about 30 frames a second, as it does while driving. Tested: emulator with the throwaway fake session (banner clear of the sign along the whole pass), unit tests, lint. Not tried on the car.
|
||||
- 2026-11-02 — App 2.45.0 published (`car-2.45.0`).
|
||||
- 2026-11-02 — App 2.45.0: **now playing on the Overview** (owner: "can we also implement music titles etc in our app?"; display only, Tiles and Halloween first). `NowPlayingWatcher` follows the active media sessions as the music-sources check reads them (`MediaSessionManager`, MEDIA_CONTENT_CONTROL as the system user), with a change listener and a callback per session, so reading costs no call into another app; it never connects to a media browser service (2.42.0) and sends no command. It runs only while the Overview is on screen in Tiles or Halloween with Settings → "Show what's playing" on (**on by default**, `PREF_NOW_PLAYING`). `NowPlaying` (pure, unit-tested) picks the session that plays, the one updated last of several, else the one paused last, passing over sessions without text (Bluetooth's empty one); CarPlay's YouTube titles lose their `[videoID]`; the radio shows its text (the artist field, e.g. "BLIND MELON - NO RAIN") with the station below. Tiles: the empty slot under the battery shows source ("· paused" when paused), title, artist, a cover (the session's picture, or Bluetooth's `ALBUM_ART_URI` file, read small off the main thread) and how far the song is; invisible when nothing plays; the narrow layout has no room and shows none. Halloween: "♪ title — artist" along the foot of the hill, the title cut first. Titles stay on screen: not logged, not sent. Tested: unit tests, lint, emulator with a throwaway build publishing a fake session (CarPlay-like title with ID removed, cover, bar; Halloween line; the switch hides and brings back both). With Halloween chosen the Settings card has two switches more and scrolls further. Not tried on the car: whether the car's sessions, Bluetooth's cover file and the radio text show as in the music-sources checks.
|
||||
- 2026-11-02 — App 2.44.0 published (`car-2.44.0`).
|
||||
- 2026-11-02 — App 2.44.0: **the pumpkin light follows the bass, and only when switched on** (owner: "more focussed on the bass", "optional via a settings flag"). `MusicPulse` now reads the kick drum's band (40–120 Hz, was 20–250 Hz) and lights only on a jump since the last reading, against the biggest jumps of the last 4 s; a jump under a fifth of that, or under half the bass's average level, lights nothing. So kicks flash, and a held note, a wobbling bass line or a swelling note stay dark (unit tests with made-up patterns). It flares at once and falls in 0.2 s. New switch under the Overview style, shown only for Halloween: "Pumpkin light follows the music" (`PREF_MUSIC_LIGHT`), **off by default**; off, the analyser never starts. Tuned on made-up signals only: no Bluetooth or CarPlay sound report from the car has arrived yet. Next: now playing (title, artist, source) from the media sessions, in its own version. Tested: unit tests, lint, emulator (switch off by default and the analyser thread absent; on, it runs only on the Overview; a throwaway build playing a pulsing test tone: the glow flares with the switch on, and stays exactly still with it off). With Halloween chosen, the Settings card now scrolls a little to reach the tyre unit. Not tried on the car.
|
||||
|
||||
@@ -249,7 +249,10 @@ drawing, turquoise and anticlockwise while regenerating. The altar's candles are
|
||||
per 50 km. The path of marigold petals along the bottom, which in the tradition leads the visitors
|
||||
home, is the last two minutes of power. On the right the clock in a tin frame, P R N D as small
|
||||
marigolds, and trip, usage, climate and odometer on the altar cloth. While you drive the flags
|
||||
sway and the flames flicker. The app turns the papel picado's pink with it.
|
||||
sway and the flames flicker. What plays (Bluetooth, CarPlay or the radio) crosses the sky between
|
||||
the flags and the ring on a waving strip of cut paper, towed by a monarch butterfly and, on the next
|
||||
pass, an alebrije; the paper takes one of the flags' colours, fixed by the song. The app turns the
|
||||
papel picado's pink with it.
|
||||
|
||||

|
||||

|
||||
@@ -267,7 +270,9 @@ you drive the bats fly, the potion bubbles and the ghost floats (where there is
|
||||
this screen). With "Pumpkin light follows the music" on (Settings, shown with this style; off by
|
||||
default) and Bluetooth or CarPlay music playing, the pumpkin's glow flares and its carving
|
||||
brightens on each kick drum; the radio cannot be heard, so it burns as usual then. What plays
|
||||
(Bluetooth, CarPlay or the radio) is carved into the foot of the hill. The app turns the
|
||||
(Bluetooth, CarPlay or the radio) flies across the top of the sky on a waving parchment banner that a
|
||||
bat tows, behind the moon, again and again while it plays (`SongBanner` draws the banner for both
|
||||
this style and Día de Muertos). The app turns the
|
||||
pumpkin's orange with it.
|
||||
|
||||

|
||||
|
||||
+2
-2
@@ -34,8 +34,8 @@ android {
|
||||
applicationId "com.stinnesbeck.nilsmg4"
|
||||
minSdk 27
|
||||
targetSdk 36
|
||||
versionCode 160
|
||||
versionName "2.45.0"
|
||||
versionCode 163
|
||||
versionName "2.46.0"
|
||||
|
||||
// Nothing about the server ships in the APK: its URL and ingest token are entered in
|
||||
// the app's Server tab (ServerConfig), and the database is only reachable by the server.
|
||||
|
||||
@@ -27,7 +27,7 @@ import java.util.Locale;
|
||||
* of power, rising with it, in orange or, where it regenerated, green. Unread values show "—" and
|
||||
* light nothing. With music playing, the pumpkin's glow swells and its carving brightens on the
|
||||
* beat ({@link MusicTap}); colours and the embers keep their meaning, and with no music it burns as
|
||||
* before. What plays is carved into the foot of the hill ({@link NowPlaying}).
|
||||
* before. What plays flies across the sky on a banner a bat tows ({@link NowPlaying}).
|
||||
*
|
||||
* The night sky is drawn once into a bitmap per size; only the rest goes over it. Bats, bubbles and
|
||||
* the ghost move (about 30 frames a second) only while the car moves and the view is on screen;
|
||||
@@ -50,6 +50,7 @@ final class HalloweenView extends ClusterCanvasView {
|
||||
private final Paint image = new Paint(Paint.FILTER_BITMAP_FLAG);
|
||||
private final Paint glow = new Paint(Paint.ANTI_ALIAS_FLAG);
|
||||
private final Path path = new Path();
|
||||
private final SongBanner banner = new SongBanner();
|
||||
private final RectF r = new RectF();
|
||||
private final Typeface serif = Typeface.create("serif", Typeface.BOLD);
|
||||
private final Typeface face = Typeface.create("sans-serif-condensed", Typeface.BOLD);
|
||||
@@ -96,10 +97,10 @@ final class HalloweenView extends ClusterCanvasView {
|
||||
if (sky == null || skyW != w || skyH != h) buildSky(w, h, u);
|
||||
c.drawBitmap(sky, 0, 0, image);
|
||||
drawBats(c, w, u);
|
||||
boolean song = drawSong(c, w, u);
|
||||
drawMoon(c, w, u);
|
||||
drawGhost(c, w, u);
|
||||
drawHill(c, w, h, u);
|
||||
drawSong(c, w, h, u);
|
||||
drawEmbers(c, w, u);
|
||||
float pulse = music == null ? 0f : music.pulse();
|
||||
drawPumpkin(c, w, u, pulse);
|
||||
@@ -107,7 +108,7 @@ final class HalloweenView extends ClusterCanvasView {
|
||||
drawFlask(c, u);
|
||||
drawTombstone(c, w, u);
|
||||
drawGears(c, w, u);
|
||||
keepAnimating(moving || pulse > 0f, 33);
|
||||
keepAnimating(moving || pulse > 0f || song, 33);
|
||||
}
|
||||
|
||||
private void label(Canvas c, String s, float x, float y, float size, int colour, Typeface tf, Paint.Align a) {
|
||||
@@ -277,24 +278,32 @@ final class HalloweenView extends ClusterCanvasView {
|
||||
}
|
||||
}
|
||||
|
||||
// ---------- What plays, carved into the hill ----------
|
||||
// ---------- What plays: a bat tows it across the sky on a banner ----------
|
||||
|
||||
private void drawSong(Canvas c, int w, int h, float u) {
|
||||
if (v.songTitle == null) return;
|
||||
text.setTypeface(thin);
|
||||
text.setTextSize(20f * u);
|
||||
float room = w * 0.44f;
|
||||
String artist = v.songArtist == null ? "" : " — " + cut(v.songArtist, room / 2f);
|
||||
// A long title gives way, so the artist stays.
|
||||
String s = "♪ " + cut(v.songTitle, room - text.measureText("♪ " + artist)) + artist;
|
||||
label(c, s, w / 2f, h - 12f * u, 20f * u, AccentColor.withAlpha(BONE, 0xC0), thin, Paint.Align.CENTER);
|
||||
}
|
||||
|
||||
/** {@code s} cut with "…" to fit {@code room} in the text paint as set. */
|
||||
private String cut(String s, float room) {
|
||||
if (text.measureText(s) <= room) return s;
|
||||
int fits = text.breakText(s, true, Math.max(0f, room - text.measureText("…")), null);
|
||||
return s.substring(0, Math.max(0, fits)).trim() + "…";
|
||||
/**
|
||||
* A bat pulls a waving parchment banner with the song from left to right, high in the sky, behind the
|
||||
* sign and the moon, again and again while something plays. Returns whether it is drawn, so
|
||||
* the view keeps animating for it.
|
||||
*/
|
||||
private boolean drawSong(Canvas c, int w, float u) {
|
||||
if (v.songTitle == null) return false;
|
||||
text.setTypeface(face);
|
||||
text.setTextSize(19f * u);
|
||||
String s = SongBanner.line(text, v.songTitle, v.songArtist, Math.min(560f * u, w * 0.45f));
|
||||
float t = SystemClock.uptimeMillis() / 1000f;
|
||||
float bw = text.measureText(s) + 40f * u, bh = 30f * u, tow = 56f * u;
|
||||
float bx = SongBanner.left(t, w, bw, tow, u);
|
||||
// In the strip of sky above the sign, clear of it.
|
||||
float yc = 34f * u + (float) Math.sin(t * 1.3f) * 4f * u;
|
||||
banner.draw(c, fill, line, text, s, bx, yc, bw, bh, t, u, 0f, BONE, 0xFF8A6A3A, INK);
|
||||
// The tow lines, and the bat at their end.
|
||||
float right = bx + bw, batX = right + tow, batY = yc - 10f * u;
|
||||
line.setColor(BAT_EDGE);
|
||||
line.setStrokeWidth(1.5f * u);
|
||||
c.drawLine(right, yc - bh / 2f + 3f * u, batX, batY + 6f * u, line);
|
||||
c.drawLine(right, yc + bh / 2f - 3f * u, batX, batY + 6f * u, line);
|
||||
bat(c, batX, batY, 26f * u, (float) Math.sin(t * 12f), u);
|
||||
return true;
|
||||
}
|
||||
|
||||
// ---------- The arch of embers: the power ----------
|
||||
|
||||
@@ -1785,7 +1785,8 @@ public class MainActivity extends AppCompatActivity {
|
||||
|
||||
/** The styles that show what plays. */
|
||||
private static boolean showsNowPlaying(OverviewStyle style) {
|
||||
return style == OverviewStyle.TILES || style == OverviewStyle.HALLOWEEN;
|
||||
return style == OverviewStyle.TILES || style == OverviewStyle.HALLOWEEN
|
||||
|| style == OverviewStyle.MUERTOS;
|
||||
}
|
||||
|
||||
/** The media sessions are watched only while what plays can be seen, and the switch is on. */
|
||||
|
||||
@@ -44,6 +44,7 @@ final class MuertosView extends ClusterCanvasView {
|
||||
private final Paint image = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.FILTER_BITMAP_FLAG);
|
||||
private final Path path = new Path();
|
||||
private final Path flag = new Path();
|
||||
private final SongBanner banner = new SongBanner();
|
||||
private final RectF r = new RectF();
|
||||
private final Typeface serif = Typeface.create("serif", Typeface.BOLD);
|
||||
private final Typeface face = Typeface.create("sans-serif-condensed", Typeface.BOLD);
|
||||
@@ -87,6 +88,7 @@ final class MuertosView extends ClusterCanvasView {
|
||||
c.drawBitmap(scene, 0, 0, image);
|
||||
float cx = w / 2f, cy = 345f * u;
|
||||
drawFlags(c, w, u);
|
||||
boolean song = drawSong(c, w, u);
|
||||
drawRing(c, cx, cy, u);
|
||||
drawSpeed(c, cx, cy, u);
|
||||
drawBattery(c, u);
|
||||
@@ -95,7 +97,7 @@ final class MuertosView extends ClusterCanvasView {
|
||||
drawClock(c, w, u);
|
||||
drawGears(c, w, u);
|
||||
drawRows(c, w, h, u);
|
||||
keepAnimating(moving, 33);
|
||||
keepAnimating(moving || song, 33);
|
||||
}
|
||||
|
||||
private void label(Canvas c, String s, float x, float y, float size, int colour, Typeface tf, Paint.Align a) {
|
||||
@@ -330,6 +332,165 @@ final class MuertosView extends ClusterCanvasView {
|
||||
}
|
||||
}
|
||||
|
||||
// ---------- What plays: a monarch or an alebrije tows it on a strip of papel picado ----------
|
||||
|
||||
/**
|
||||
* A monarch butterfly (the souls' messengers) and an alebrije (Oaxaca's painted spirit creature)
|
||||
* take turns towing a waving strip of cut paper with the song across the sky between the flags
|
||||
* and the ring, behind the ring and the clock, again and again while something plays. The paper's
|
||||
* colour is one of the flags', fixed by the song. Returns whether it is drawn, so the view keeps
|
||||
* animating for it.
|
||||
*/
|
||||
private boolean drawSong(Canvas c, int w, float u) {
|
||||
if (v.songTitle == null) return false;
|
||||
text.setTypeface(face);
|
||||
text.setTextSize(19f * u);
|
||||
String s = SongBanner.line(text, v.songTitle, v.songArtist, Math.min(560f * u, w * 0.45f));
|
||||
float t = SystemClock.uptimeMillis() / 1000f;
|
||||
float bw = text.measureText(s) + 40f * u, bh = 28f * u, tow = 64f * u;
|
||||
float bx = SongBanner.left(t, w, bw, tow, u);
|
||||
float yc = 106f * u + (float) Math.sin(t * 1.3f) * 2f * u;
|
||||
int paper = PAPER[Math.floorMod((v.songTitle + "\n" + v.songArtist).hashCode(), PAPER.length)];
|
||||
fill.setStyle(Paint.Style.FILL);
|
||||
banner.draw(c, fill, line, text, s, bx, yc, bw, bh, t, u, 14f * u, paper, 0xCC2A0E36,
|
||||
paper == PAPER[4] ? BONE : INK);
|
||||
boolean butterfly = SongBanner.pass(t, w, bw, tow, u) % 2 == 0;
|
||||
float right = bx + bw, cx = right + tow, cy = yc - 6f * u, size = (butterfly ? 40f : 36f) * u;
|
||||
// The tow lines run to the tail.
|
||||
float ax = cx - (butterfly ? 0.4f : 0.6f) * size, ay = cy - (butterfly ? 0f : 0.35f * size);
|
||||
line.setColor(0x99FFFFFF);
|
||||
line.setStrokeWidth(1.5f * u);
|
||||
c.drawLine(right, yc - bh / 2f + 3f * u, ax, ay, line);
|
||||
c.drawLine(right, yc + bh / 2f - 3f * u, ax, ay, line);
|
||||
float flap = (float) Math.sin(t * (butterfly ? 9f : 7f));
|
||||
if (butterfly) monarch(c, cx, cy, size, flap, u);
|
||||
else alebrije(c, cx, cy, size, flap, u);
|
||||
return true;
|
||||
}
|
||||
|
||||
/** A monarch seen from above, flying right: orange wings veined and edged in black, white dots. */
|
||||
private void monarch(Canvas c, float x, float y, float s, float flap, float u) {
|
||||
float k = 0.3f + 0.7f * Math.abs(flap);
|
||||
c.save();
|
||||
c.translate(x, y);
|
||||
for (int side = 0; side < 2; side++) {
|
||||
c.save();
|
||||
if (side == 1) c.scale(1f, -1f);
|
||||
path.reset();
|
||||
path.moveTo(0.3f * s, 0);
|
||||
path.quadTo(0.3f * s, -0.75f * s * k, -0.02f * s, -0.95f * s * k);
|
||||
path.quadTo(-0.45f * s, -0.7f * s * k, -0.1f * s, 0);
|
||||
path.close();
|
||||
path.moveTo(-0.05f * s, 0);
|
||||
path.quadTo(-0.4f * s, -0.55f * s * k, -0.7f * s, -0.4f * s * k);
|
||||
path.quadTo(-0.7f * s, -0.1f * s * k, -0.3f * s, 0);
|
||||
path.close();
|
||||
fill.setColor(0xFFFF8A1F);
|
||||
c.drawPath(path, fill);
|
||||
line.setColor(0xFF1A0A10);
|
||||
line.setStrokeWidth(2.2f * u);
|
||||
line.setStrokeJoin(Paint.Join.ROUND);
|
||||
c.drawPath(path, line);
|
||||
line.setStrokeWidth(1.2f * u);
|
||||
c.drawLine(0.1f * s, 0, -0.02f * s, -0.88f * s * k, line);
|
||||
c.drawLine(0.05f * s, 0, -0.3f * s, -0.62f * s * k, line);
|
||||
c.drawLine(-0.1f * s, 0, -0.62f * s, -0.36f * s * k, line);
|
||||
fill.setColor(0xFFFFFFFF);
|
||||
for (float[] d : new float[][] { { 0.14f, -0.74f }, { -0.1f, -0.88f }, { -0.3f, -0.72f }, { -0.62f, -0.36f } }) {
|
||||
c.drawCircle(d[0] * s, d[1] * s * k, 1.6f * u, fill);
|
||||
}
|
||||
c.restore();
|
||||
}
|
||||
fill.setColor(0xFF1A0A10);
|
||||
r.set(-0.4f * s, -0.07f * s, 0.35f * s, 0.07f * s);
|
||||
c.drawOval(r, fill);
|
||||
c.drawCircle(0.38f * s, 0, 0.08f * s, fill);
|
||||
line.setColor(0xFF1A0A10);
|
||||
line.setStrokeWidth(1.5f * u);
|
||||
c.drawLine(0.42f * s, -0.04f * s, 0.62f * s, -0.2f * s, line);
|
||||
c.drawLine(0.42f * s, 0.04f * s, 0.62f * s, 0.2f * s, line);
|
||||
c.restore();
|
||||
}
|
||||
|
||||
/** An alebrije flying right: a painted horned creature with feathered wings and a curled tail. */
|
||||
private void alebrije(Canvas c, float x, float y, float s, float flap, float u) {
|
||||
int[] feathers = { TURQUOISE, GOLD, PINK, MARIGOLD, PAPER[4] };
|
||||
c.save();
|
||||
c.translate(x, y);
|
||||
// The wing, behind the body: feathers fanned from the shoulder, lifted and dropped by the flap.
|
||||
for (int i = 0; i < feathers.length; i++) {
|
||||
c.save();
|
||||
c.translate(-0.05f * s, -0.2f * s);
|
||||
c.rotate(-125f + flap * 30f + i * 15f);
|
||||
r.set(0, -0.07f * s, 0.8f * s, 0.07f * s);
|
||||
fill.setColor(feathers[i]);
|
||||
c.drawOval(r, fill);
|
||||
line.setColor(INK);
|
||||
line.setStrokeWidth(1.5f * u);
|
||||
c.drawOval(r, line);
|
||||
c.restore();
|
||||
}
|
||||
// The curled tail.
|
||||
path.reset();
|
||||
path.moveTo(-0.4f * s, 0.05f * s);
|
||||
path.cubicTo(-0.8f * s, 0.1f * s, -0.85f * s, -0.3f * s, -0.6f * s, -0.35f * s);
|
||||
line.setColor(PINK);
|
||||
line.setStrokeWidth(0.1f * s);
|
||||
c.drawPath(path, line);
|
||||
fill.setColor(GOLD);
|
||||
c.drawCircle(-0.6f * s, -0.35f * s, 0.07f * s, fill);
|
||||
// Legs.
|
||||
line.setColor(INK);
|
||||
line.setStrokeWidth(3f * u);
|
||||
c.drawLine(-0.25f * s, 0.15f * s, -0.3f * s, 0.42f * s, line);
|
||||
c.drawLine(0.15f * s, 0.15f * s, 0.2f * s, 0.42f * s, line);
|
||||
fill.setColor(GOLD);
|
||||
c.drawCircle(-0.3f * s, 0.43f * s, 0.05f * s, fill);
|
||||
c.drawCircle(0.2f * s, 0.43f * s, 0.05f * s, fill);
|
||||
// The body, painted with stripes and dots.
|
||||
r.set(-0.45f * s, -0.2f * s, 0.35f * s, 0.2f * s);
|
||||
fill.setColor(PINK);
|
||||
c.drawOval(r, fill);
|
||||
line.setColor(INK);
|
||||
line.setStrokeWidth(2f * u);
|
||||
c.drawOval(r, line);
|
||||
line.setColor(TURQUOISE);
|
||||
line.setStrokeWidth(0.05f * s);
|
||||
path.reset();
|
||||
path.moveTo(-0.35f * s, 0f);
|
||||
for (int i = 1; i <= 6; i++) path.lineTo((-0.35f + 0.1f * i) * s, (i % 2 == 0 ? 0f : -0.07f) * s);
|
||||
c.drawPath(path, line);
|
||||
fill.setColor(GOLD);
|
||||
for (float[] d : new float[][] { { -0.3f, 0.1f }, { -0.1f, 0.12f }, { 0.1f, 0.1f }, { 0.25f, 0.05f } }) {
|
||||
c.drawCircle(d[0] * s, d[1] * s, 0.035f * s, fill);
|
||||
}
|
||||
// Horns, the head, snout, eye.
|
||||
line.setColor(GOLD);
|
||||
line.setStrokeWidth(3.5f * u);
|
||||
path.reset();
|
||||
path.moveTo(0.35f * s, -0.38f * s);
|
||||
path.quadTo(0.2f * s, -0.55f * s, 0.3f * s, -0.78f * s);
|
||||
path.moveTo(0.5f * s, -0.38f * s);
|
||||
path.quadTo(0.65f * s, -0.52f * s, 0.55f * s, -0.78f * s);
|
||||
c.drawPath(path, line);
|
||||
fill.setColor(MARIGOLD);
|
||||
c.drawCircle(0.42f * s, -0.22f * s, 0.2f * s, fill);
|
||||
line.setColor(INK);
|
||||
line.setStrokeWidth(2f * u);
|
||||
c.drawCircle(0.42f * s, -0.22f * s, 0.2f * s, line);
|
||||
r.set(0.5f * s, -0.22f * s, 0.85f * s, -0.06f * s);
|
||||
fill.setColor(GOLD);
|
||||
c.drawOval(r, fill);
|
||||
c.drawOval(r, line);
|
||||
fill.setColor(PINK);
|
||||
c.drawCircle(0.8f * s, -0.15f * s, 0.035f * s, fill);
|
||||
fill.setColor(BONE);
|
||||
c.drawCircle(0.45f * s, -0.28f * s, 0.07f * s, fill);
|
||||
fill.setColor(INK);
|
||||
c.drawCircle(0.47f * s, -0.28f * s, 0.035f * s, fill);
|
||||
c.restore();
|
||||
}
|
||||
|
||||
private void drawBattery(Canvas c, float u) {
|
||||
boolean low = v.socPercent != null && v.socPercent < 20f;
|
||||
float x = 36f * u;
|
||||
|
||||
@@ -0,0 +1,97 @@
|
||||
package com.evsuite.abrp;
|
||||
|
||||
import android.graphics.Canvas;
|
||||
import android.graphics.Paint;
|
||||
import android.graphics.Path;
|
||||
import android.graphics.PathMeasure;
|
||||
|
||||
/**
|
||||
* The strip of paper a creature tows across a style's sky with the song on it, shared by the styles
|
||||
* that show what plays (Halloween's parchment, Día de Muertos's papel picado). The ribbon waves in
|
||||
* the wind: still where the creature holds it, rippling more towards its tail, which is cut as a
|
||||
* swallowtail, and the text follows the waves. The style draws the creature and the tow lines. Keeps
|
||||
* only the paths it reuses between frames.
|
||||
*/
|
||||
final class SongBanner {
|
||||
|
||||
private static final float SPEED = 70f;
|
||||
private final Path path = new Path();
|
||||
private final Path baseline = new Path();
|
||||
private final PathMeasure measure = new PathMeasure();
|
||||
|
||||
/** One pass takes about half a minute; then the creature comes round again from the left. */
|
||||
static float travel(int w, float bw, float tow, float u) {
|
||||
return w + bw + tow + 80f * u;
|
||||
}
|
||||
|
||||
/** Where the banner's left end is at {@code t} seconds. */
|
||||
static float left(float t, int w, float bw, float tow, float u) {
|
||||
return (t * SPEED * u) % travel(w, bw, tow, u) - bw - tow - 40f * u;
|
||||
}
|
||||
|
||||
/** How many times it has crossed by {@code t}, to let two creatures take turns. */
|
||||
static int pass(float t, int w, float bw, float tow, float u) {
|
||||
return (int) (t * SPEED * u / travel(w, bw, tow, u));
|
||||
}
|
||||
|
||||
/**
|
||||
* Draws the banner from {@code bx} to {@code bx + bw}, centred on {@code yc}. {@code tooth} above
|
||||
* zero cuts both long edges in zigzags of that width (cut paper). The text paint is set up by the
|
||||
* caller (typeface and size); its colour and alignment are set here.
|
||||
*/
|
||||
void draw(Canvas c, Paint fill, Paint line, Paint text, String s, float bx, float yc, float bw, float bh,
|
||||
float t, float u, float tooth, int paper, int edge, int ink) {
|
||||
float top = yc - bh / 2f, bottom = yc + bh / 2f, right = bx + bw, notch = 12f * u;
|
||||
float cut = tooth > 0f ? 3.5f * u : 0f;
|
||||
int steps = Math.max(8, Math.round(bw / (tooth > 0f ? tooth / 2f : 12f * u)));
|
||||
path.reset();
|
||||
for (int i = 0; i <= steps; i++) {
|
||||
float x = right - bw * i / steps;
|
||||
float y = top + wave(x, right, bw, t, u) - (i % 2 == 1 ? cut : 0f);
|
||||
if (i == 0) path.moveTo(x, y);
|
||||
else path.lineTo(x, y);
|
||||
}
|
||||
path.lineTo(bx + notch, yc + wave(bx + notch, right, bw, t, u));
|
||||
for (int i = steps; i >= 0; i--) {
|
||||
float x = right - bw * i / steps;
|
||||
path.lineTo(x, bottom + wave(x, right, bw, t, u) + (i % 2 == 1 ? cut : 0f));
|
||||
}
|
||||
path.close();
|
||||
fill.setColor(paper);
|
||||
c.drawPath(path, fill);
|
||||
line.setColor(edge);
|
||||
line.setStrokeWidth(2f * u);
|
||||
c.drawPath(path, line);
|
||||
baseline.reset();
|
||||
for (int i = 0; i <= steps; i++) {
|
||||
float x = bx + notch + (bw - notch) * i / steps;
|
||||
if (i == 0) baseline.moveTo(x, yc + wave(x, right, bw, t, u));
|
||||
else baseline.lineTo(x, yc + wave(x, right, bw, t, u));
|
||||
}
|
||||
measure.setPath(baseline, false);
|
||||
text.setColor(ink);
|
||||
text.setTextAlign(Paint.Align.LEFT);
|
||||
c.drawTextOnPath(s, baseline, Math.max(0f, (measure.getLength() - text.measureText(s)) / 2f), 7f * u, text);
|
||||
}
|
||||
|
||||
/**
|
||||
* How far the banner bends at {@code x}: nothing at the creature's end ({@code right}), up to 7
|
||||
* units at the tail, in waves that run from the creature to the tail.
|
||||
*/
|
||||
private static float wave(float x, float right, float bw, float t, float u) {
|
||||
float along = right - x;
|
||||
return 7f * u * (along / bw) * (float) Math.sin(along / (170f * u) * 2f * Math.PI - t * 5f);
|
||||
}
|
||||
|
||||
/** "♪ title — artist" in the text paint as set, cut with "…" to fit {@code room}; the title gives way first. */
|
||||
static String line(Paint text, String title, String artist, float room) {
|
||||
String a = artist == null ? "" : " — " + cut(text, artist, room / 2.5f);
|
||||
return "♪ " + cut(text, title, room - text.measureText("♪ " + a)) + a;
|
||||
}
|
||||
|
||||
private static String cut(Paint text, String s, float room) {
|
||||
if (text.measureText(s) <= room) return s;
|
||||
int fits = text.breakText(s, true, Math.max(0f, room - text.measureText("…")), null);
|
||||
return s.substring(0, Math.max(0, fits)).trim() + "…";
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user