From c4488a8eb5621bad0bcde9ffab9eb0edbac214bd Mon Sep 17 00:00:00 2001 From: torsten Date: Fri, 30 Oct 2026 09:57:14 +0100 Subject: [PATCH] =?UTF-8?q?feat:=20Native=20Builds=20f=C3=BCr=20Linux,=20W?= =?UTF-8?q?indows,=20macOS=20und=20Android?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Web-Export, Web-Preset und Web-Doku entfernt; Zielplattformen sind nur noch Desktop und Android - Export-Presets mit vollständigen Optionssätzen für Linux, Windows, macOS (universal, ad-hoc) und Android (arm64-v8a, minSdk 24, targetSdk 36, Landscape, Immersive Mode, INTERNET-Permission) - tools/export_linux.sh, export_windows.sh, export_macos.sh, export_android.sh mit gemeinsamen Helfern und tools/verify_apk.sh - tools/setup_android.sh richtet JDK 17, Android SDK, Godot-4.7.2- Templates und Debug-Keystore ein und trägt die Pfade in die Editor-Settings ein (mit Backup) - Eigenes App-Icon (SVG) inklusive Android-Launcher-Icons - ETC2/ASTC-Import für Android aktiviert, Tests/Prototyp/Addon aus dem Export ausgeschlossen - docs/builds.md: Bauen, Installieren per adb, Datenpfade, Release-Hinweise --- docs/architecture.md | 38 ++- docs/builds.md | 144 +++++++++ docs/roadmap.md | 32 +- docs/web-test.md | 95 ------ .../assets/icons/android/ic_launcher_192.png | Bin 0 -> 17000 bytes .../icons/android/ic_launcher_192.png.import | 40 +++ .../android/ic_launcher_background_432.png | Bin 0 -> 1726 bytes .../ic_launcher_background_432.png.import | 40 +++ .../android/ic_launcher_foreground_432.png | Bin 0 -> 13790 bytes .../ic_launcher_foreground_432.png.import | 40 +++ .../android/ic_launcher_monochrome_432.png | Bin 0 -> 6686 bytes .../ic_launcher_monochrome_432.png.import | 40 +++ rinkplanner/assets/icons/icon_foreground.svg | 10 + .../assets/icons/icon_foreground.svg.import | 43 +++ .../assets/images/checkboard.png.import | 5 +- rinkplanner/export_presets.cfg | 278 +++++++++++++++++- rinkplanner/icon.svg | 10 +- rinkplanner/project.godot | 2 +- tools/_export_common.sh | 41 +++ tools/export_android.sh | 43 +++ tools/export_linux.sh | 6 + tools/export_macos.sh | 7 + tools/export_web.sh | 33 --- tools/export_windows.sh | 5 + tools/setup_android.sh | 172 +++++++++++ tools/verify_apk.sh | 55 ++++ 26 files changed, 1007 insertions(+), 172 deletions(-) create mode 100644 docs/builds.md delete mode 100644 docs/web-test.md create mode 100644 rinkplanner/assets/icons/android/ic_launcher_192.png create mode 100644 rinkplanner/assets/icons/android/ic_launcher_192.png.import create mode 100644 rinkplanner/assets/icons/android/ic_launcher_background_432.png create mode 100644 rinkplanner/assets/icons/android/ic_launcher_background_432.png.import create mode 100644 rinkplanner/assets/icons/android/ic_launcher_foreground_432.png create mode 100644 rinkplanner/assets/icons/android/ic_launcher_foreground_432.png.import create mode 100644 rinkplanner/assets/icons/android/ic_launcher_monochrome_432.png create mode 100644 rinkplanner/assets/icons/android/ic_launcher_monochrome_432.png.import create mode 100644 rinkplanner/assets/icons/icon_foreground.svg create mode 100644 rinkplanner/assets/icons/icon_foreground.svg.import create mode 100644 tools/_export_common.sh create mode 100755 tools/export_android.sh create mode 100755 tools/export_linux.sh create mode 100755 tools/export_macos.sh delete mode 100755 tools/export_web.sh create mode 100755 tools/export_windows.sh create mode 100755 tools/setup_android.sh create mode 100755 tools/verify_apk.sh diff --git a/docs/architecture.md b/docs/architecture.md index 39ae1eb..9a3b581 100644 --- a/docs/architecture.md +++ b/docs/architecture.md @@ -160,17 +160,19 @@ Gesetzt in `rinkplanner/project.godot`: | Plattform | Renderer | | :--- | :--- | -| Desktop | `forward_plus` | -| Mobile | `mobile` | -| Web (Wasm) | `gl_compatibility` | +| Desktop (Linux/Windows/macOS) | `forward_plus` | +| Android | `mobile` | + +Ziele sind ausschließlich native Builds; einen Web-Export gibt es nicht +mehr. Details und Befehle: `docs/builds.md`. ### UI-Skalierung (Touch-first) -`window/stretch/mode="disabled"`: Die Oberfläche wird in realen Fenster- bzw. -CSS-Pixeln gelayoutet. Zusätzlich setzt der Controller -`Window.content_scale_factor` auf die Bildschirm-Skalierung -(`DisplayServer.screen_get_scale()`). Damit entspricht eine Layout-Einheit auf -Tablets einem CSS-Pixel und wird trotzdem in Gerätepixeln gerendert: +`window/stretch/mode="disabled"`: Die Oberfläche wird in realen Fensterpixeln +gelayoutet. Zusätzlich setzt der Controller `Window.content_scale_factor` auf +die Bildschirm-Skalierung (`DisplayServer.screen_get_scale()`). Auf dem +Tablet (DPR ≈ 2,6) entspricht eine Layout-Einheit damit einem CSS-Pixel und +wird trotzdem in Gerätepixeln gerendert: - Ein 56-px-Button ist auf dem Tablet wirklich 56 CSS-Pixel groß, statt durch eine feste Designauflösung kleingerechnet zu werden. @@ -185,7 +187,7 @@ Tablets einem CSS-Pixel und wird trotzdem in Gerätepixeln gerendert: Werkzeug-Label entfallen, das Sections-Panel wird 260 statt 300 px breit. - Die Timing-Leiste ist ein `HFlowContainer` und bricht bei Bedarf um, statt seitlich abgeschnitten zu werden. -- Geprüfte Landschaftsbreiten: 1024 px (iPad-Landscape) und 1400 px +- Geprüfte Landschaftsbreiten: 1024 px (kleine Tablets) und 1400 px (Galaxy Tab S9+). Hochformat ist noch nicht gestaltet. ### Zeichen-Cache @@ -224,11 +226,14 @@ ggf. eines nach `touchend` (300-ms-Guard). - **Autosave** schreibt nach 1,5 s Inaktivität nach `user://autosave.tres` und wird beim Start automatisch wiederhergestellt. Der Dirty-State wird im Fenstertitel als `*` angezeigt. Beim Verlassen wird zusätzlich gespeichert. -- **Web:** `FileAccess` schreibt in den IndexedDB-Speicher. Im echten - Chrome-Touch-Test auf einem 1024-px- und einem 1400-px-Layout (DPR 2) - überlebt die Kür einen Browser-Reload. -- **Web-Build:** `tools/export_web.sh` exportiert nach `build/web/` - (single-threaded, kein COOP/COEP nötig). Details in `docs/web-test.md`. +- **Builds:** Linux, Windows, macOS und Android über + `tools/export_*.sh`; Presets in `rinkplanner/export_presets.cfg`. + Android nutzt das Template-Export-Verfahren ohne Gradle-Projekt, + `arm64-v8a`, `minSdk 24`, `targetSdk 36`, Landscape und Immersive Mode. + Details in `docs/builds.md`. +- **Lokale Daten:** `user://` liegt pro Plattform getrennt (Linux + `~/.local/share/godot/app_userdata/Rinkplanner/`, Android im + app-internen Speicher). Ein Kontosync ist noch nicht implementiert. ## 7. Tests @@ -300,8 +305,9 @@ Viewport-Screenshot; sie ersetzen die headless Tests nicht. rotierende Backups oder Versionen pro Speichervorgang nötig sind, zeigt sich im Praxisbetrieb. 9. **Dateinamen:** Die Normalisierung ersetzt Leerzeichen und entfernt - Pfadzeichen, transliteriert aber keine Umlaute. Für Web/Windows ist zu - prüfen, ob eine ASCII-Normalisierung robuster ist. + Pfadzeichen, transliteriert aber keine Umlaute. Für Windows und den + geplanten FTP-Sync ist zu prüfen, ob eine ASCII-Normalisierung robuster + ist. 10. **Snapshot-Clone:** `_clone_routine()` kopiert die Modellfelder manuell. Neue Felder am Modell müssen dort ergänzt werden, sonst fehlen sie in Undo/Redo-Snapshots. diff --git a/docs/builds.md b/docs/builds.md new file mode 100644 index 0000000..51b43fe --- /dev/null +++ b/docs/builds.md @@ -0,0 +1,144 @@ +# Builds: Desktop und Android + +Rinkplanner wird als **Desktop-Anwendung** (Linux/Windows/macOS) und als +**Android-App** gebaut. Einen Web-Build gibt es nicht mehr: Die App braucht +lokalen Dateizugriff, ein eigenes Fenster und später einen Kontosync, der +nicht von Browser-Speicherlimits abhängt. + +## Übersicht + +| Ziel | Preset | Ausgabe | Größe (ca.) | +| :--- | :--- | :--- | :--- | +| Linux x86_64 | `Linux` | `build/linux/rinkplanner.x86_64` | 77 MB | +| Windows x86_64 | `Windows` | `build/windows/rinkplanner.exe` | 113 MB | +| macOS universal | `macOS` | `build/macos/rinkplanner.zip` | 64 MB | +| Android arm64 | `Android` | `build/android/rinkplanner-debug.apk` | 31 MB | + +Die PCK ist bei Linux und Windows **eingebettet** (eine Datei zum +Weitergeben). `build/` ist nicht versioniert. + +## Voraussetzungen + +- Godot **4.7.2** (oder `GODOT=/pfad/zu/godot` setzen) +- Export-Templates derselben Version unter + `~/.local/share/godot/export_templates/4.7.2.stable/` +- Für Android zusätzlich JDK 17 + Android SDK (siehe unten) + +## Desktop bauen + +```bash +./tools/export_linux.sh +./tools/export_windows.sh +./tools/export_macos.sh +``` + +**Windows:** Icon und Versionsinformationen sind deaktiviert +(`application/modify_resources=false`), damit der Export ohne `rcedit` auf +Linux läuft. Wer das will, installiert `rcedit` und schaltet die Option im +Preset ein. + +**macOS:** Das Bundle ist ad-hoc signiert, aber **nicht notarisiert**. Beim +ersten Start auf einem Mac: + +```bash +xattr -cr Rinkplanner.app +open Rinkplanner.app # ggf. Rechtsklick → Öffnen +``` + +Für eine verteilbare App ist eine Signierung mit Developer ID und +Notarisierung auf einem Mac nötig (Preset: `codesign/codesign=3`). + +## Android + +### Einmalig: Toolchain einrichten + +```bash +./tools/setup_android.sh +``` + +Das Skript (idempotent, ca. 1,6 GB Download): + +1. Temurin **JDK 17** → `~/.jdks/temurin-17` +2. Android **command-line tools** → `~/Android/Sdk` +3. `platform-tools`, `build-tools;36.0.0`, `build-tools;35.0.0`, + `platforms;android-36` +4. Godot-**4.7.2-Export-Templates** +5. **Debug-Keystore** → `~/.local/share/godot/keystores/debug.keystore` +6. Trägt `java_sdk_path`, `android_sdk_path` und `debug_keystore` in + `~/.config/godot/editor_settings-4.7.tres` ein (Backup als `.bak`) + +### APK bauen + +```bash +./tools/export_android.sh # Debug-APK +./tools/export_android.sh debug --install # bauen + per adb installieren +``` + +Ausgabe: `build/android/rinkplanner-debug.apk` + +Prüfen (Paketname, Version, SDK-Stufen, ABI, Landscape, Signatur): + +```bash +./tools/verify_apk.sh +``` + +`aapt2` warnt beim Debug-APK über ein ungenutztes `mipmap/themed_icon` aus +dem Godot-Template. Das Manifest referenziert nur `@mipmap/icon`; die Warnung +ist folgenlos. + +- Paket: `de.rinkplanner.app`, Label „Rinkplanner“, Version 0.1.0 +- App-Icon aus `rinkplanner/icon.svg` (Launcher-Icons unter + `rinkplanner/assets/icons/android/`) +- `minSdk 24`, `targetSdk 36`, ABI **arm64-v8a** (Galaxy Tab S9+) +- Landscape, Immersive Mode, `resizeableActivity=true` +- Berechtigung `INTERNET` (für den späteren Sync) +- Template-Export ohne Gradle-Projekt (`gradle_build/use_gradle_build=false`) + +### Auf dem Tablet installieren + +1. Auf dem Tablet: Einstellungen → Info zu Tablet → 7× „Buildnummer“ → + Entwickleroptionen → **USB-Debugging** an +2. Tablet per USB anschließen, „Dateizugriff zulassen“ bestätigen +3. `adb devices` prüfen, dann + +```bash +~/Android/Sdk/platform-tools/adb install -r build/android/rinkplanner-debug.apk +``` + +Alternativ die APK direkt aufs Tablet kopieren und dort öffnen +(„Unbekannte Quellen“ erlauben). + +### Wo liegen die Daten? + +Godot schreibt `user://` pro Plattform getrennt: + +| Plattform | Pfad | +| :--- | :--- | +| Linux | `~/.local/share/godot/app_userdata/Rinkplanner/` | +| Windows | `%APPDATA%\Godot\app_userdata\Rinkplanner\` | +| macOS | `~/Library/Application Support/Godot/app_userdata/Rinkplanner/` | +| Android | App-interner Speicher (`/data/data/de.rinkplanner.app/files/`) | + +Dort liegen `routines/`, `autosave.tres` und `exports/`. Die Android-Daten +sind ohne Root nicht direkt sichtbar – der Export-Dialog der App schreibt +nach `user://exports/`, von dort kann man Dateien über einen Dateimanager +mit App-Zugriff oder `adb pull` holen: + +```bash +adb shell run-as de.rinkplanner.app ls files/ +adb exec-out run-as de.rinkplanner.app cat files/routines/kuer.tres > kuer.tres +``` + +## Release-Builds + +- **Android Release:** eigener Keystore nötig; im Preset + `keystore/release*` setzen und `./tools/export_android.sh release` bauen. + Der Debug-Keystore ist nur zum Testen. +- **Windows/macOS:** siehe Hinweise oben (rcedit, Codesign/Notarization). + +## Nächster Schritt: Kontosync + +Geplant ist ein manueller Sync über FTP: Ein Button lädt die neuesten +`.tres`-Dateien je Kür hoch bzw. herunter, Konflikte bleiben als Kopien mit +Zeitstempel erhalten. Zugangsdaten liegen in den App-Einstellungen +(`user://`), nicht im Repository. diff --git a/docs/roadmap.md b/docs/roadmap.md index 2f88996..d7b7291 100644 --- a/docs/roadmap.md +++ b/docs/roadmap.md @@ -50,16 +50,30 @@ Voraussetzung für Phase 1. - [x] Export-Tests: Geometrie, Section-Reihenfolge, Sichtbarkeit - [x] Export-Dialog mit Dateiname, Format und Umfang -### Nächster Schritt: Touch-/Tablet-/Web-Härtung +### Erledigt: Builds -- [x] Web-Export mit Compatibility-Renderer (`tools/export_web.sh`) -- [x] Touch-Ziele auf 56 px erhöht, Chrome-Doppel-Segment-Guard -- [x] Kleine Displays (1024 px) und kompakte Leiste geprüft -- [x] Performance bei vielen Segmenten und Sections (Cache + Stresstest) -- [x] Persistenz auf Web/IndexedDB verifizieren (Reload-Test) +- [x] Linux-, Windows- und macOS-Preset plus `tools/export_*.sh` +- [x] Android-Toolchain-Setup (`tools/setup_android.sh`), Debug-Keystore +- [x] Signiertes Android-Debug-APK (arm64-v8a, Landscape, minSdk 24) +- [x] Web-Export entfernt; Zielplattformen sind nur noch Desktop + Android - [ ] Test auf echtem Tablet (Galaxy Tab S9+) - [ ] Hochformat-Layout (nur prüfen, falls benötigt) -- [ ] Optional: iPad/Safari-Test +- [ ] Release-Keystore für ein verteilbares APK + +### Erledigt: Touch-/Tablet-Härtung + +- [x] Touch-Ziele auf 56 px erhöht, Guard gegen emulierte Maus-Events +- [x] UI-Skalierung in CSS-Pixeln (DPR-korrekt), kompakte Leiste < 1280 px +- [x] Kleine Displays (1024 px) geprüft +- [x] Performance bei vielen Segmenten und Sections (Cache + Stresstest) + +### Nächster Schritt: Kontosync (Desktop ↔ Tablet) + +- [ ] Sync-Einstellungen in der App (FTP-Host, Port, Benutzer, Passwort, + Verzeichnis), Zugangsdaten unter `user://`, nicht im Repo +- [ ] Manueller Sync: neueste `.tres` je Kür laden/hochladen +- [ ] Konflikte als Kopien mit Zeitstempel behalten +- [ ] Automatischer Sync und Sync-Status in der Oberfläche (später) ### Danach: Element-Marker @@ -81,8 +95,8 @@ Voraussetzung für Phase 1. - [ ] Optional: Segment-Verknüpfung beim Verschieben von Endpunkten - [ ] Optional: Section-Timeline mit Zeitproportionen -Die Reihenfolge ist bewusst: erst Touch-/Web-Basis, dann sichtbare -Element-Marker, dann die vollständige ISU-Logik. +Die Reihenfolge ist bewusst: erst native Builds und Datenaustausch, dann +sichtbare Element-Marker, dann die vollständige ISU-Logik. ## Querschnittsaufgaben diff --git a/docs/web-test.md b/docs/web-test.md deleted file mode 100644 index f059f75..0000000 --- a/docs/web-test.md +++ /dev/null @@ -1,95 +0,0 @@ -# Web-/Tablet-Test - -Zielgerät: **Samsung Galaxy Tab S9+**, Android, Chrome, Landscape. -Zusätzlich geprüft: **1024 × 768 CSS-Pixel** (iPad-Landscape-Größe) und -Desktop-Chromium. - -## 1. Voraussetzungen - -- Godot 4.7.2 (oder eine kompatible 4.x-Version) mit installierten - **Web-Export-Templates** derselben Version. -- Auf diesem Rechner waren bei der Einrichtung nur die 4.6-Web-Templates - installiert; der erste Testbuild lief deshalb mit Godot 4.6. Für den - finalen Build die 4.7.2-Templates über den Godot-Editor installieren - (`Editor → Manage Export Templates`). - -## 2. Web-Build erzeugen - -```bash -./tools/export_web.sh -``` - -Das Skript importiert das Projekt und schreibt den Build nach: - -``` -build/web/index.html -``` - -`build/` ist nicht versioniert. Der Export ist **single-threaded** und braucht -keine COOP/COEP-Header. Der Web-Renderer ist `gl_compatibility` (WebGL 2). - -## 3. Lokal testen - -```bash -python3 -m http.server 8000 --directory build/web -``` - -Auf dem Tablet im gleichen WLAN öffnen: - -``` -http://:8000/ -``` - -Die IP z. B. mit `ip addr` oder `hostname -I` ermitteln. - -## 4. Testcheckliste auf dem Tablet - -- [ ] Start im Landscape-Modus, Canvas füllt den Bildschirm -- [ ] Ein-Finger-Ziehen zeichnet genau ein Segment (kein Doppel-Segment) -- [ ] Zwei-Finger-Ziehen pannt -- [ ] Pinch zoomt -- [ ] Tippen im Modus „Auswählen“ wählt ein Segment -- [ ] Start-/Endpunkt- und Bogen-Griffe lassen sich mit dem Finger ziehen -- [ ] Richtung/Kante über die Toolbar ändern -- [ ] Sections anlegen, wechseln, umbenennen, sortieren -- [ ] Timing-Leiste: Dauer/Tempo ändern, Profil wählen, Kalibrieren -- [ ] Playback: Start/Pause/Reset, Timeline-Scrub, Geschwindigkeit -- [ ] Speichern/Laden über das Datei-Menü -- [ ] Autosave: Seite neu laden → Kür ist wieder da -- [ ] SVG- und PNG-Export erzeugen und Datei öffnen -- [ ] Keine abgeschnittenen Buttons, kein horizontales Scrollen - -## 5. UI-Skalierung im Browser - -Der Web-Build läuft mit `window/stretch/mode="disabled"`. Godot legt das -Canvas in Gerätepixeln an (bei DPR 2 also 2800 × 1580 für 1400 × 790 CSS). -Der Controller setzt deshalb `Window.content_scale_factor` auf -`DisplayServer.screen_get_scale()` (im Browser = `devicePixelRatio`). Damit -gilt: - -- Layout-Einheit = CSS-Pixel; ein 56-px-Button ist 56 CSS-Pixel groß. -- Rendering bleibt scharf (2× Backing Store auf dem Tablet). -- Ab 1280 CSS-Pixel erscheinen die vollen Beschriftungen, darunter die - kompakte Leiste („Undo“, „Redo“, „Kalib.“, ohne Titel). - -## 6. Bereits geprüft (Chromium, echtes Touch-Event) - -- WebGL2/Compatibility-Renderer startet ohne Konsolenfehler -- Ein Chrome-Touch-Drag erzeugt genau **ein** Segment; das synthetische - Maus-Event vor `touchstart` wird verworfen, ein spätes nach `touchend` - ebenfalls (300-ms-Guard) -- Autosave/IndexedDB: Reload stellt die Kür wieder her (1024 und 1400 px) -- Layout bei 1024 × 768 (kompakt) und 1400 × 790 (voll) ohne Abschneiden -- Touch-Ziele 56 × 56 px; Menü/Undo/Redo sind Textbuttons, damit - Web-Font-Fallbacks keine Kästchen erzeugen -- Performance: 480 Segmente / 12 Sections ≈ 7–10 ms pro Redraw (headless, - ohne GPU-Zeichnung) - -## 7. Bekannte Grenzen - -- **Hochformat** (< 1024 px Breite) ist noch nicht gestaltet; die - Werkzeugleiste wäre dort zu breit. Ziel bleibt Landscape. -- Safari/iOS ist noch nicht getestet. Der Build ist thread-frei und nutzt - WebGL2, also grundsätzlich lauffähig; separat zu prüfen sind - Touch-Event-Reihenfolge, IndexedDB-Limits und Safe-Area im Landscape. -- Audio wird in Phase 1 nicht genutzt. diff --git a/rinkplanner/assets/icons/android/ic_launcher_192.png b/rinkplanner/assets/icons/android/ic_launcher_192.png new file mode 100644 index 0000000000000000000000000000000000000000..6e3295abe52ec9560dadfa570465a99b4e619e71 GIT binary patch literal 17000 zcmXt=Wmp?+(}vOD#l5(@yIXp3R z$?o1WJJ(!uZlY9`Wzmp{kfETU(B$Q$)giBa|2+@^kZ1J`I|RrJw5z(TBvjqh=Tj&s zawvIe2~E$O^KP9KgFC;=r>D0MAAYG^qLL&GqAKd3F9~oa>;x*t6T)DPJ+Ps(%e=gx zJYBcL&&$D!h_1gH_5P_m0Sd;)_lCP;#9<>H9nzekdqn-hT0+Q{f(X~;1!FG;5BW8h(J?P0i^ zYLPiV<@Bu;M~Vbn@HGl64WN?lpa9sT?x0GgW5tm{5)B}A)4rX^PYrmb+-o;cXV}tr zr=8gR5ozlbjvor^5vd47UCL%uhvnsCy}1rj7Ors)`~gOzp1`5CAPzNlW~ zWfc!Q@hhEk2V$vG!hCC3GFDgc{tGRR17w)%_(HTyqDG6xE`MJsfTXl;G=+j0)PPQW zYc4C-PlOSZ2BqSA{#hFdkBLaSt9Lb}NJ$4!qn%}&a^$`91#@*r^s0JmoE4ACE{5Ek ztYN-H*i8LJ&`A}^EEr5qfQ5<_+)|+ZpCteHSux?zcu z5@$?7-Ytk;iL(~UxKDED>2Zuoz7Ldwh>W2IE@JM(V$RpPVvw%GGa(m}etPS1HeeP6 z6#&3XoM`UtN>5g?zW4{RiEs*gAt2jYHOk=|VN-B_9=)*;Lb<)@24{6!jL$$F|@~E5vfSL62HLbkO(VwN^rspGh=wW+UDPgSF_|F29 z6ap|QnAs!{aG7D2$ayDy9ln)?gFzT@wy% z4K1)*aXNNyu;%`GfLY^DC~G*{DFX4A9bEYu2@GKx*InunxUt+|i5MJ_i?^tytpGLP z+pqv#_xxK>3wOhR?wW<`p0kr!H`CUHMk5!h4%zS2cr*Os|*G(}$B6&13g z81*~n{xu5pLcYJ73qZlX>;=8dxy~Sm?r>!ASMz<=bR)J#}Q33 zQ3wrOtU9uat?;2fhF+C(9B}-FsXFn6&UOdGPYA+BRP!KSB+U7EG#C;>uDv#pCj5Y)CjpRENS`rKdz^ zRH>cGi%N+Fpsj$Y9E-m>&e1>_#H0sj;{ z7OqN;5Kbp|L8*xQ-u%me*%z_SQ<=(+B2~|Bpf87ysmN{SGRiom2+>zLfi1Fu`X$(5 zpgJb(6Rgf`c`2%5^pP8TRKMp~3H@2ks|8HHOPiP%v0r;*X-rtWZ;LYJm?2Hx8;)r@ zkveLWI!q-;0&NXKry$o`m$D;%41Dd9sWejBg>_a9-!OTk+8EW>ENIL+>+G!=8T^<} zrV`R=k-vF>l}YN1YQT_t0xi;IscKN2?eq7>4D!G+OLU#uTQ}V^lTytuCutPSe4Kpk zg!LaIS5CY*3XW~MIA-WUa_ zx|)&MXGUfbL*7!a3gU;;JuGovezk_RPkQ#E2Ne1-POC$r&8$C9ppF!MOyE~+g==cy zPA{^=4fNF;G{v>5?3|-}V*Er6zRyCp#5{>6P{7xGIq3#jEy&=LNE5@#ku`h?x|r6o zganTQVjChVz5exh?{BMl8T{NYP${?$5?H+9dM@c6 zx}{TI>|uprVJ@b=8tBiRaEjxnbN@u08KQ~%ZzK8rB5c*jzHm*0$hl!M0j;_kU6FfibtDT7-bS~_@QLKyJiVflmkK(=!8IHfoy1f1+M zKQ4XfOJ{WpQzUKUrtsu35<3eC)7fiUORS?g{=S!1T6f3qXV6DiEZPv5ZFFO&)(&-D zeLV@bfTFwGl#-iIp_Z3Rf}6M7(`K|=aiY<--yE=DN}FBYR&jJBO9i68y>;I{Jj~C} zOBG@irOXqM2-@}~t>U@1Mf_gXi=eJHw-x6jQYtGi&&*K@mptM#c-^YCk(QO?ApK`_K z5m=ZX&{I*3c%FgjWq*(!?hr?02=aW&D+94&hf@q^z>lD+8#cL1WkE)q8|KYER-4zMgi{;*6>WXU!X= z?t=jrc`3BMzA}YcHaa!>q}=J`?5|m8&>Ai-@Z)q68~c2#J3`xNbMj`oyRSbaf`C|P zXkh_IJ}Jk-kQIj(gn^n6*FLN}er|_rre4=$!}K8LMCP&OCUmx3Kd38Jsad3oIJ>5U zX^m{1m4`dZ?-Me`?7Kfff&^pNt?Ye8Zh1+{FL0#%edw@4NpD75KPbhgAH6e;bYW_*pYU~jX$hp`@5PPIR54geH;&;L*!4 z68`a}xc?k%4Sajs@Z5LXa2j;m_&y(Jx7`?5UH=(oqu37S&ReoOuONjI5hfZwZd!Qk zG1YfslymV*h^Oi2Kx5-T_0m|~ES@9Wv5zVI?*IUw_Af%6KX(LXsCma~l{f@7I2b$8 zi{pf!^~Z+Mw6FJKx>h=G;N360GfT9JXVw)6!l~u272>};b6oNSb_EUW?5Njuy9+&R zxY9jrdGJY%BV@!gtKlS;G2|WRaBeS0@}F+o@mh0dft@!vbJr&6ZS9Y>M7i)_$o{w; z%t+jBEvwOuK*e;PyUZzNH)`ugv7{z`fz>?zoVxKkt6Q8ZX;!ZJVO8z;(Hh6^8Cr6gdFLv2zd;IYcZWuJcezM~B%9xRkN)Ft(<^g78a1Vg0Rdi47Ndhvl!mMD*o#q{6h)#hWjcv6umFc=OJsiUI| zWo2cYvh`6MfW@F9P(Kz0POU|E)T*he)(TD_cF}6J?~EW(!YEm%JOGvV&lE>&z?-oe5ne{*v)SWUWBYlPQ^KZK!hQm8vY zJMCh#(GrmX2PLC#^L=nK!yt}U)|#`u&*XS&BvAtME3-NyE(6|%|7w$jR=v&;B%28g zg(k9iszL1zEZPRGnN8tYLEa)ovvLfn(KY(ICW~{(At4G3c*w%HGh&Ul%S_zam?kGl z);BCbZbxo$(qwmeLaEaB2$J>of8_zsvKwy87gNKIUqEL6e9^a;K`2~Y&5C)MrXTOH z!cPl7ypF8ItjrGx_RZ+}iGtNDaRu$siv{V>1yhl*$(vMhR!WS!!oQA@Jak|hDw*U5 z=`i68xzqC<*KO+RhOYMT4Pz`4L!s7zriSB)ANvsMj@#BnhnH%z8B&3oj26-bs}tAk z!;q^}10Jc@fspTAb-?srZKM5(OnKxm7}rvU8`zt0=$0iGSIg5K^}ika?(bLVy}!}; z?C9b*t%~RebYs+`fuqN_-*d^{ujG5~CS|=2Q#W%2xa7MH>EzYtxJMBUt#~B7NM`gG zijy(O2Y8GfuS0ExO;TL~#4L9X!A)$96XuF@rx9}wMF%hU9Xq3 zOG6Z%4(P~sVvJs4_#C$3#Cf9Sl0scNrFZ(H8o7j@4qS!bZn=a%UKNBtHc+Iw_QfL^ z@&5T8|2otyjWLQBK41L=xxTn1QM1DN{lVEEL3iB)6O6=@S{+XvKRw!$nT_zQgG5(k zO^q$f;*YJ<(qKhh=6P_C1ArKC!tamh896y%f{@FXo4wVOf|U;=wtIQ{Qb_H(eYkUe z*z~xT4R}S+@AbpxO0=k2>wEAUV3%g#e?KBnc|S3FnoEB-BK3b%gQVRTg7B1=G>jDB zW6w5b`F%H~QS>|lAhkgfsauC(t|g2E7JJwlDS$K+QQ(?fs!+cSbUH#X7zB&p_1=k3 zKtfWi&&t(co)FZ-3GAYvva+-RT{QbIa;7o&#&TIrv2(h_u8uMcm^O|>b%JMgOcw9> zUI77j+5w{o_1)2#zc+LE(xM9`7utAA zaZHH{(kTCzYIh<&QOTi&yRFPdb5f=`_lvsNdLX`*V2kux<7wM^*V{)u$VF?8yZZ#* z4L=pycbhJnvZ|R!^tMp%v03Z|+oAi;QrNg^jXd7$`572^m0TXszx>`C@pxaneYle+ zl2C@jgxj)&|3=$G%nSg0lg%qx(4Ei7Gx7bNvR`bbsHBXEH;#%{ThzY8Vc;gJ<9On_ zS~XsId+&0-;{2({8Kaat@6tfC&}|md%SRR=Vl36_jgx)+BfCCT*;dIKu%jAy@ble9 z2*uCa9!h^dV)8xPmCek`Dw~;?YAm1YXPh!3i;06?Q~O)HgNvLa>X+sBa?i!XGnvIB zRip1l7&&~yt+5CIdf9Ds1o20&_I{w1Sy@IF@%v2SBjATYUlS$&IpwMWwI=mGSNHDB z=lds+j}!4`D_JcgC|?JhI`$0w2zb>fqgBSnLCzK3e1MP1gm!6`V~}apJv>-pP>%c2 zY4%9Nso?djHKhvO+B zN2?+6%qSZ;@lJh7IQL7jiGYvcLEp=NWU9G&5)l$ip}a=+Zwi=8KWRK$>0|#1c3-N$ zGBOIYfyuixiQNUS5c6lFxh-=y@k}` zyyMOU5317o-XAYy9m{w4zg`)G^;0k>NzgK45GO5@$q_rAt7`w#4yY_-;tUnbe;#|v z+7Fstk6mBiw#C5jelO6vN_Ykn0S9HV$JTw<&u2bQYs>FJ$9X=9TS+Py-yljbFPuq> zf3v*j*p<1l^!$V`9zv{d&~7fux2i#44_Vn zb|sUep6Up87-up4bZS^iqGo^{2Ote5aHB{b-o11xn@S9n@jb<;je>;yqrLhphB@IfqMN( z#H%}tsM)8Hg$U?37~Ivc+fXz&{CWMH0UTKId)NO)urU2G4AC?U>B9w`Wo zxX%3MC=M<)NUK@BdO=?)oOV z{MTsa_c3BvSVE;n`AX}V1te)B33R^}a!i@8^}N|E)sfJ~?+=YYJxMoG%M%b84&Gnr zK}s2SCR3BQ{WNKw@1GG!?LmS=VH{r{>P5Fj^CZQ_w(|T_Np|zxLj`9NcX0o(YB+6$f08W|W^LCsN%}yfZu1X)eaE8=V&+z25(?=|P)10qSzpQpsqTUc= zM8>LMhZHUI=T1<}=Lr8?>r zOk=ApXszZ*uX!?q2$C;f;uEP)e^ugM?!5)Irja8;3e#XjJiDOaQCR|G)0XM(HLe1v z_1fjt1*x>eOm`=kD=-pcgu{fO$zt3xJR;)yNmb{g-qu*m#XR(1V{(ag@Ug)LazE>q z5y&>T6Pqr!=ZRJ}K9*g_-W0X=svV)mfN$c6B^z-tfj(LY3-jj=YC(#*(k#V)JrYFB zL^c<6Uijar;Cj3bT~c&Q%#R1dU0qB;fmqSbwpq&`gLOE^2KP6|`8b?Yy|e z5^5qx6&d^r_)R70 z-#Kv-rDnL^4S8RpV$(++#;?1(2IQQH5>TEyill!f-i2t43bcNHerb+^X6-+e;x)bG zFCQN1GMSc%{Ut4FYvSu0Y$p2y(hrb&-EX7s}`QGq_=?DF#Z92CkH zT$a=n)Ekb412Q2$_BR_F~%rcFS(LE&uPN~`gtAQfR+xzj;gor^Ecn2x*=B~ zJB7jJ>aSBd0#aF1nc~9)WAKxG;sHwp$#YTFm#VFqTtVL6-cVD~*92x2iyJjlL*_88 zD%*<9epFrOKi!h$n@8CkYP!Oz!YtQ=NnEDd63on=sI-9+8|LorZK>yD%|oIy^Yh6% zFu9#;Q_?{h*^;ONuySW^#k+t-R;)EK1@HEHc_fF$ECPrrKKWO|lm(Me3dGl>-D(}J zuXKE-%c}V$BYT8s-j27?esxQq9xn!7TEP7hPUL&t7C&(jocTDG#SaeRiM39NH+(>6 zC2U=Ny9u=I?4D&{-CToos3=X%e1jnhED*!EwykD4&8)|1O?**TnULRt8GG0=OX>4#SdljL8sN~K1vsKP^i`{{FT6yxjM8< zrscD0L8J+yjCT%iIU*t-lK*JLxu*?3rW|B59nbdKX8HTFrc?tT;^DcGgcLSZ4vj|$ zC+q7*&eiw#FsQP7?oURK;zT1TG6&BoZZ{|BHr8cAaY< zFgzfSLfdK;#x=beVirstka$s(+nfkrE>VXbiVo)_-1T$7o>ML!%KShax104uKi1tk3&Pt-dcFImBl+ z)3`0zwhmaiFFm882higCcJoW_N7K*!A% zG06KHqL^Xb}k zk(y$g45;N3n4t*9bBc3p^WBHX2pPr7`X`Csx|5CoM*p0s4qp-vV{=i`-E;SEipQZY z19Pr~b3!tq&bT+o7)cR%gnT7pxFV)fpD(1v5?I*ZENujGbcf?;puGcuc<8x}PPD|a zdSh5tQo5i@c$LtftqYvtzX$6Cus%0?!h`@hDwr+c(`^TTP>tV2CBONNS;vOu$oF8J zaP|q2^ATsQiqgGrv)U|Ko2>op_~=a9hJjXI<757ns{2J_e7w=Z%8uWJ8M;9W$(9@B ztd`r2l+(oO<(^7scN1oxx5uf(BwKKBj=?y=VQ9C@Vul3Q_B2JOQ;6DT;wj)9)#fp$ zna&AW$WK>J;O&M6nZa`8=ojRyJKc&k0kqjqAyiXE9m^3|gZpTM(`JJeLGwCkp1D&t zrqa4_8(>aLW4LiOGcU&A!!f5;Hb?|*?4c+~>yAKe;ThfyU6`S~0XwP-bk2~Bs!Lz# zT`~_gsBNr@6bKCf{0N~O|RUX z!X$*shr7gZ$ zmybm7HE8~-w(Rf@EWi2A44wze*t^JP@P0__6VMN53VU@_Af3lDPlE=(sARM_Wq(Dr zM6o-Vt#qxYYGcooNv=b|8OOyT4u`}b9omFtRI@m%eSX1u=z6%85;}XyZk>2XZvp61 zemq>%$XBdClb23?@I!;kx72|@Nw5i-nkj%b=FiFvwm#ERz8~ukLBgC1GI|s0u-;1A z*UM%k60Gw-oqcaqt#3mgstd1d7L!Un1&z{6d*i0Izq}kzYywfE1xCfl zojk~29n@UI(zI3wJ4Y*V=w`?J>Q=7U?ovjw(vbEQ6Ue!^{7I0qBZT0!J-%~>mDlXH z1PxXm=BYN%VhcNmlI9-^Q+*Dp`xmN0uau8i-JH{(J?s}yIm!3r>PR8C4J^in#UV}Gp172&Cy)80WauioT% zqvqaskj4?FHJw%)&fzw6o6WiotZTNJL__Mw^K)+>hKZ?z!@jndIpiz+bL#VWlYHA2ou?i$g_U z)bPh4%)%SXZ1yRvUeyD~+QvVHHG=u&-y6jnCp|0{_TA&Ju5Ew6VW{Xg*^_JDe%rN~ zZeVH@#@8#09l|aopGpyG@0jA0q%*b5BgZim1w zV^8@**+>jhZ z+j6+?({Cw<`7Fm0V4(CQVLroYb+3LSwySFM*d2USTxhnd#U15}Wi^qi z6G7?AK4W)}!!{I7M>(#cG^n|>eEv5zW{R=EhMB@Cx7@RU-0lWfWXxJQ)lak)&x}Q5 z_{w}9lB_P|LOuQn&+ckXQ=60VoPjOrl4Bb(Kck?Isk$D>I;m~VN8TFPd^wU|X=oIQ zUwD0ZR9wEo8OES}sPYLzeBY(Jd&3EOSqCd7{VC&#J{8LG8hJwb-TUA@WESoWrbUN< z6F@l{PMzVmFswA|$-_05IJ$FreamNY8$uP=a=8vgl=kO=?!qG~_#v#?nGT(L=M?_% z8$ZeI!6Kb1wDhx-e9+LcGipkUL5R7B8iUR+mc+L1_x3ojE|;{B(=0$1v9J$sI!sWE z^k-|;@WlEgsRC~lw084NT=;I{7a+5wb>4*Y=%p^Sl{ezRG&aAbdKKPZM*1|SLOQ0% znCTl5Kt_`j;Fxa%1Cj4J3!-yYSFZH!Ry;c099D)zF@{utC5tUo$}_o{thfOlQ9G-MMpN7Q1;qo$?;g)@AQm-8_ZCEu#ltc}g5}LyLU7uNx(LH)uk4(PI>(Xzlo;VH1NhpP3k{Ax7KwApFmhmjDI&qc z!B5x>rl>svF?AJ0l;r&Koo+0nJvQVU?1e(1q1tq5{O$Q#$%G~Rrb&yaON(&YpQBj{ zi}tK3^;uHBN@8c^<&9c~yVFW;a{$nhr6*HosFOaua=5Lz7s1G6P94L=uCRaK**ks_1+1LJM^_24U+=XroXtyGAag#+M%5DC>UZ67s#dWYIR0eals<@*?NR+V+c&v{ z>5NqJ8sH+$KW|bQj9q!SKA94c9nOcPP+;DFzkGC@yHocP%b`fLThaI$?$|ktUw4fw zgGsd1Cb+Y6agl-7P(&V|NZzLx0N>wc&ob(m-Kh7D+29<@h&xlL(%^@%^^-~NQ_n89 z-{)jf(byc}s9tx(K%3UFg9GyzXu%+qF{t=77J4g~uhm~6t?1jEp93ZP)aO5Em!+DF zoLoXTOeE#qcr+?AIB?Inc8de}$kFRkN)nxADGNQWblUVz!=RpZ#i#V}-417|DrDvj zB$OwC7jcOo8Gh^C-LgY`=doE;wO00X1|VnpsRP-$k3+#4EmD={05MT;17xXe^$ulI zV9vbrzcxmS2`hS^(_7oHFPYl#eB+e}YJzwLm6KW=w9At*18^`Y?zA(R@-~Y$wy55y za6!{oS40pG=>U8}FV0K${+i%w*j}QMR#pzhK3+xuNnzPlroXM7G1h-eTTvn)qWuJ*W^ady%-*{qM*1T7Gln zP4`bbhd6y|)V}#l9r#6?IId1Wf{Y1_0GYTC#ESfHXiKY{Z&D1H;igh3R5c!nx34j5 zjz0Df{gEz%v6CZ1XIaAWdohj3tM&`oVwx%?+Gn{Kwe2t#Lqx#b@OGeoqs z%C6^+*5?!XBRH%?yxf)KR<2Ljcl~^o#S=38vyIXHnEAAI}*Ub56tpnFDvkqO00lc1@&#W~})TN-F^H&F2d z>SE7g9aYgz3(_66$jR)~E?hmh4YoJC_nTv8iu9s-A#(G@qy$=-06az8&XqTCVho+< zuN;s=r_+VCUL%x zfMF@yLBA8JWLMig#2}t3D;5AM{gHDRW4S6e_VYeu0*?BLb?8R_UORBnR;$r^A7JQn z$3tsn$?zFJ2L#u*rlw z@@e#JwtQAGNL+fE9c`USu$4=FOWFZal`&5c?x%57pL`8R7-HYC&Z;czu|mHm`v|%{ zAn3opsF1{zW^d+_uI~Z9MW|qq2*L$cY5l9)5O-R?_`Sm^Odf5f9G_=tZXQ}97{i!0 zHHK>-_dOK4#x3Sx)ikqRIkw5?fz;vWDFEWz$9;+B$htdQa@mIr|N7oxovMa$-*8E< zm_5RyzXDI@>!cY+lQ?U)RwvL2+LhN^MjEG;{v5;+;vJupMzee@$UR9M090^sQ7A_j zkskRa$oZkm;Ig#%9d^##qM-h+z=i=Z%^L@O7;`TlJExD|Yuz!Ez0QJ9`vWsPZ?0V(a&RoU<*zrnn^RD?H zhbi&`{=)m8wToU*dna{R4-@e^tWMk$*OmJ|hF(q zGzuqA{_)~%J0FWaRp8{SI#5r4{UF7ubmU89(Y80HuOxh-jb zz9pq->zh-RuG#l_tu*0B2B62LOyL0+mw_zPvY*G}73L=r!Qe`jLPn9=AsnHgsRvlk ztj0!-*Bt~gb0;ST+vQKNs*ci-0klK!8*iD>hWzWf%0H2~$Q%pwHtb6K_4XnH^B85T zdWdU-_3{>O;%J&NK(o^_AtV0N^WpbpX8Oesf=8FltBW#=5cfgwn2s!H^JY~nyMc|v z_kNIUzkm9TcgRJY1t5lsS?cMvOiKFk_kmE%4f#azpqzxn0?G_^$R)F~l7aO7h{|rm ziAImNj)qsYdIYXCun_pWzmQ_s+xt{03ui8+>Nt^T-o;6;^*r-*FPW}JU+Q6Yp_PSH z4mARMJP*g6F8tS68@<&7!uNk$2?#hT9dP@0$Yzzh#(PbtGPPGCKia>ja9zOL^Z%TebV-8Muz;~H@B`S8CHQBUj3%WL|!jsxq z<7|}Uu8k&3NAfHZr|>_E_JpM!((s^ihm^5*;DV!AlBl^g1{byMcLLt_F0cRD>j{Xg zOIs^}=#66!f9nP!Zpm!0S7$O*)`NL7a}PVYS)6A+ZGR;`8i^#!>NW>UpQD9XTfL%i=5h* zTSG4~u4ggAwbo^rYB%9JFuK9<<=v&eO0>-{=@<}DPUnP~}RsNk6|A5TiP`+); zp2ct#{VC!IynH!dyW{lp>-K%5YHzTy4&zob$c^mVaa-4U5PO3cySzA#%70DCjN&4w zZ8Qn8Nt$V?WAGaokT(-Z)%_z77Q^KAY3Qq`yR(T&tqeohQWmv5yBc^$T&&mYW7GHD zBOvB0QyRvucWRu{zrfkqWa0aZk=2_q2S(U89i;Eav(5niGs{JrU+>R`dA`>pkTNkj zR$}7b1nkteypeS{YQVqV&Q2?TzoP>e7du$v(nNNYYIC!4A4koUADcdT5wygh{1A4A z$i+!Z@bzKHhX0HGhR611jgEjEmveWI2?17BV93a@=e4X#W59>M9C1aB{=2C-!qEGN zH^(QtTA3$Nh~DY;d1(B8s@`_Fanbp48_v%q+D|O|!(^Xe`UbJ(OOyMT z#AdS(M}@r!Si~vR8|O2x+TX+3C=L=`5OQFZQy#^>)@b`d4|QgHdz!?+6kJKyL5*8Jp|%0RtH2WApj}B`#(dN?ePE$kqFM%Dje#rZocrY!HX8_?1{%4LtYGsb=@M)ZR0w{eFMB@-XI* za;d?LC;0cVZNG>!kOMG1pTdZ{<$J@ToF_PRq?Aoy*bP(d*RrIjeMX+e6wYRK@yvt~ znp{3iDCS3GOA)Q#U7`NR&$g@=1H_CLntoIxvf;#nm*}e zQ_ymRo!=2B_R%bMl;?A4dUvQ`O=}$c-{%YXF#PY&S$kef>#xtJ10?(`!wXa&4-qb) zj?iG~X*8?9#*+mkLpq0~Lncs{C46_`v}UVBRv8X5X-Fz(b$GZ=mpe6P#%vfhZZqMLX4@B}k#NC+g! z$o9DMpQw!L^l1SB!+aP=fcG`XVtgh$tYWm|kTR`e%z()k@E-nCn@vq~^ zFM{}NzDWr2qE-DL4HH?E!Tkp7@Y=_N6C=YnT1doU%aV8Od_3Z~TbAvxW0e2Q2S7-_ z-cw+6_1@#Y^UkG~uUICIbi%`ia`f3`K-AIBHkX>Y_IvNC7MdFSA>^(LRqLhrwDjK2 zt<;F;yIl-oo?BiXnJZQ3d^#fT{CM|yT&X21>@CQw_!2wKiy6v}3SGgg{$Is>zaI}6 z!B%;VgiIj|cXGC3tRLE?#uS#OVz``@xbSSzh6%jA$MpT~zP_I3zhgdZ_}~L2iZM;N z0EjRbl4Z?25d2NR^9n;nI}i+&6x>chNY~f*m6hz8?~P2#rl71wmuMeuS^wj8cX~J`bH8~+>iqq zDBvc<;U1lz_e2PR7_jNScFKVIl zk#1`q1`pMMq?{2A81@q>@!|Rp(P1g{H!il`CgMGUUQmv9lGw;ElfchQx)30U;6#>T zs9Ed--pq_HYCg2<@@L5VyC`HXe1fI`K_ANgP+|fZmg>kX$IDvjjhogET19-k>>o(u zN&ZJELc(Ws)EY7^9Xvm0p0va^tI7WE9+V#g)rbghtK(=It~i0b|I<0{x`HXc=(;ir zW9`#7sL`@y^T8;l?(W;W`#H!+*U>R-tH(b)e938&XMMHfAMhC{3bpv##j-6*9xd;3 z*Napn6>As-DN!7d)A+;x5hvh=&uI4~DCCyKXlaiAChpOMG*kRIq&1D&S-Q!56syg? zH>>ON9S%auvT4`oPT5W9(<|EwPY>SU06TYKCoL6=XCcrNWQ2aq%~N9ihcucaS0O_O zMIvzF>~~?vNw<$G-N?pH1ul~upM8H_FN_|mRIzhE2{hy;EjWpkmZqC2{qH{8==69f za6!vI%jHcWTmiLw4g(P&l=QQJcd#tk8|x3hW9R!zu|6>PG|iDOUop>>m%6b`kTjL9P^z`Lv z8-}$+Y5yq(F`8>^9kCse*yo@?q?jr6=Kc}jVzoJ4+sHrlKO6>v&7#lGdo-8~rh;rC zWF-U}Lxv}_rBGsNZWK^}?-f~_4XRKO)uFg*yc0aSwN{^<(SR10E~Hg1eoiCr1gPew zW?6+v3{3`TkHMoO!>5}?nGH@T#(8%u;|%>5^&`D6e*Y1VI`Yjb7RFGenq?NpeE$Z8 z`GTgxxT3HWZ6N3luymlwBE)X%SK`Hbz2*9Sbti=J=Yc5eF-OY&kexNwR zK*zt&ZA%f~sD_uXAGHhoCMZvoM|A@Z=B~VQUP8CT3=c!owr} z<3g6|h%N8_e1$}+Is_?C1O5*w$2tri?p?uWpPqrUxl7Tl{nDyix@xChyOfc^KN*Eh z$M5nVSx%MXX`2FRXq>NhOcec)5wFHAf}Kq8^4LItZ|R!WS(fn*lDdvN=?ZpRO;Oct z4kkm<<0qGw#qIS!fTfZ~Mr^RKZ@0I%{PREtbu*!CUzebV=8rN>SuSG-(OP1VRy`lY z(KNBKiH2~(e8c{2W0|A!@gxDs5Js-q@zOu(5A#n=ht#|SiP)<_msxDg zHT_{zq6tA8Bi?#3@e?)js224^F-1DowQU=yrqRK?)0r#FCXDDjAHATw&mlP92Qz;AOH&Q0`_e0ZD@dR z@8`+hvUoc5&yJE=i$GRZ>+ggGF$zQmfRnwX@TMi&?^bed&ZiWuOT!Mc=p%5DyW>X5 zi=Td)Iv{Pb{sf(WQ$ZaPmx5mW=t;gJ)jx?5D)Sidw;-NcOUiWVNJ^UxfPTGioNB^dz^g)&G{+5C{l zm`8+lJ$Ya7B}zm|s=F$)-r~7~nNk+r?KZ4N)Y4TV8(T2#|Ng)C9$MX4UC{q+f`yeni6}0rJue>mHowS8Y*<=%vh3f~=<$ z{n+zEM_6NiyeAuD6WNBdz`mQD9qaxPADf_hgd0ecV3<#sgxg3?iFQ1<)%qqPkKTT> z7Up>Va{9doOP=XjztN~)nCjMDzntm$r(g?pxH`yUY0(BAtIdd2eRFQFkW%EYmPpae z=|)zDd~w?c;1&5Fkm-)qlrhz4K3hg|^{4A5??7LM_4)uQyS1;dq&D@N+zIhK8__A3 z#PO18I&T5Gb#MBk{60QyyH$b{x$PhL1tO2ECVnTjs0v;;htDiQDRLo{>R}#m9*A$! zb9hRxej+oSU)h`a%#3OtE2Ghg|CmD&YV6D_azVpHHTj)D$5!gl2{_K}7DbvMQhm)# zPFzcTWSB&(YsiHEN%7qQa1-nSkGg_i`E-Uet(%jdEjEdu)#svss$PH?{hRlCq|cB< z7E=ud2^gIui2lpy@J3E7^61kf-9(&y7i4?5=Bs1)OVxiqZTZMIb{Q%dptHXdP}Ea zbTi(+;EH8loAf`i!-a;`#*y=UI5++DjsG`>uOV%<62AM%i3VE>*#PT%sG*mzqUni6>4IB6d|v+CVx7@n4T~qo0^lZ;6+TDDj}L(I$qVQCRm+q^!KE3z{R?{>!kuFTX@c zL_5&#S-_o{NLiSQBJm=B_nbY5Zr$$6wCY&7R6!{rzstrJ3CJ>x(>XciLj;C7t-@&YQ$Z+y#6FvRhlz}doa;g+@P zmXjk~g_BUDNXG|V_zFh#auD`?NhYmtkvD0Ki;(=e$F0-d<09QaFGC{ub$ z2vb&dBXX6y4xx`$HQE0ZXNPL$KfgQ|XCAO;+mrubWYsuLm}3u4Mw1*#~ z(V=$DXD!tp7{{ zn*zCcx&=lo>BBD6*K(I*Cz!>fB2g%}oDbRhj^SYMCBWkAe4vJZ`$v3&#KT+KRsk*- z$HD>cK6l2tr%4LDR^qbf!m&3ECGCNwCXMcwrLFws4Rq1u7z?=WoJ$5;>0^2vf8PB}`tPlb4N>xXI%7q$cl3`BP{mVhHztI;2MQKl?untFf#iWEq zm2^G^KbEI@`ix%;z-O6vJlSTYs3VOZho49A#%I6IM^cZqG-sR7?>5LR;dbGRQH&Tw zLSK((llw&>Kh)^)v|uolG5;;F`@aAc0qXu81h<_u8Pdi!Z7PcPnpYo6l1gS05qFeQ z9>IE))FZ%mDSia;5aur69?(7DgTNNBn4U)K`9}MLI`!mQwU;hU_4&^WeU|pwF~?Iv zCl^sZLOwaxJf7(*5kX9z$He5>Z+v}8&5cmoyQ<@o)$#)4YUi5U_>W}JO*ZI;S^NTz zuxgeQWnin^1(m^YApNFf%KhJiy># wWWX?Klsg(4qlsZOFN_uiqa`89CE-iv;?*p3rv4~Q0ai#1p00i_>zopr0IHO&egFUf literal 0 HcmV?d00001 diff --git a/rinkplanner/assets/icons/android/ic_launcher_background_432.png.import b/rinkplanner/assets/icons/android/ic_launcher_background_432.png.import new file mode 100644 index 0000000..2158acd --- /dev/null +++ b/rinkplanner/assets/icons/android/ic_launcher_background_432.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://yuttphwqfflf" +path="res://.godot/imported/ic_launcher_background_432.png-80a806c1ddb97ef9722ce866b3f2d588.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/icons/android/ic_launcher_background_432.png" +dest_files=["res://.godot/imported/ic_launcher_background_432.png-80a806c1ddb97ef9722ce866b3f2d588.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/rinkplanner/assets/icons/android/ic_launcher_foreground_432.png b/rinkplanner/assets/icons/android/ic_launcher_foreground_432.png new file mode 100644 index 0000000000000000000000000000000000000000..2ed74ae3fc7a17982a696b8abcee94fc812a929b GIT binary patch literal 13790 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 UCa6M@V!Z literal 0 HcmV?d00001 diff --git a/rinkplanner/assets/icons/android/ic_launcher_foreground_432.png.import b/rinkplanner/assets/icons/android/ic_launcher_foreground_432.png.import new file mode 100644 index 0000000..b191074 --- /dev/null +++ b/rinkplanner/assets/icons/android/ic_launcher_foreground_432.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c0d7mguqq6kk" +path="res://.godot/imported/ic_launcher_foreground_432.png-ebc040957ccc6bf7d78ed1c41a90b48f.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/icons/android/ic_launcher_foreground_432.png" +dest_files=["res://.godot/imported/ic_launcher_foreground_432.png-ebc040957ccc6bf7d78ed1c41a90b48f.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/rinkplanner/assets/icons/android/ic_launcher_monochrome_432.png b/rinkplanner/assets/icons/android/ic_launcher_monochrome_432.png new file mode 100644 index 0000000000000000000000000000000000000000..b49a278e21fbf5d0b3465eee31ee34c9ce81237a GIT binary patch literal 6686 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 YhX3v#FYhqn4?YO;HDjH!tB$|_A3!3TCIA2c literal 0 HcmV?d00001 diff --git a/rinkplanner/assets/icons/android/ic_launcher_monochrome_432.png.import b/rinkplanner/assets/icons/android/ic_launcher_monochrome_432.png.import new file mode 100644 index 0000000..becbe56 --- /dev/null +++ b/rinkplanner/assets/icons/android/ic_launcher_monochrome_432.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c3abde7a6bm12" +path="res://.godot/imported/ic_launcher_monochrome_432.png-c720e8f4bde84f80d7d53d25a508e39d.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/icons/android/ic_launcher_monochrome_432.png" +dest_files=["res://.godot/imported/ic_launcher_monochrome_432.png-c720e8f4bde84f80d7d53d25a508e39d.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/rinkplanner/assets/icons/icon_foreground.svg b/rinkplanner/assets/icons/icon_foreground.svg new file mode 100644 index 0000000..fb2e96c --- /dev/null +++ b/rinkplanner/assets/icons/icon_foreground.svg @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/rinkplanner/assets/icons/icon_foreground.svg.import b/rinkplanner/assets/icons/icon_foreground.svg.import new file mode 100644 index 0000000..dd6ed88 --- /dev/null +++ b/rinkplanner/assets/icons/icon_foreground.svg.import @@ -0,0 +1,43 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c57tr8h4rw10t" +path="res://.godot/imported/icon_foreground.svg-9362c3bcea0c351cf11ae5f264f1c60b.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/icons/icon_foreground.svg" +dest_files=["res://.godot/imported/icon_foreground.svg-9362c3bcea0c351cf11ae5f264f1c60b.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 +svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/rinkplanner/assets/images/checkboard.png.import b/rinkplanner/assets/images/checkboard.png.import index 062124c..0b65633 100644 --- a/rinkplanner/assets/images/checkboard.png.import +++ b/rinkplanner/assets/images/checkboard.png.import @@ -4,15 +4,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://d2f4ue6f2152o" path.s3tc="res://.godot/imported/checkboard.png-60f6db393233dd01fdd8b7cd558c6460.s3tc.ctex" +path.etc2="res://.godot/imported/checkboard.png-60f6db393233dd01fdd8b7cd558c6460.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true } [deps] source_file="res://assets/images/checkboard.png" -dest_files=["res://.godot/imported/checkboard.png-60f6db393233dd01fdd8b7cd558c6460.s3tc.ctex"] +dest_files=["res://.godot/imported/checkboard.png-60f6db393233dd01fdd8b7cd558c6460.s3tc.ctex", "res://.godot/imported/checkboard.png-60f6db393233dd01fdd8b7cd558c6460.etc2.ctex"] [params] diff --git a/rinkplanner/export_presets.cfg b/rinkplanner/export_presets.cfg index e7c7704..e79fbe9 100644 --- a/rinkplanner/export_presets.cfg +++ b/rinkplanner/export_presets.cfg @@ -1,15 +1,15 @@ [preset.0] -name="Web" -platform="Web" +name="Linux" +platform="Linux" runnable=true advanced_options=false dedicated_server=false custom_features="" export_filter="all_resources" include_filter="" -exclude_filter="" -export_path="build/web/index.html" +exclude_filter="tests/*,prototype/*,docs/*,addons/*,assets/models/*" +export_path="build/linux/rinkplanner.x86_64" patches=PackedStringArray() encryption_include_filters="" encryption_exclude_filters="" @@ -20,16 +20,264 @@ script_export_mode=2 [preset.0.options] +binary_format/architecture="x86_64" +ssh_remote_deploy/enabled=false +ssh_remote_deploy/host="user@host_ip" +ssh_remote_deploy/port="22" +ssh_remote_deploy/extra_args_ssh="" +ssh_remote_deploy/extra_args_scp="" +ssh_remote_deploy/run_script="" +ssh_remote_deploy/cleanup_script="" +binary_format/embed_pck=true + +[preset.1] + +name="Windows" +platform="Windows Desktop" +runnable=true +advanced_options=false +dedicated_server=false +custom_features="" +export_filter="all_resources" +include_filter="" +exclude_filter="tests/*,prototype/*,docs/*,addons/*,assets/models/*" +export_path="build/windows/rinkplanner.exe" +patches=PackedStringArray() +encryption_include_filters="" +encryption_exclude_filters="" +seed=0 +encrypt_pck=false +encrypt_directory=false +script_export_mode=2 + +[preset.1.options] + +binary_format/architecture="x86_64" +codesign/enable=false +codesign/identity_type=0 +codesign/identity="" +codesign/password="" +codesign/timestamp=true +codesign/timestamp_server_url="" +codesign/digest_algorithm=1 +codesign/description="" +codesign/custom_options=PackedStringArray() +application/modify_resources=false +application/icon="" +application/console_wrapper_icon="" +application/icon_interpolation=4 +application/file_version="" +application/product_version="" +application/company_name="" +application/product_name="Rinkplanner" +application/file_description="2D-Whiteboard fuer Eiskunstlauf" +application/copyright="" +application/trademarks="" +application/export_angle=0 +application/export_d3d12=0 +application/d3d12_agility_sdk_multiarch=true +ssh_remote_deploy/enabled=false +ssh_remote_deploy/host="user@host_ip" +ssh_remote_deploy/port="22" +ssh_remote_deploy/extra_args_ssh="" +ssh_remote_deploy/extra_args_scp="" +ssh_remote_deploy/run_script="" +ssh_remote_deploy/cleanup_script="" +binary_format/embed_pck=true + +[preset.2] + +name="macOS" +platform="macOS" +runnable=true +advanced_options=false +dedicated_server=false +custom_features="" +export_filter="all_resources" +include_filter="" +exclude_filter="tests/*,prototype/*,docs/*,addons/*,assets/models/*" +export_path="build/macos/rinkplanner.zip" +patches=PackedStringArray() +encryption_include_filters="" +encryption_exclude_filters="" +seed=0 +encrypt_pck=false +encrypt_directory=false +script_export_mode=2 + +[preset.2.options] + +export/distribution_type=1 +binary_format/architecture="universal" custom_template/debug="" custom_template/release="" -variant/extensions_support=false -variant/thread_support=false -vram_texture_compression/for_desktop=false -vram_texture_compression/for_mobile=false -html/export_icon=true -html/custom_html_shell="" -html/head_include="" -html/canvas_resize_policy=2 -html/focus_canvas_on_start=true -html/experimental_virtual_keyboard=false -progressive_web_app/enabled=false +debug/export_console_wrapper=1 +application/liquid_glass_icon="" +application/icon="" +application/icon_interpolation=4 +application/bundle_identifier="de.rinkplanner.app" +application/signature="" +application/app_category="Education" +application/short_version="" +application/version="" +application/copyright="" +application/copyright_localized={} +application/min_macos_version_x86_64="11.00" +application/min_macos_version_arm64="13.00" +application/export_angle=0 +display/high_res=true +shader_baker/enabled=false +application/additional_plist_content="" +xcode/platform_build="14C18" +xcode/sdk_version="13.1" +xcode/sdk_build="22C55" +xcode/sdk_name="macosx13.1" +xcode/xcode_version="1420" +xcode/xcode_build="14C18" +codesign/codesign=1 +codesign/installer_identity="" +codesign/apple_team_id="" +codesign/identity="" +codesign/certificate_file="" +codesign/certificate_password="" +codesign/provisioning_profile="" +codesign/entitlements/custom_file="" +codesign/entitlements/allow_jit_code_execution=false +codesign/entitlements/allow_unsigned_executable_memory=false +codesign/entitlements/allow_dyld_environment_variables=false +codesign/entitlements/disable_library_validation=false +codesign/entitlements/audio_input=false +codesign/entitlements/camera=false +codesign/entitlements/location=false +codesign/entitlements/address_book=false +codesign/entitlements/calendars=false +codesign/entitlements/photos_library=false +codesign/entitlements/apple_events=false +codesign/entitlements/debugging=false +codesign/entitlements/app_sandbox/enabled=false +codesign/entitlements/app_sandbox/network_server=false +codesign/entitlements/app_sandbox/network_client=false +codesign/entitlements/app_sandbox/device_usb=false +codesign/entitlements/app_sandbox/device_bluetooth=false +codesign/entitlements/app_sandbox/files_downloads=0 +codesign/entitlements/app_sandbox/files_pictures=0 +codesign/entitlements/app_sandbox/files_music=0 +codesign/entitlements/app_sandbox/files_movies=0 +codesign/entitlements/app_sandbox/files_user_selected=0 +codesign/entitlements/app_sandbox/helper_executables=[] +codesign/entitlements/additional="" +codesign/custom_options=PackedStringArray() +notarization/notarization=0 +notarization/apple_id_name="" +notarization/apple_id_password="" +notarization/api_uuid="" +notarization/api_key="" +notarization/api_key_id="" +privacy/microphone_usage_description="" +privacy/microphone_usage_description_localized={} +privacy/camera_usage_description="" +privacy/camera_usage_description_localized={} +privacy/location_usage_description="" +privacy/location_usage_description_localized={} +privacy/address_book_usage_description="" +privacy/address_book_usage_description_localized={} +privacy/calendar_usage_description="" +privacy/calendar_usage_description_localized={} +privacy/photos_library_usage_description="" +privacy/photos_library_usage_description_localized={} +privacy/desktop_folder_usage_description="" +privacy/desktop_folder_usage_description_localized={} +privacy/documents_folder_usage_description="" +privacy/documents_folder_usage_description_localized={} +privacy/downloads_folder_usage_description="" +privacy/downloads_folder_usage_description_localized={} +privacy/network_volumes_usage_description="" +privacy/network_volumes_usage_description_localized={} +privacy/removable_volumes_usage_description="" +privacy/removable_volumes_usage_description_localized={} +privacy/tracking_enabled=false +privacy/tracking_domains=PackedStringArray() +ssh_remote_deploy/enabled=false +ssh_remote_deploy/host="user@host_ip" +ssh_remote_deploy/port="22" +ssh_remote_deploy/extra_args_ssh="" +ssh_remote_deploy/extra_args_scp="" +ssh_remote_deploy/run_script="" +ssh_remote_deploy/cleanup_script="" + +[preset.3] + +name="Android" +platform="Android" +runnable=true +advanced_options=false +dedicated_server=false +custom_features="" +export_filter="all_resources" +include_filter="" +exclude_filter="tests/*,prototype/*,docs/*,addons/*,assets/models/*" +export_path="build/android/rinkplanner.apk" +patches=PackedStringArray() +encryption_include_filters="" +encryption_exclude_filters="" +seed=0 +encrypt_pck=false +encrypt_directory=false +script_export_mode=2 + +[preset.3.options] + +custom_template/debug="" +custom_template/release="" +gradle_build/use_gradle_build=false +gradle_build/gradle_build_directory="" +gradle_build/android_source_template="" +gradle_build/compress_native_libraries=false +gradle_build/export_format=0 +gradle_build/min_sdk="" +gradle_build/target_sdk="" +gradle_build/custom_theme_attributes={} +keystore/debug="" +keystore/debug_user="" +keystore/debug_password="" +keystore/release="" +keystore/release_user="" +keystore/release_password="" +version/code=1 +version/name="0.1.0" +package/unique_name="de.rinkplanner.app" +package/name="Rinkplanner" +package/signed=true +package/app_category=6 +package/retain_data_on_uninstall=false +package/exclude_from_recents=false +package/show_in_android_tv=false +package/show_in_app_library=true +package/show_as_launcher_app=false +graphics/opengl_debug=false +shader_baker/enabled=false +xr_features/xr_mode=0 +gesture/swipe_to_dismiss=false +screen/immersive_mode=true +screen/edge_to_edge=false +screen/support_small=true +screen/support_normal=true +screen/support_large=true +screen/support_xlarge=true +screen/background_color=Color(0, 0, 0, 1) +user_data_backup/allow=true +command_line/extra_args="" +permissions/custom_permissions=PackedStringArray() +architectures/arm64-v8a=true +architectures/armeabi-v7a=false +architectures/x86_64=false +architectures/x86=false +launcher_icons/main_192x192="res://assets/icons/android/ic_launcher_192.png" +launcher_icons/adaptive_foreground_432x432="res://assets/icons/android/ic_launcher_foreground_432.png" +launcher_icons/adaptive_background_432x432="res://assets/icons/android/ic_launcher_background_432.png" +launcher_icons/adaptive_monochrome_432x432="res://assets/icons/android/ic_launcher_monochrome_432.png" +splash_screen/disable_godot_boot_splash=false +splash_screen/icon="" +splash_screen/branding_image="" +splash_screen/background_color=Color(0, 0, 0, 1) +permissions/internet=true diff --git a/rinkplanner/icon.svg b/rinkplanner/icon.svg index 9d8b7fa..5155529 100644 --- a/rinkplanner/icon.svg +++ b/rinkplanner/icon.svg @@ -1 +1,9 @@ - \ No newline at end of file + + + + + + + diff --git a/rinkplanner/project.godot b/rinkplanner/project.godot index ab73937..8173750 100644 --- a/rinkplanner/project.godot +++ b/rinkplanner/project.godot @@ -40,7 +40,7 @@ window/stretch/mode="disabled" window/stretch/aspect="expand" [rendering] +textures/vram_compression/import_etc2_astc=true renderer/rendering_method="forward_plus" renderer/rendering_method.mobile="mobile" -renderer/rendering_method.web="gl_compatibility" diff --git a/tools/_export_common.sh b/tools/_export_common.sh new file mode 100644 index 0000000..cd6fe60 --- /dev/null +++ b/tools/_export_common.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash +# Gemeinsame Helfer für die Export-Skripte. Wird gesourct, nicht direkt +# ausgeführt. + +REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" +PROJECT_DIR="$REPO_ROOT/rinkplanner" +GODOT="${GODOT:-/opt/godot/Godot_v4.7.2-stable_linux.x86_64}" + +require_godot() { + if [[ ! -x "$GODOT" ]]; then + echo "Godot-Binary nicht gefunden: $GODOT" >&2 + echo "Setze GODOT=/pfad/zu/godot" >&2 + exit 1 + fi +} + +# build_preset +build_preset() { + local preset="$1" mode="$2" relative="$3" + local out="$REPO_ROOT/$relative" + + require_godot + mkdir -p "$(dirname "$out")" + + "$GODOT" --headless --path "$PROJECT_DIR" --import >/dev/null + + if [[ "$mode" == "debug" ]]; then + "$GODOT" --headless --path "$PROJECT_DIR" \ + --export-debug "$preset" "$out" + else + "$GODOT" --headless --path "$PROJECT_DIR" \ + --export-release "$preset" "$out" + fi + + if [[ ! -e "$out" ]]; then + echo "Export fehlgeschlagen: $out" >&2 + exit 1 + fi + + echo "Build: $out" +} diff --git a/tools/export_android.sh b/tools/export_android.sh new file mode 100755 index 0000000..4494efc --- /dev/null +++ b/tools/export_android.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env bash +# Baut das Android-APK (arm64-v8a) nach build/android/. +# +# ./tools/export_android.sh # Debug-APK (Debug-Keystore) +# ./tools/export_android.sh release # Release-APK (Release-Keystore nötig) +# ./tools/export_android.sh debug --install +# +# Voraussetzung: ./tools/setup_android.sh wurde einmal ausgeführt. +set -euo pipefail +source "$(dirname "${BASH_SOURCE[0]}")/_export_common.sh" + +MODE="${1:-debug}" +INSTALL="${2:-}" +SDK_DIR="${SDK_DIR:-$HOME/Android/Sdk}" + +case "$MODE" in + debug) relative="build/android/rinkplanner-debug.apk" ;; + release) relative="build/android/rinkplanner-release.apk" ;; + *) echo "Unbekannter Modus: $MODE (debug|release)" >&2; exit 1 ;; +esac + +if [[ ! -d "$SDK_DIR/build-tools" ]]; then + echo "Android SDK nicht gefunden unter $SDK_DIR" >&2 + echo "Bitte zuerst ./tools/setup_android.sh ausführen." >&2 + exit 1 +fi + +build_preset "Android" "$MODE" "$relative" + +APK="$REPO_ROOT/$relative" +ADB="$SDK_DIR/platform-tools/adb" + +if [[ "$INSTALL" == "--install" ]]; then + if [[ ! -x "$ADB" ]]; then + echo "adb nicht gefunden: $ADB" >&2 + exit 1 + fi + "$ADB" install -r "$APK" + echo "Auf dem Tablet gestartet werden kann es über das App-Symbol 'Rinkplanner'." +else + echo "Installieren mit:" + echo " $ADB install -r \"$APK\"" +fi diff --git a/tools/export_linux.sh b/tools/export_linux.sh new file mode 100755 index 0000000..ca5181f --- /dev/null +++ b/tools/export_linux.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +# Baut das Linux-Desktop-Binary (x86_64, PCK eingebettet) nach build/linux/. +set -euo pipefail +source "$(dirname "${BASH_SOURCE[0]}")/_export_common.sh" +build_preset "Linux" release "build/linux/rinkplanner.x86_64" +chmod +x "$REPO_ROOT/build/linux/rinkplanner.x86_64" 2>/dev/null || true diff --git a/tools/export_macos.sh b/tools/export_macos.sh new file mode 100755 index 0000000..3bf5a55 --- /dev/null +++ b/tools/export_macos.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +# Baut das macOS-Bundle (universal, ad-hoc signiert) als ZIP nach build/macos/. +# Hinweis: Für eine verteilbare App ist zusätzlich Signierung/Notarisierung +# auf einem Mac nötig. +set -euo pipefail +source "$(dirname "${BASH_SOURCE[0]}")/_export_common.sh" +build_preset "macOS" release "build/macos/rinkplanner.zip" diff --git a/tools/export_web.sh b/tools/export_web.sh deleted file mode 100755 index 1559c6b..0000000 --- a/tools/export_web.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" -PROJECT_DIR="$REPO_ROOT/rinkplanner" -BUILD_DIR="$REPO_ROOT/build/web" -GODOT="${GODOT:-/opt/godot/Godot_v4.7.2-stable_linux.x86_64}" - -if [[ ! -x "$GODOT" ]]; then - echo "Godot binary not found: $GODOT" >&2 - echo "Set GODOT=/path/to/godot" >&2 - exit 1 -fi - -"$GODOT" --headless --path "$PROJECT_DIR" --import >/dev/null -mkdir -p "$BUILD_DIR" - -if ! "$GODOT" --headless --path "$PROJECT_DIR" \ - --export-release "Web" "$BUILD_DIR/index.html"; then - echo "Web export failed." >&2 - echo "Check that the Web export templates for this Godot version are installed" >&2 - echo "(Editor -> Manage Export Templates)." >&2 - exit 1 -fi - -if [[ ! -f "$BUILD_DIR/index.html" ]]; then - echo "Web export produced no index.html." >&2 - exit 1 -fi - -echo "Web build: $BUILD_DIR/index.html" -echo "Serve it with:" -echo " python3 -m http.server 8000 --directory \"$BUILD_DIR\"" diff --git a/tools/export_windows.sh b/tools/export_windows.sh new file mode 100755 index 0000000..7d33e80 --- /dev/null +++ b/tools/export_windows.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# Baut die Windows-Desktop-EXE (x86_64, PCK eingebettet) nach build/windows/. +set -euo pipefail +source "$(dirname "${BASH_SOURCE[0]}")/_export_common.sh" +build_preset "Windows" release "build/windows/rinkplanner.exe" diff --git a/tools/setup_android.sh b/tools/setup_android.sh new file mode 100755 index 0000000..8ea18fa --- /dev/null +++ b/tools/setup_android.sh @@ -0,0 +1,172 @@ +#!/usr/bin/env bash +# Richtet die Android-Toolchain für Godot ein (JDK, Android SDK, Templates, +# Debug-Keystore) und trägt die Pfade in die Godot-Editor-Settings ein. +# +# Aufruf: +# ./tools/setup_android.sh +# +# Das Skript ist idempotent: bereits vorhandene Teile werden übersprungen. +# Es lädt ca. 1,6 GB und braucht ca. 3 GB Plattenplatz. +# +# Getestete Versionen: +# Godot 4.7.2, Temurin JDK 17, Android command-line tools 12.0, +# build-tools 36.0.0/35.0.0, platforms;android-36 +set -euo pipefail + +GODOT_VERSION="${GODOT_VERSION:-4.7.2}" +TEMPLATE_VERSION="${GODOT_VERSION}.stable" + +JDK_DIR="${JDK_DIR:-$HOME/.jdks/temurin-17}" +SDK_DIR="${SDK_DIR:-$HOME/Android/Sdk}" +TPL_DIR="${TPL_DIR:-$HOME/.local/share/godot/export_templates/$TEMPLATE_VERSION}" +KEYSTORE="${KEYSTORE:-$HOME/.local/share/godot/keystores/debug.keystore}" +DOWNLOAD_DIR="${DOWNLOAD_DIR:-$HOME/.cache/rinkplanner-setup}" + +JDK_URL="https://api.adoptium.net/v3/binary/latest/17/ga/linux/x64/jdk/hotspot/normal/eclipse" +CMDLINE_TOOLS_URL="https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip" +TEMPLATES_URL="https://github.com/godotengine/godot/releases/download/${GODOT_VERSION}-stable/Godot_v${GODOT_VERSION}-stable_export_templates.tpz" + +BUILD_TOOLS_VERSIONS=("36.0.0" "35.0.0") + +log() { printf '\n==> %s\n' "$*"; } +need() { command -v "$1" >/dev/null 2>&1 || { echo "Fehlt: $1" >&2; exit 1; }; } + +need curl +need unzip +need tar +need python3 + +mkdir -p "$DOWNLOAD_DIR" + +download() { + local url="$1" target="$2" + if [[ -s "$target" ]]; then + echo "vorhanden: $target" + return + fi + echo "lade: $url" + curl -fL --retry 3 --progress-bar -o "$target.part" "$url" + mv "$target.part" "$target" +} + +# --- JDK --------------------------------------------------------------------- +if [[ -x "$JDK_DIR/bin/java" ]]; then + log "JDK vorhanden: $JDK_DIR" +else + log "Installiere Temurin JDK 17 nach $JDK_DIR" + archive="$DOWNLOAD_DIR/temurin17.tar.gz" + download "$JDK_URL" "$archive" + tmp="$(mktemp -d)" + tar -xzf "$archive" -C "$tmp" + rm -rf "$JDK_DIR" + mkdir -p "$(dirname "$JDK_DIR")" + mv "$tmp"/* "$JDK_DIR" + rm -rf "$tmp" +fi +"$JDK_DIR/bin/java" -version + +# --- Android SDK ------------------------------------------------------------- +if [[ -x "$SDK_DIR/platform-tools/adb" ]]; then + log "Android SDK vorhanden: $SDK_DIR" +else + log "Installiere Android command-line tools nach $SDK_DIR" + archive="$DOWNLOAD_DIR/commandlinetools.zip" + download "$CMDLINE_TOOLS_URL" "$archive" + rm -rf "$SDK_DIR/cmdline-tools" + mkdir -p "$SDK_DIR/cmdline-tools" + tmp="$(mktemp -d)" + unzip -q "$archive" -d "$tmp" + mv "$tmp/cmdline-tools" "$SDK_DIR/cmdline-tools/latest" + rm -rf "$tmp" +fi + +SDKMANAGER="$SDK_DIR/cmdline-tools/latest/bin/sdkmanager" +export JAVA_HOME="$JDK_DIR" +export ANDROID_HOME="$SDK_DIR" +export ANDROID_SDK_ROOT="$SDK_DIR" + +if [[ ! -x "$SDK_DIR/platform-tools/adb" ]]; then + log "Akzeptiere Android-Lizenzen" + yes | "$SDKMANAGER" --sdk_root="$SDK_DIR" --licenses >/dev/null || true + + log "Installiere Platform-Tools, Build-Tools und Platform" + packages=("platform-tools" "platforms;android-36") + for version in "${BUILD_TOOLS_VERSIONS[@]}"; do + packages+=("build-tools;$version") + done + "$SDKMANAGER" --sdk_root="$SDK_DIR" "${packages[@]}" +fi + +"$SDK_DIR/platform-tools/adb" version | head -1 + +# --- Godot-Export-Templates -------------------------------------------------- +if [[ -f "$TPL_DIR/android_debug.apk" ]]; then + log "Godot-Export-Templates vorhanden: $TPL_DIR" +else + log "Installiere Godot-$GODOT_VERSION-Export-Templates" + archive="$DOWNLOAD_DIR/export_templates.tpz" + download "$TEMPLATES_URL" "$archive" + rm -rf "$TPL_DIR" + mkdir -p "$TPL_DIR" + tmp="$(mktemp -d)" + unzip -q "$archive" -d "$tmp" + cp -a "$tmp/templates/." "$TPL_DIR/" + rm -rf "$tmp" +fi +ls "$TPL_DIR" | sed -n '1,6p' + +# --- Debug-Keystore ---------------------------------------------------------- +if [[ -f "$KEYSTORE" ]]; then + log "Debug-Keystore vorhanden: $KEYSTORE" +else + log "Erzeuge Debug-Keystore" + mkdir -p "$(dirname "$KEYSTORE")" + "$JDK_DIR/bin/keytool" -genkeypair -keyalg RSA -keysize 2048 -validity 10000 \ + -keystore "$KEYSTORE" -storetype PKCS12 -storepass android -alias androiddebugkey \ + -keypass android -dname "CN=Android Debug,O=Android,C=US" >/dev/null +fi + +# --- Godot Editor-Settings --------------------------------------------------- +log "Trage Pfade in die Godot-Editor-Settings ein" +python3 - "$JDK_DIR" "$SDK_DIR" "$KEYSTORE" <<'PY' +import configparser +import pathlib +import re +import shutil +import sys + +java_path, sdk_path, keystore = sys.argv[1:4] +for name in ("editor_settings-4.7.tres", "editor_settings-4.6.tres"): + path = pathlib.Path.home() / ".config" / "godot" / name + if not path.exists(): + continue + text = path.read_text() + shutil.copy2(path, path.with_suffix(path.suffix + ".bak")) + replacements = { + "export/android/java_sdk_path": java_path, + "export/android/android_sdk_path": sdk_path, + "export/android/debug_keystore": keystore, + } + for key, value in replacements.items(): + line = f'{key} = "{value}"' + if re.search(rf'^{re.escape(key)} = .*$', text, flags=re.M): + text = re.sub(rf'^{re.escape(key)} = .*$', line, text, flags=re.M) + else: + text = text.rstrip() + "\n" + line + "\n" + path.write_text(text) + print(f"aktualisiert: {path} (Backup: {path}.bak)") +PY + +log "Fertig" +cat <&2; exit 1; } +[[ -x "$BUILD_TOOLS/aapt2" ]] || { echo "aapt2 fehlt: $BUILD_TOOLS" >&2; exit 1; } + +fail=0 +expect() { + local pattern="$1" label="$2" haystack="$3" + if grep -qE "$pattern" <<<"$haystack"; then + echo "ok $label" + else + echo "FAIL $label (erwartet: $pattern)" >&2 + fail=1 + fi +} + +badging="$("$BUILD_TOOLS/aapt2" dump badging "$APK")" +echo "APK: $APK" +expect "^package: name='de\.rinkplanner\.app'" "Paketname" "$badging" +expect "versionName='[0-9]+\.[0-9]+\.[0-9]+'" "Version" "$badging" +expect "minSdkVersion:'24'" "minSdk 24" "$badging" +expect "native-code: 'arm64-v8a'" "ABI arm64-v8a" "$badging" +expect "application-label:'Rinkplanner'" "App-Label" "$badging" + +features="$("$BUILD_TOOLS/aapt2" dump xmltree --file AndroidManifest.xml "$APK" 2>/dev/null)" +expect "screenOrientation.*=0" "Landscape" "$features" + +if [[ -d "$JDK_DIR/bin" ]]; then + export PATH="$JDK_DIR/bin:$PATH" + if "$BUILD_TOOLS/apksigner" verify "$APK" >/dev/null 2>&1; then + echo "ok Signatur" + else + echo "FAIL Signatur" >&2 + fail=1 + fi +else + echo "skip Signatur (JDK nicht gefunden: $JDK_DIR)" +fi + +if [[ "$fail" -ne 0 ]]; then + echo "APK-Prüfung fehlgeschlagen." >&2 + exit 1 +fi +echo "APK-Prüfung bestanden."