mirror of
https://github.com/thunderheronight/splat-workshop.git
synced 2026-10-18 08:01:35 +02:00
Compare commits
40
Commits
No files matched your search
+112
@@ -2,6 +2,110 @@
|
||||
|
||||
All notable changes to Splat Workshop. The format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), versions follow [Semantic Versioning](https://semver.org/).
|
||||
|
||||
## [0.6.0] – 2026-10-17
|
||||
|
||||
### Added
|
||||
|
||||
- **Import your own splats**: *+ Import a splat …* above the finished scenes turns a splat file from another program into a scene like the others – to copy it to the Frame, make versions or a mesh. Reads `.ply`, `.sog`, `.spz`, `.splat` and `.ksplat` (via splat-transform); the file itself stays where it is. (Asked for in [#2](https://github.com/thunderheronight/splat-workshop/issues/2).)
|
||||
- **Which way is up**: Y down as Spirula Studio, COLMAP and the Frame's own scenes have it (the usual case), Y up or Z up for files from other tools.
|
||||
- **Size**: a factor, e.g. 0.01 for a file in centimetres – a reconstruction from photos has no real scale of its own.
|
||||
- The preview in the Frame's gallery comes from the top view, as for tours.
|
||||
- Only from this PC (the file dialog opens here). Also on the command line: `scripts/import.sh`.
|
||||
|
||||
### Fixed
|
||||
|
||||
- **The page did not update any more (0.5.1)**: the new footer stood below the page's script; setting up its *Check for updates* link failed, and the rest of the script – among it the regular status updates – never ran. A finished job stayed on "Converting …" with its progress bar until the page was reloaded. A test now checks that everything the script sets up on load is already in the page.
|
||||
|
||||
## [0.5.1] – 2026-10-17
|
||||
|
||||
### Added
|
||||
|
||||
- **A note when a newer version is out**: once a day Splat Workshop asks GitHub for the newest release (one plain request in the background, nothing about you is sent) and shows *Splat Workshop x.y.z is out* at the top, with *What's new* and how to update; *Later* hides it until the next version. `check_updates = false` under `[server]` switches it off. (Asked in [#2](https://github.com/thunderheronight/splat-workshop/issues/2).)
|
||||
- **How to update** in the README: `git pull`, restart – config and scenes stay.
|
||||
- **Check for updates** by hand: in the tray icon's menu (the answer comes as a notification; a click on it opens what's new) and at the bottom of the page. (Suggested in #2.)
|
||||
- **Version and links at the bottom of the page**: which Splat Workshop this is, GitHub, the releases. (Suggested in #2.)
|
||||
- **Copying to the Frame shows how far it is**: *Copying to the Frame … 45 % (7 MB of 16 MB)*, measured every 2 seconds on the Frame. Before, it only said that it was copying – a scene of 1 M splats takes a few seconds over Wi-Fi, a big version much longer. (Asked in #2.)
|
||||
- **After a mesh, what to do with it**: the finished job and the mesh dialog show the files to **download** – also from a phone or laptop at home – plus **Open in Blender** (when Blender is installed, as a program or the Flatpak from Flathub: the mesh is imported right away, GLB first) and the folder.
|
||||
|
||||
## [0.5.0] – 2026-10-16
|
||||
|
||||
### Added
|
||||
|
||||
- **Mesh export**: *Mesh …* on every scene and tour turns the splats into a surface with Spirula Studio (`spirula mesh`) – for Blender and other 3D programs, or for 3D printing. Formats: **GLB** (recommended: colours or texture in one file), **STL** (no colours, for slicers), **OBJ** (with a texture if possible, otherwise without colours) and **PLY** (colours per corner).
|
||||
- **Stands upright, floor at height 0**: our scenes have Y pointing down like the Steam Frame's tracking, so a mesh used to lie on its side in Blender. Now PLY and STL get Z up, GLB and OBJ Y up as their standard and custom want (Blender turns those into Z up itself on import – checked in Blender 5.2 for every format); the floor – found as for the floor plan – is moved to height 0. In metres.
|
||||
- What lies well outside the room is left out before meshing (as the *Edges* clean-up does) – otherwise big blobs beyond the walls become lumps floating around the room.
|
||||
- A **texture** from the training images when they are still there; after *clean up → training images*, colours per corner from the splats.
|
||||
- The mesh lives in the scene's folder (`mesh/`); a new one replaces the old one. *Mesh ✓* shows which scenes have one.
|
||||
- Also on the command line: `scripts/mesh.sh` and `scripts/upright.py`.
|
||||
|
||||
### Fixed
|
||||
|
||||
- A versions job with one version said "1 versions".
|
||||
|
||||
## [0.4.2] – 2026-10-15
|
||||
|
||||
### Fixed
|
||||
|
||||
- **Unfolding recordings or versions sometimes did nothing**: every click loaded the whole scene list again, which took about 3 seconds while the Frame was switched off – clicking again in that time folded it back. Now it opens and closes at once, and an expired listing of the Frame is renewed in the background instead of holding up the scene list.
|
||||
- **"To the Frame" on a version** could be clicked while the Frame was not reachable; now it is greyed out like the one on the scene.
|
||||
|
||||
## [0.4.1] – 2026-10-15
|
||||
|
||||
Setup made clearer – thanks to the first two issues from outside (#1, #2).
|
||||
|
||||
### Fixed
|
||||
|
||||
- **A typo in the config is pointed out**: a setting Splat Workshop does not know – such as `splat-transform =` instead of `splat_transform =` – used to be ignored silently, so splat-transform stayed "not found" without a reason. Now the setup hints name it, with the right spelling. `install.sh` does too.
|
||||
- **splat-transform on the shell's PATH only**: `install.sh` checked the PATH of the shell it runs in, but Splat Workshop, started from the desktop or the tray, does not read `.bashrc`/`.zshrc` – the installer said ✓, the app said "not found". Now `install.sh` writes the full path into a new config, or prints the line to add to an existing one; the hint in the app explains why and how.
|
||||
- **The npm instructions** in the setup guide installed into a folder whose path did not match the one given for the config. Now: `npm install -g --prefix ~/arcturus/node @playcanvas/splat-transform` (no root needed) and `~/arcturus/node/bin/splat-transform`.
|
||||
- **The Arcturus pipeline and PyAV 19** ("unexpected keyword argument 'metadata_errors'"): Splat Workshop now spots a pipeline that is not pinned to PyAV below 19 before you start, and names the cause and the fix when a conversion fails because of it – instead of only a traceback. It does not change the pipeline itself.
|
||||
|
||||
## [0.4.0] – 2026-10-15
|
||||
|
||||
### Added
|
||||
|
||||
- **Clean up a version** (experimental): in the versions dialog, four sliders from *off* to 100 % – the scene itself stays as it is, only the new version is cleaned up, so it can be compared side by side with one without (e.g. *all splats* for the PC).
|
||||
- **Ceiling**: a white ceiling gives the reconstruction nothing to hold on to – it stays thin, with a dark veil under it. Takes out the veil (deeper with more strength; dark things within 50 cm of a wall, like a cupboard top or a bird cage, stay) and what lies above the ceiling, and puts in a closed ceiling in the colour of what there is of it. The ceiling's height is found where walls and ceiling meet. In a real living room: the veil of about 210,000 splats gone, the ceiling closed with 72,000.
|
||||
- **Floor**: fills holes in the floor in the colour of the floor around them, and takes out what lies under it.
|
||||
- **Haze**: takes out big, nearly transparent blobs floating in the room – measured by their *smallest* axis, so long thin things (the bars of a bird cage, cables) are no haze and stay.
|
||||
- **Edges**: takes out what lies well outside the room – beyond the walls, above the ceiling, under the floor.
|
||||
- Also on the command line: `scripts/clean.py`.
|
||||
- **The versions dialog, reworked** – by purpose instead of by size: *for the Frame* (one size, each with its frame rate as measured: 0.75 M ≈ 36 fps, 1 M ≈ 35 fps and clearly sharper, 1.5 M ≈ 29 fps, 2 M ≈ 24 fps) or *for the PC* (all splats). One version per click, optionally the same *without cleaning up* next to it to compare. Before making, the dialog shows what it will make – and when that replaces an existing version.
|
||||
- Versions are named by what was cleaned up and how strongly (*all splats · ceiling 50 % · haze 30 %*), so two tries never look alike.
|
||||
- **As template** takes a version's settings into the form: change one slider and make the next.
|
||||
- A cleaned version for the PC keeps its own file for **Spirula Studio** and opens there with one click.
|
||||
- **Versions unfold under their scene or tour** (*▸ 3 versions*), with Spirula, copying to the Frame (with a warning above 2.5 M splats), template and delete.
|
||||
- **Tidier action bars** on scenes and tours: what you do (put together, copy to the Frame) – what you look at (Spirula, floor plan, folder) – what you change (rename, scale, clean up, delete, as icons with tooltips); the unfolding lists (*▸ 3 recordings*, *▸ 1 version* or *+ Versions …*) on a line of their own. One versions button instead of two.
|
||||
- The PC sizes 3, 5 and 8 M are gone – on the PC all splats is what counts; any other size goes through *own size*.
|
||||
- `scripts/freespace.py` (experimental, command line only): takes out splats in space the cameras looked through, from the recordings' sparse models. On a real living room it found only 0.4 % – white walls and ceilings have too few points to tell – but looked a little better; kept for trying.
|
||||
|
||||
## [0.3.1] – 2026-10-15
|
||||
|
||||
### Fixed
|
||||
|
||||
- **Folder names without a dot at the end**: a name like "Tour 12.10." gave the folder `Tour-12.10.`, which Windows file systems (NTFS, e.g. a second disk the runs are moved to) refuse – the copy silently lacked that tour. Now it is `Tour-12.10`. Existing folders keep their names.
|
||||
|
||||
## [0.3.0] – 2026-10-15
|
||||
|
||||
### Added
|
||||
|
||||
- **Rooms made of several recordings**: mark a group as *one room made of several recordings*, e.g. two short rounds through the living room. When it is put together, every part of the room comes from the recording that saw it best. Each recording still gets up to 500 image pairs, so several short recordings give a room far more detail than one long one.
|
||||
- **Split a long video**: for a recording longer than its quality preset can use (500 image pairs – 100 s at *High*), Splat Workshop offers *Split the video* or *Convert in one piece*, each with its pros and cons. Split, it suggests as few parts as give the full rate of image pairs, all equally long (a 4-minute recording at *High*: 3 parts of 1:24 with 420 pairs each instead of 2 pairs per second), converts them one after the other and puts them together into one room. The parts are cut losslessly with the original time stamps (the pipeline matches images and poses by time); the original recording is never changed and is needed to cut again, so deleting it asks once more.
|
||||
- **A home made of rooms**: a group may hold such rooms next to single scenes. Putting it together always starts from the original recordings in one go, each in its room: within a room every part from the best recording, between rooms the borders run through the doors as before. Nothing is reduced twice. The floor plan names and measures rooms instead of recordings, and the scale of a home reaches its rooms and their recordings.
|
||||
|
||||
- **Standby when done**: a checkbox on the running job. When everything is finished – also the following parts of a long recording, putting them together and copying to the Frame – the PC goes to standby after a minute's notice (a notification says so; untick to stop it). Cancelling a job switches it off: someone is there. If the standby is refused (e.g. another program keeps the PC awake), a notification says why.
|
||||
- **One brightness for all recordings**: every training settles on its own brightness, so the same wall could come out a third darker in one recording than in the next. Putting them together now brings all recordings to one brightness per colour channel, from the places they share (`COLOUR=keep` for combine.sh leaves them as they are). The factors are in combine.json.
|
||||
|
||||
### Fixed
|
||||
|
||||
- **Dark holes where a recording had nothing**: a place went to the recording whose cameras looked at it from close by, even when its training had left next to nothing there (seen from behind furniture, too dark …). Now a place only goes to a recording that has at least a quarter of what the richest one has there (compared over the place and its neighbours). In a real living room of three parts, the places left thin dropped from 8.5 % to 1.9 %.
|
||||
- **Kept awake between jobs**: every job keeps the PC awake while it runs, but between two of them (the parts of a long recording, then putting them together) there were a few seconds without – enough for the desktop to suspend a PC that has been idle for hours. Splat Workshop now holds one lock of its own for all of it, until a little after the last job.
|
||||
- **A renamed room** gets its floor plan and preview images drawn again with the new name (before: the old name until it was put together again).
|
||||
- Two rooms of the same name in a home are told apart as "Kitchen" and "Kitchen (2)" (was "Kitchen ·").
|
||||
- The dialog for putting a room together explains rooms, not tours.
|
||||
- A part of a long recording that failed or was cancelled keeps its piece of video for resuming; deleting the unfinished run now deletes that piece too (it is as big as that stretch of the recording and was in no list).
|
||||
- Recordings of the same room no longer count as "walking in" to each other. Before, two overlapping recordings could hide the real walk-in of another room, which then claimed part of the room.
|
||||
|
||||
## [0.2.3] – 2026-10-14
|
||||
|
||||
### Added
|
||||
@@ -92,6 +196,14 @@ First release.
|
||||
- **Floor plans** (experimental) in two styles with a measuring tool.
|
||||
- Configurable video player; English and German interface.
|
||||
|
||||
[0.6.0]: https://github.com/thunderheronight/splat-workshop/compare/v0.5.1...v0.6.0
|
||||
[0.5.1]: https://github.com/thunderheronight/splat-workshop/compare/v0.5.0...v0.5.1
|
||||
[0.5.0]: https://github.com/thunderheronight/splat-workshop/compare/v0.4.2...v0.5.0
|
||||
[0.4.2]: https://github.com/thunderheronight/splat-workshop/compare/v0.4.1...v0.4.2
|
||||
[0.4.1]: https://github.com/thunderheronight/splat-workshop/compare/v0.4.0...v0.4.1
|
||||
[0.4.0]: https://github.com/thunderheronight/splat-workshop/compare/v0.3.1...v0.4.0
|
||||
[0.3.1]: https://github.com/thunderheronight/splat-workshop/compare/v0.3.0...v0.3.1
|
||||
[0.3.0]: https://github.com/thunderheronight/splat-workshop/compare/v0.2.3...v0.3.0
|
||||
[0.2.3]: https://github.com/thunderheronight/splat-workshop/compare/v0.2.2...v0.2.3
|
||||
[0.2.2]: https://github.com/thunderheronight/splat-workshop/compare/v0.2.1...v0.2.2
|
||||
[0.2.1]: https://github.com/thunderheronight/splat-workshop/compare/v0.2.0...v0.2.1
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
# Notes for working on Splat Workshop
|
||||
|
||||
## Releasing – every release, also a patch
|
||||
|
||||
1. Only with the maintainer's explicit OK for each step: push, tag, GitHub release, editing release notes.
|
||||
2. `VERSION` in `splat_workshop/server.py`, a `## [x.y.z] – date` section and the compare link in `CHANGELOG.md`.
|
||||
3. Tests green locally and in GitHub Actions before tagging.
|
||||
4. **Release notes always have this shape** (a patch release too – people who only read the latest
|
||||
release must still see what the series brought):
|
||||
- one bold line: what the series is about, plus what this release adds;
|
||||
- the screenshot (`docs/groups.png`, example data only);
|
||||
- `## Highlights of x.y` – the highlights of the whole minor series, copied from the `x.y.0` release;
|
||||
- a link to the `x.y.0` release for all details;
|
||||
- `## New in x.y.z` – what this release adds or fixes (for `x.y.0` itself: `## New in x.y`);
|
||||
- `**Full changelog:**` compare link to the previous tag.
|
||||
Check the finished notes against this list before publishing.
|
||||
|
||||
## Tests
|
||||
|
||||
`uv run --no-project --with pytest --with numpy --with scipy --with pillow pytest`
|
||||
|
||||
Expectations come from how the synthetic data is built (`tests/synth.py`), not from the code. Tests must
|
||||
never touch real data, the Frame or this PC's power state (`systemctl`, `ssh`, `notify-send` are faked).
|
||||
|
||||
## Running scripts
|
||||
|
||||
`splat.sh`, `to-frame.sh`, `combine.sh`, `versions.sh` run as one `{ … exit; }` block; still, never edit
|
||||
one in place while a job uses it – write a new file and `mv` it over.
|
||||
|
||||
## File systems
|
||||
|
||||
Runs may live on NTFS: no folder or file name may end with a dot or contain `:`; git there needs
|
||||
`core.fileMode false`. With that, git does not see the executable bit: a new shell script needs
|
||||
`git update-index --chmod=+x scripts/<name>.sh`, or it is not executable in CI and fresh clones.
|
||||
+49
-6
@@ -19,8 +19,44 @@ Arcturus Vision stellt die Rekonstruktions-Skripte und einen Spirula-Studio-Fork
|
||||
1. **Aufnahme wählen** – direkt von der Frame (per SSH) oder vom PC, mit Vorschaubildern.
|
||||
2. **Prüfen**, bevor eine Stunde Rechenzeit draufgeht: Helligkeit, Struktur, schnelle Schwenks, verdeckte Linse – Sekunde für Sekunde.
|
||||
3. **Umwandeln** mit Qualitätsstufe (Schnell / Hoch / Maximal) oder eigenen Werten, mit Fortschritt, Restzeit und PSNR-Kurve.
|
||||
4. **In die Galerie**: Vorschaubild und Namensschild im Stil der Beispielszenen, kopiert in den `Scenes`-Ordner von Gaussian XR auf der Frame.
|
||||
5. **Die Wohnung zusammensetzen**: Räume gruppieren und zu einem Rundgang machen, durch den du gehst – voll für den PC, kleiner für die Frame.
|
||||
4. **In die Galerie**: Vorschaubild und Namensschild im Stil der Beispielszenen, kopiert in den Ordner für eigene Szenen von Gaussian XR auf der Frame (`Documents/GaussianXR`).
|
||||
5. **Die Wohnung zusammensetzen**: Räume gruppieren – ein Raum darf aus mehreren Aufnahmen bestehen – und zu einem Rundgang machen, durch den du gehst, voll für den PC, kleiner für die Frame.
|
||||
|
||||
## Neu in 0.6
|
||||
|
||||
- 📥 **Eigene Splats importieren** – eine Splat-Datei aus einem anderen Programm (`.ply`, `.sog`, `.spz`, `.splat`, `.ksplat`) wird zu einer Szene wie die anderen: auf die Frame bringen, Fassungen oder ein Mesh machen. Du sagst, wo oben ist, und bei Bedarf die Größe.
|
||||
|
||||
<img src="docs/import.png" width="420" alt="Der Import-Dialog: Datei wählen, benennen, sagen, wo oben ist, und die Größe">
|
||||
<br><sub>Englische Oberfläche.</sub>
|
||||
|
||||
## Neu in 0.5
|
||||
|
||||
- 🧊 **Mesh-Export** – *Mesh …* macht aus einer Szene oder einem Rundgang eine Oberfläche für Blender und andere 3D-Programme (GLB, OBJ, PLY) oder für den 3D-Druck (STL). Sie steht aufrecht mit dem Boden auf Höhe 0, statt auf der Seite zu liegen – für jedes Format per Import in Blender geprüft; mit Textur, wenn die Trainingsbilder noch da sind. Die Dateien lassen sich herunterladen – auch von anderen Geräten im Heimnetz – oder mit einem Klick in Blender öffnen. (Angeregt in [#2](https://github.com/thunderheronight/splat-workshop/issues/2).)
|
||||
|
||||
<img src="docs/mesh.png" width="400" alt="Der Mesh-Dialog: GLB und STL angehakt, OBJ und PLY zur Wahl, Textur aus den Trainingsbildern, das vorhandene Mesh mit seinen Dateien"> <img src="docs/mesh-blender.png" width="500" alt="Das Mesh eines Beispielraums in Blender: aufrecht auf dem Boden">
|
||||
<br><sub>Beispieldaten – ein künstlicher Raum, in Blender gerendert (englische Oberfläche).</sub>
|
||||
|
||||
## Neu in 0.4
|
||||
|
||||
- 🧽 **Fassungen bereinigen** *(experimentell)* – vier Schieberegler im Fassungen-Dialog: **Decke** (eine weiße Decke wird zum dunklen Schleier – der Schleier kommt weg, die Decke wird in ihrer eigenen Farbe geschlossen), **Boden** (Löcher gefüllt), **Dunst** (große durchsichtige Wolken; dünne Gitter und Kabel bleiben), **Rand** (was außerhalb des Raums liegt). Die Szene selbst bleibt; die bereinigte Fassung neben einer ohne vergleichen.
|
||||
- 🎚️ **Fassungen nach Zweck** – *für die Frame* (eine Größe, mit den auf einer Steam Frame gemessenen fps) oder *für den PC* (alle Splats); auf Wunsch dieselbe ohne Bereinigung daneben; vorher eine Vorschau, was entsteht. Fassungen heißen nach ihren Bereinigungsstärken, *Als Vorlage* übernimmt die Einstellungen für den nächsten Versuch, eine PC-Fassung öffnet sich mit einem Klick in **Spirula Studio**, und Fassungen **klappen unter ihrer Szene oder ihrem Rundgang auf**.
|
||||
- 🧭 **Aufgeräumte Knopfleisten** – was du tust, was du anschaust, was du änderst; das Aufklappen in einer eigenen Zeile.
|
||||
|
||||
<img src="docs/versions.png" width="420" alt="Der neue Fassungen-Dialog: für die Frame oder den PC, Größen mit gemessenen fps, vier Bereinigungs-Regler, zusätzlich ohne Bereinigung zum Vergleichen und eine Vorschau der zwei Fassungen"> <img src="docs/versions-list.png" width="520" alt="Eine Szene mit aufgeklappten Fassungen: 1 Mio. für die Frame mit und ohne Bereinigung, alle Splats für den PC mit Spirula und Als Vorlage">
|
||||
<br><sub>Beispieldaten – Szene und Vorschaubild sind Platzhalter (englische Oberfläche).</sub>
|
||||
|
||||
## Neu in 0.3
|
||||
|
||||
- 🚪 **Räume aus mehreren Aufnahmen** – eine Gruppe als *Ein Raum aus mehreren Aufnahmen* markieren, z. B. zwei kurze Runden durchs Wohnzimmer. Beim Zusammensetzen kommt jeder Teil des Raums aus der Aufnahme, die ihn am besten gesehen hat. Die Arcturus-Pipeline nimmt höchstens 500 Bildpaare pro Aufnahme – mehrere kurze Aufnahmen geben einem Raum also deutlich mehr Detail als eine lange.
|
||||
- ✂️ **Lange Videos aufteilen** – bei langen Aufnahmen bietet die Werkstatt *Video aufteilen* (volle Detailtiefe, dauert länger) oder *Video nicht aufteilen* (schneller, weniger Bildpaare pro Sekunde) an. Aufgeteilt werden die Teile nacheinander umgewandelt und von selbst zu einem Raum. Die Original-Aufnahme bleibt unverändert.
|
||||
- 🏠 **Eine Wohnung aus Räumen** – eine Gruppe darf solche Räume neben einzelnen Szenen enthalten. Zusammengesetzt wird in einem Durchgang aus den Original-Aufnahmen: innerhalb eines Raums jeder Teil aus der besten Aufnahme, zwischen den Räumen laufen die Grenzen durch die Türen. Nichts wird doppelt ausgedünnt; der Grundriss benennt und misst Räume statt Aufnahmen.
|
||||
- 🧩 **Bessere Übergänge zwischen Aufnahmen** – eine Stelle kommt nur noch von einer Aufnahme, die dort wirklich etwas hat (keine dunklen Löcher mehr, wo eine Kamera „von hinter dem Sofa“ hingeschaut hat), und alle Aufnahmen werden auf eine Helligkeit gebracht: Jedes Training landet bei seiner eigenen, im selben Raum bis zu einem Drittel auseinander.
|
||||
- 💤 **Danach in den Standby** – am laufenden Job anhaken: Wenn alles fertig ist (alle Teile, das Zusammensetzen, das Kopieren auf die Frame), geht der PC nach einer Minute Vorwarnung in den Standby. Bis dahin bleibt er wach, auch in den Sekunden zwischen zwei Jobs.
|
||||
- 🐛 **Behoben**: Aufnahmen desselben Raums gelten nicht mehr gegenseitig als „Weg hinein“ – vorher konnten sie den echten Weg aus einem anderen Raum verdecken, der sich dann einen Teil des Raums nahm.
|
||||
|
||||
## Neu in 0.2.3
|
||||
|
||||
- 🚂 **Maßstab für Modelle**, 🎚️ **Fassungen** nebeneinander, ⚡ **1 Mio. Splats als Empfehlung für die Frame**, 📂 Szenen in `Documents/GaussianXR` (Steam-Updates lassen den Ordner in Ruhe), 🥽 Reiter **Auf der Frame**, ⬇️ **Alle Aufnahmen holen**, 🗑️ **Aufnahmen einzeln löschen**. Details: [Release 0.2.3](https://github.com/thunderheronight/splat-workshop/releases/tag/v0.2.3).
|
||||
|
||||
## Neu in 0.2
|
||||
|
||||
@@ -42,13 +78,16 @@ Alle Änderungen: [CHANGELOG.md](CHANGELOG.md) (englisch)
|
||||
- **Umwandlungen laufen unabhängig weiter** – Browser zu, Tray beendet, Neustart: Werkstatt wieder öffnen, Fortschritt ist wieder da.
|
||||
- **Abbrechen & Fortsetzen** ab dem letzten Zwischenstand.
|
||||
- **Aufnahmeprüfung ohne KI**: reine Messwerte je Sekunde, farbige Zeitleiste und konkrete Hinweise („0:45–0:59 wenig Struktur“).
|
||||
- **Räume aus mehreren Aufnahmen** *(0.3)*: Ein Raum kann aus mehreren kurzen Aufnahmen bestehen (jede bis zu 500 Bildpaare) und eine Wohnung aus solchen Räumen – jeder Teil kommt aus der Aufnahme, die ihn am besten gesehen hat, die Grenzen zwischen den Räumen laufen durch die Türen. Räume erscheinen in der Liste innerhalb ihrer Wohnung und lassen sich auch einzeln zusammensetzen, ansehen und auf die Frame bringen.
|
||||
- **Gruppen und Rundgänge**: Szenen gruppieren (z. B. alle Räume der Wohnung) und zu einer Szene zusammensetzen – eine volle Fassung für Gaussian XR am PC und eine kleinere für die Frame. Aufnahmen aus einem Durchgang teilen das Tracking-Koordinatensystem der Frame; die Werkstatt richtet die Räume aneinander aus (Korrekturen A–D zur Wahl), legt die Grenzen zwischen den Aufnahmen in die Türen und zeigt, wie gut die Räume aneinanderpassen. Vor dem Start schätzt sie den Speicherbedarf.
|
||||
<br><img src="docs/combine.png" width="360" alt="Dialog „Zusammensetzen“: Korrekturen A bis D, Grenzen zwischen den Aufnahmen, Größe der Frame-Fassung, volle Fassung, Speicherschätzung">
|
||||
<br><sub>Beispieldaten (englische Oberfläche) – Raumnamen und Vorschaubilder sind Platzhalter.</sub>
|
||||
- **Fassungen** einer Szene oder eines Rundgangs nebeneinander: weniger Splats für die Frame (0,75–2 Mio.), alle oder eine Obergrenze für den PC oder eine eigene Größe – jede mit eigenem Platz in der Galerie der Frame, zum Vergleichen, was flüssig läuft.
|
||||
- **Fassungen** einer Szene oder eines Rundgangs nebeneinander: weniger Splats für die Frame (0,75–2 Mio.), alle oder eine Obergrenze für den PC oder eine eigene Größe – jede mit eigenem Platz in der Galerie der Frame, zum Vergleichen, was flüssig läuft. Eine Fassung lässt sich auch **bereinigen** *(0.4, experimentell)*: Decke, Boden, Dunst und Rand, jeweils mit eigener Stärke.
|
||||
- **Alle holen**: Aufnahmen von der Frame alle oder als Auswahl nacheinander holen – mit einer Benachrichtigung, sobald die Frame aus darf.
|
||||
- **Aufnahmen löschen**, einzeln: auf der Frame (mit deutlicher Warnung, wenn sie noch nicht auf dem PC liegt) oder auf dem PC (in den Papierkorb).
|
||||
- Reiter **Auf der Frame**: alles, was in der Galerie von Gaussian XR auf der Frame liegt, mit Vorschaubildern – und von dort aufräumen.
|
||||
- **Maßstab für Modelle** wie eine Modelleisenbahn (Z, N, TT, H0, S, 0, G oder eigener): Grundriss, Größen und Messwerkzeug zeigen die Größe des Originals, und auf Wunsch zeigt Gaussian XR das Modell begehbar in Originalgröße *(an der Frame noch nicht getestet)*.
|
||||
- **Grundrisse** *(experimentell)* einzelner Szenen oder einer ganzen Gruppe – Aufnahmen aus einem Durchgang fügen sich von selbst zum Grundriss der ganzen Wohnung. Zwei Stile: *Hübsch* (Draufsicht in Farbe, Wände, gelaufener Weg) und *Klassisch* (leuchtende Punktdichte), dazu ein einfaches Messwerkzeug (Punkte anklicken, Abstände ablesen – etwa ±5 cm genau).
|
||||
- **Grundrisse** *(experimentell)* einzelner Szenen oder einer ganzen Gruppe – Aufnahmen aus einem Durchgang fügen sich von selbst zum Grundriss der ganzen Wohnung; ein Raum aus mehreren Aufnahmen erscheint als ein Raum mit allen Wegen. Zwei Stile: *Hübsch* (Draufsicht in Farbe, Wände, gelaufener Weg) und *Klassisch* (leuchtende Punktdichte), dazu ein einfaches Messwerkzeug (Punkte anklicken, Abstände ablesen – etwa ±5 cm genau).
|
||||
- **Fertige Szenen**: später auf die Frame übertragen, erneut übertragen, umbenennen (Ordner und Namensschild ziehen mit), löschen (in den Papierkorb), Ordner oder Spirula Studio öffnen.
|
||||
- **Abgebrochene Läufe** werden mit ihrem Stand angezeigt: fortsetzen, neu starten oder löschen.
|
||||
- **Speicherplatz und Aufräumen**: Jede Szene zeigt, wie viel Platz sie belegt (etwa 4 GB pro Raum). Ein Klick löscht Zwischenstände oder Trainingsbilder – Szene, Grundriss und Viewer funktionieren weiter.
|
||||
@@ -65,6 +104,8 @@ cd splat-workshop
|
||||
./install.sh --desktop # Menüeintrag + Desktop-Verknüpfung; --autostart für das Tray beim Anmelden
|
||||
```
|
||||
|
||||
**Aktualisieren:** im geklonten Ordner `git pull`, dann die Splat-Werkstatt beenden (Tray-Symbol → *Beenden*) und neu starten. Config (`~/.config/splat-workshop/`) und Szenen bleiben, wie sie sind; `./install.sh` braucht es nur, wenn der Menüeintrag fehlt. Meckert `git pull` über lokale Änderungen, hast du selbst eine Datei im Ordner geändert – `git stash` legt die Änderung beiseite, `git stash pop` holt sie zurück. Gibt es ein neueres Release, zeigt die Werkstatt oben einen Hinweis: Einmal am Tag fragt sie GitHub nach dem neuesten Release (eine einfache Anfrage, nichts über dich). `check_updates = false` unter `[server]` in der Config schaltet das ab; *Nach Updates suchen* im Menü des Tray-Symbols oder unten auf der Seite fragt sofort nach.
|
||||
|
||||
**Läuft unter Linux** (getestet mit Nobara/Fedora und einer RTX 4070 SUPER). macOS ist ungetestet, Windows wird von der Arcturus-Pipeline noch nicht unterstützt.
|
||||
|
||||
**Arcturus-Pipeline und Spirula Studio einrichten:** Schritt für Schritt in [docs/arcturus-setup.de.md](docs/arcturus-setup.de.md) (Pakete, Spirula bauen, bekannte Stolperfallen).
|
||||
@@ -77,14 +118,16 @@ cd splat-workshop
|
||||
|
||||
Danach in `~/.config/splat-workshop/config.toml` die Pfade zur Arcturus-Pipeline ([arcturus.vision/apps](https://arcturus.vision/apps)), zu Spirula Studio und die Adresse der Frame eintragen. Was noch fehlt, zeigt die Werkstatt oben auf der Seite an.
|
||||
|
||||
Nach dem Übertragen **Gaussian XR auf der Frame neu starten**, damit die Szene in der Galerie erscheint.
|
||||
Nach dem Übertragen **Gaussian XR auf der Frame neu starten**, damit die Szene in der Galerie erscheint. Die Szenen liegen in `Documents/GaussianXR`, den Steam-Updates in Ruhe lassen (bis 0.2.3 lagen sie im `Scenes`-Ordner von Gaussian XR – *Zu den eigenen Szenen verschieben* im Reiter *Auf der Frame* holt sie herüber). Alles bleibt außerdem auf dem PC, *Erneut übertragen* stellt eine Szene wieder her. Für die Frame läuft etwa **1 Mio. Splats** flüssig und sieht noch scharf aus.
|
||||
|
||||
## Aufnahmetipps
|
||||
|
||||
- Viel Licht (Tageslicht plus Raumlicht), **HDR mit 30 fps** in der Kamera-App, nicht „Linear“.
|
||||
- **Räume**: 30–90 s pro Raum, langsam gehen und langsam drehen, Dinge von mehreren Seiten zeigen.
|
||||
- **Große Räume**: Die Pipeline nimmt höchstens 500 Bildpaare pro Aufnahme – bei 5 pro Sekunde (*Hoch*) ist das nach 100 s erreicht, eine 4-Minuten-Aufnahme bekommt nur noch 2 pro Sekunde. Bei einer langen Aufnahme beim Start *Video aufteilen* wählen – oder zwei oder drei kürzere Aufnahmen eines großen Raums in einem Durchgang machen und sie als *Ein Raum aus mehreren Aufnahmen* gruppieren.
|
||||
- **Gegenstände**: langsam im Kreis darum herumgehen (15–40 s), Motiv in der Bildmitte halten.
|
||||
- Nicht lange auf kahle Wände, Decke oder Fliesen halten.
|
||||
- Nicht lange auf kahle Wände, Decke oder Fliesen halten. Die **Decke** aber ab und zu mitnehmen, zusammen mit der Wandoberkante oder einer Lampe: Eine weiße Decke, die kaum gefilmt wurde, wird zu einem dunklen Schleier über dem Raum.
|
||||
- **Gleiches Licht**: Gegen Abend ändert sich das Tageslicht schon innerhalb von Minuten merklich, und Aufnahmen eines Raums bei verschiedenem Licht passen schlecht zusammen.
|
||||
- Bewegte Personen werden zu Geisterschleiern.
|
||||
|
||||
## Transparenzhinweis
|
||||
|
||||
@@ -22,7 +22,38 @@ Arcturus Vision publishes the reconstruction scripts and a Spirula Studio fork,
|
||||
2. **Check it** before spending an hour on it: brightness, structure, fast pans and covered lenses, second by second.
|
||||
3. **Convert it** with a quality preset (Fast / High / Maximum) or fine-tuned values, with live progress, ETA and a PSNR curve.
|
||||
4. **Put it in the gallery**: preview image and name plate in the look of the bundled example scenes, copied into Gaussian XR's folder for personal scenes on the Frame (`Documents/GaussianXR`).
|
||||
5. **Put your home together**: group the rooms and turn them into one tour you walk through – full size for the PC, smaller for the Frame.
|
||||
5. **Put your home together**: group the rooms – a room may be several recordings – and turn them into one tour you walk through, full size for the PC, smaller for the Frame.
|
||||
|
||||
## New in 0.6
|
||||
|
||||
- 📥 **Import your own splats** – a splat file from another program (`.ply`, `.sog`, `.spz`, `.splat`, `.ksplat`) becomes a scene like the others: copy it to the Frame, make versions or a mesh. You say which way is up and, if needed, the size.
|
||||
|
||||
<img src="docs/import.png" width="420" alt="The import dialog: choose a file, name it, say which way is up and the size">
|
||||
|
||||
## New in 0.5
|
||||
|
||||
- 🧊 **Mesh export** – *Mesh …* turns a scene or tour into a surface for Blender and other 3D programs (GLB, OBJ, PLY) or for 3D printing (STL). It stands upright with the floor at height 0 instead of lying on its side – checked by importing every format in Blender; with a texture when the training images are still there. Download the files – also from other devices at home – or open the mesh in Blender with one click. (Suggested in [#2](https://github.com/thunderheronight/splat-workshop/issues/2).)
|
||||
|
||||
<img src="docs/mesh.png" width="400" alt="The mesh dialog: GLB and STL ticked, OBJ and PLY to choose, a texture from the training images, the existing mesh with its files"> <img src="docs/mesh-blender.png" width="500" alt="The mesh of an example room in Blender: standing upright on the floor">
|
||||
<br><sub>Example data – a synthetic room, rendered in Blender.</sub>
|
||||
|
||||
## New in 0.4
|
||||
|
||||
- 🧽 **Clean up a version** *(experimental)* – four sliders in the versions dialog: **Ceiling** (a white ceiling turns into a dark veil – the veil goes, the ceiling is closed in its own colour), **Floor** (holes filled), **Haze** (big transparent blobs; thin bars and cables stay), **Edges** (what lies outside the room). The scene itself stays; compare the cleaned version with one without.
|
||||
- 🎚️ **Versions by purpose** – *for the Frame* (one size, with the frame rate measured on a Steam Frame) or *for the PC* (all splats); optionally the same without cleaning up next to it; a preview of what will be made. Versions are named by their clean-up strengths, *As template* takes a version's settings for the next try, a PC version opens in **Spirula Studio** with one click, and versions **unfold under their scene or tour**.
|
||||
- 🧭 **Tidier action bars** – what you do, what you look at, what you change; the unfolding lists on a line of their own.
|
||||
|
||||
<img src="docs/versions.png" width="420" alt="The new version dialog: for the Frame or the PC, sizes with measured frame rates, four clean-up sliders, also without cleaning up to compare, and a preview of the two versions it will make"> <img src="docs/versions-list.png" width="520" alt="A scene with its versions unfolded: 1 M for the Frame with and without cleaning up, all splats for the PC with Spirula and As template">
|
||||
<br><sub>Example data – the scene and its preview are placeholders.</sub>
|
||||
|
||||
## New in 0.3
|
||||
|
||||
- 🚪 **Rooms made of several recordings** – mark a group as *one room made of several recordings*, e.g. two short rounds through the living room. When put together, every part of the room comes from the recording that saw it best. The Arcturus pipeline uses at most 500 image pairs per recording, so several short recordings give a room far more detail than one long one.
|
||||
- ✂️ **Split a long video** – for long recordings Splat Workshop offers *Split the video* (full detail, takes longer) or *Convert in one piece* (sooner, fewer image pairs per second). Split, the parts are converted one after the other and become one room by themselves. The original recording stays untouched.
|
||||
- 🏠 **A home made of rooms** – a group may hold such rooms next to single scenes. It is put together from the original recordings in one go: within a room every part from the best recording, between rooms the borders run through the doors. Nothing is reduced twice; the floor plan names and measures rooms instead of recordings.
|
||||
- 🧩 **Better seams between recordings** – a place only comes from a recording that really has something there (no more dark holes where a camera “looked at” a spot from behind the sofa), and all recordings are brought to one brightness: every training settles on its own, up to a third apart in the same room.
|
||||
- 💤 **Standby when done** – tick it on the running job: when everything is finished (all parts, putting them together, copying to the Frame), the PC goes to standby after a minute's notice. In between, the PC is kept awake, also in the seconds between two jobs.
|
||||
- 🐛 **Fixed**: recordings of the same room no longer count as “walking in” to each other – before, they could hide the real walk-in of another room, which then claimed part of the room.
|
||||
|
||||
## New in 0.2
|
||||
|
||||
@@ -44,14 +75,16 @@ All changes: [CHANGELOG.md](CHANGELOG.md)
|
||||
- **Conversions survive everything**: they run as their own process; close the browser, quit the tray, restart – reopen Splat Workshop and you see the progress again.
|
||||
- **Cancel & resume**: a cancelled conversion continues from its last saved state.
|
||||
- **Recording check** without AI: plain per-second measurements with a colour-coded timeline and concrete hints (“0:45–0:59 little structure”). See [What the check measures](#what-the-check-measures).
|
||||
- **Rooms from several recordings** *(0.3)*: a room can be made of several short recordings (each up to 500 image pairs), and a home of such rooms – every part comes from the recording that saw it best, the borders between rooms run through the doors. Rooms appear inside their home in the list and can also be put together, viewed and copied to the Frame on their own.
|
||||
- **Groups and tours**: group scenes (e.g. all rooms of your home) and put them together into one scene – a full version for Gaussian XR on the PC and a smaller one for the Frame. Recordings from one session share the Frame's tracking frame; Splat Workshop fits the rooms to each other (corrections A–D to choose), lets the borders between recordings run through doors and shows how well the rooms meet. Before starting it estimates the memory needed.
|
||||
<br><img src="docs/combine.png" width="360" alt="Dialog “Put together”: corrections A to D, borders between the recordings, size of the Frame version, full version, memory estimate">
|
||||
<br><sub>Example data – room names and preview images are placeholders.</sub>
|
||||
- **Versions** of a scene or tour side by side: fewer splats for the Frame (0.75–2 M), all or a limit for the PC, or your own size – each with its own place in the Frame's gallery, so you can compare what runs smoothly.
|
||||
- **Versions** of a scene or tour side by side: fewer splats for the Frame (0.75–2 M), all or a limit for the PC, or your own size – each with its own place in the Frame's gallery, so you can compare what runs smoothly. A version can also be **cleaned up** *(0.4, experimental)*: ceiling, floor, haze and edges, each with its own strength.
|
||||
- **Fetch all** recordings from the Frame, or a selection, one after the other – with a notification when the Frame can be switched off.
|
||||
- **Delete a recording**, one at a time: on the Frame (with a clear warning if it is not on the PC yet) or on the PC (to the trash).
|
||||
- **On the Frame** tab: everything in Gaussian XR's gallery on the Frame with preview images, and taking things off it.
|
||||
- **Scale for models** like a model railway (Z, N, TT, H0, S, 0, G or your own): floor plan, sizes and the measuring tool show the original's size, and optionally Gaussian XR shows the model in its original size to walk through *(not tested on the Frame yet)*.
|
||||
- **Floor plans** *(experimental)* of single scenes or a whole group – recordings from one session line up by themselves into a plan of your whole home. Two styles: *Pretty* (colour top view, walls, the path you walked) and *Classic* (glowing point density), plus a simple measuring tool (click points, get distances – about ±5 cm).
|
||||
- **Floor plans** *(experimental)* of single scenes or a whole group – recordings from one session line up by themselves into a plan of your whole home; a room made of several recordings is drawn as one room with all its paths. Two styles: *Pretty* (colour top view, walls, the path you walked) and *Classic* (glowing point density), plus a simple measuring tool (click points, get distances – about ±5 cm).
|
||||
<br><img src="docs/floorplan.png" width="640" alt="Combined floor plan of an example home in the classic style, with the measuring tool">
|
||||
<br><sub>Example home – synthetic data, drawn with the same renderer. Combining rooms relies on the Frame keeping its tracking frame between recordings; how well that holds for a whole home is still being tested.</sub>
|
||||
- **Finished scenes**: copy to the Frame later, re-copy, rename (folder and name plate follow), delete (to the trash), open the folder or open the scene in Spirula Studio.
|
||||
@@ -104,6 +137,17 @@ Downloading recordings and copying scenes uses SSH with a key:
|
||||
4. On your PC: `ssh-copy-id steamos@<frame address>` (enter the password once), then check that `ssh steamos@<frame address>` logs in without asking.
|
||||
5. Give the Frame a fixed IP address in your router so it does not change, and put `steamos@<that address>` into `[frame] host` in the config.
|
||||
|
||||
## Update
|
||||
|
||||
```bash
|
||||
cd splat-workshop # the folder you cloned
|
||||
git pull
|
||||
```
|
||||
|
||||
Then quit Splat Workshop (tray icon → *Quit*) and start it again. Your config (`~/.config/splat-workshop/`) and your scenes stay as they are; `./install.sh` is only needed again if the menu entry is missing. If `git pull` complains about local changes, you edited a file in the folder yourself – `git stash` puts your change aside, `git stash pop` brings it back.
|
||||
|
||||
Splat Workshop shows a note at the top of the page when a newer release is out: once a day it asks GitHub for the newest release (one plain request, nothing about you is sent). `check_updates = false` under `[server]` in the config switches that off; *Check for updates* in the tray icon's menu or at the bottom of the page asks right away.
|
||||
|
||||
## Usage
|
||||
|
||||
Start **Splat Workshop** from the menu (or `./splat-workshop`). The tray icon appears and the page opens in your browser.
|
||||
@@ -114,9 +158,9 @@ Start **Splat Workshop** from the menu (or `./splat-workshop`). The tray icon ap
|
||||
| `./splat-workshop --background` | tray icon only (autostart) |
|
||||
| `./splat-workshop --no-tray` | without tray; the server stops itself after 20 idle minutes |
|
||||
| `./splat-workshop --server` | server in the foreground |
|
||||
| `scripts/splat.sh <recording> "<name>"` | convert on the command line (`QUALITY=fast\|high\|max`, `NO_UPLOAD=1`, `--resume`) |
|
||||
| `scripts/splat.sh <recording> "<name>"` | convert on the command line (`QUALITY=fast\|high\|max`, `NO_UPLOAD=1`, `PART=120-245` for a stretch, `--resume`) |
|
||||
| `scripts/to-frame.sh <run> "<name>"` | (re)copy a finished scene to the Frame |
|
||||
| `scripts/combine.sh <name> "<display name>" <run>=<label> ...` | put scenes together into a tour (`ALIGN=frame\|images\|shift\|rigid`, `FRAME_SPLATS`, `FULL=0`, `NO_UPLOAD=1`) |
|
||||
| `scripts/combine.sh <name> "<display name>" <run>=<label> ...` | put scenes together into a tour (`ALIGN=frame\|images\|shift\|rigid`, `FRAME_SPLATS`, `FULL=0`, `NO_UPLOAD=1`, `ROOMS='["Kitchen","Kitchen","Hallway"]'` for rooms made of several recordings) |
|
||||
|
||||
After copying, **restart Gaussian XR** on the Frame so the new scene appears in the gallery. Scenes go to `Documents/GaussianXR`, which Steam updates leave alone (Splat Workshop 0.2.3 and older used Gaussian XR's own `Scenes` folder – *Move to own scenes* in the *On the Frame* tab moves them over). Everything also stays on the PC, and *Copy again* restores a scene. For the Frame, about **1 M splats** runs smoothly and still looks sharp. The *On the Frame* tab under the finished scenes shows what is in the gallery on the Frame and takes things off it.
|
||||
|
||||
@@ -129,8 +173,10 @@ Set `lan = true` in `[server]`. The page is then reachable at `http://<pc addres
|
||||
- **Light**: daylight plus room lights indoors. Dark recordings get noisy and patchy.
|
||||
- **HDR, 30 fps** in the camera app works best; the pipeline tone-maps HLG automatically. Don't use “Linear”.
|
||||
- **Rooms**: 30–90 s each, walk slowly, turn slowly, look at things from several sides.
|
||||
- **Large rooms**: the pipeline uses at most 500 image pairs per recording – at 5 per second (*High*) that is reached after 100 s, a 4-minute recording only gets 2 per second. For a long recording, choose *Split the video* when starting – or make two or three shorter recordings of a large room in one session and group them as *one room made of several recordings*.
|
||||
- **Objects**: walk around them in a slow circle (15–40 s) and keep them in the middle of the picture.
|
||||
- Avoid pointing at **bare walls, ceilings or tiles** for long – there is nothing for the software to hold on to.
|
||||
- Avoid pointing at **bare walls, ceilings or tiles** for long – there is nothing for the software to hold on to. But do include the **ceiling** now and then, together with the top of the walls or a lamp: a white ceiling that was hardly filmed turns into a dark veil hanging over the room.
|
||||
- **Same light** throughout: daylight changes noticeably within minutes towards the evening, and recordings of one room taken at different light do not match well.
|
||||
- Moving people or pets become ghostly smears.
|
||||
|
||||
## What the check measures
|
||||
@@ -158,6 +204,7 @@ It is a measurement, not image recognition: it does not detect people or moving
|
||||
| Maximum | 8 per second (100–500) | full | 3 M | 50k | ~1.5 h+ |
|
||||
|
||||
\* RTX 4070 SUPER. Spirula keeps training images on disk, so 12 GB of VRAM are enough for “High”. A run needs a few GB of free disk space.
|
||||
The 100–500 image pairs per recording are a limit of the Arcturus pipeline. Above 100 s (*High*) or 63 s (*Maximum*) a recording gets fewer pairs per second, and *Maximum* adds no images any more – see *Large rooms* above.
|
||||
|
||||
## Files
|
||||
|
||||
@@ -165,7 +212,7 @@ It is a measurement, not image recognition: it does not detect people or moving
|
||||
config: ~/.config/splat-workshop/config.toml
|
||||
recordings: [paths] recordings (downloaded from the Frame)
|
||||
scenes: [paths] runs/<name>/ (scene.sog, spirula/scene.ply, gallery files, intermediate data)
|
||||
tours: [paths] runs/<group>/ (scene.sog = Frame version, full/ = full version, spirula/scene.ply, combine.json)
|
||||
tours and rooms: [paths] runs/<group>/ (scene.sog = Frame version, full/ = full version, spirula/scene.ply, combine.json)
|
||||
internal state: next to runs/ in .splat-workshop/ (logs, thumbnails, check results)
|
||||
```
|
||||
|
||||
@@ -179,7 +226,7 @@ uv run --no-project --with pytest --with numpy --with scipy --with pillow pytest
|
||||
|
||||
They need no GPU, no recordings and no Steam Frame: the Arcturus pipeline, Spirula, splat-transform, ffprobe, the desktop trash and notifications are replaced by small fakes, the Frame is a folder reached through a fake `ssh`/`scp`, and putting rooms together is tested on synthetic rooms with a known error – turned, shifted and scaled reconstructions, tracking noise, drift and turn (`tests/synth.py`).
|
||||
|
||||
Covered: who may talk to the server (other websites, LAN mode, malformed or wrongly typed requests, paths outside the runs folder), the recording check, renaming recordings and scenes, clean-up, deleting, cancelled runs, a scene being left alone while it is computed, recovery after a power cut, groups, conversions with cancel/start over/resume (the real `splat.sh`), the Frame's list, downloads and copying scenes over (the real `to-frame.sh`), notifications and tidying up after a job, tours (the real `combine.sh`), the four corrections, splat orientation and size, borders through doors, and that the floor plan is not mirrored. The tests were reviewed independently with mutation testing (deliberately broken code must make them fail). Not covered: the real pipeline, Spirula, the real Frame, the tray icon, the browser interface and the server stopping itself when idle – those are tested by hand.
|
||||
Covered: who may talk to the server (other websites, LAN mode, malformed or wrongly typed requests, paths outside the runs folder), the recording check, renaming recordings and scenes, clean-up, deleting, cancelled runs, a scene being left alone while it is computed, recovery after a power cut, groups, conversions with cancel/start over/resume (the real `splat.sh`), the Frame's list, downloads and copying scenes over (the real `to-frame.sh`), notifications and tidying up after a job, tours (the real `combine.sh`), rooms made of several recordings and homes made of rooms, the four corrections, splat orientation and size, borders through doors, and that the floor plan is not mirrored. The tests were reviewed independently with mutation testing (deliberately broken code must make them fail). Not covered: the real pipeline, Spirula, the real Frame, the tray icon, the browser interface and the server stopping itself when idle – those are tested by hand.
|
||||
|
||||
## Uninstall
|
||||
|
||||
|
||||
@@ -45,3 +45,6 @@ lan = false
|
||||
idle_minutes = 20
|
||||
# Interface language: "auto" (browser / system language), "en" or "de".
|
||||
language = "auto"
|
||||
# Once a day, ask GitHub for the newest release and show a note when there is a newer one
|
||||
# (one plain request to api.github.com, nothing about you is sent). false: never ask.
|
||||
check_updates = true
|
||||
@@ -88,7 +88,15 @@ Wandelt das Ergebnis in das kompakte SOG-Format, das Gaussian XR lädt:
|
||||
npm install -g @playcanvas/splat-transform
|
||||
```
|
||||
|
||||
Ohne globale Installation: `npm install --prefix ~/arcturus/node @playcanvas/splat-transform` und in der Config `splat_transform = "~/arcturus/node/bin/splat-transform"` eintragen.
|
||||
Scheitert `npm install -g` an fehlenden Rechten, ins eigene Home installieren – ohne root:
|
||||
|
||||
```bash
|
||||
npm install -g --prefix ~/arcturus/node @playcanvas/splat-transform
|
||||
```
|
||||
|
||||
und in der Config unter `[paths]` `splat_transform = "~/arcturus/node/bin/splat-transform"` eintragen (mit Unterstrich – `splat-transform =` ist keine Einstellung und wird ignoriert; die Splat-Werkstatt weist darauf hin).
|
||||
|
||||
**Immer den vollen Pfad in die Config schreiben**, wenn splat-transform nur im PATH deiner Shell steht (`.bashrc`, `.zshrc`): Vom Desktop oder Tray gestartet liest die Splat-Werkstatt diese Dateien nicht und findet es sonst nicht. `install.sh` trägt die Zeile ein oder gibt sie aus.
|
||||
|
||||
## 5. Der Splat-Werkstatt sagen, wo alles liegt
|
||||
|
||||
@@ -106,7 +114,7 @@ Splat-Werkstatt neu starten (Tray → Beenden, dann wieder starten). Fehlt noch
|
||||
|
||||
| Meldung / Problem | Ursache / Lösung |
|
||||
|---|---|
|
||||
| `av.open() got an unexpected keyword argument 'metadata_errors'` | PyAV 19 hat diese Option entfernt. Ältere Version festlegen: im `# /// script`-Kopf oben in `av1_to_3dgs.py` und `av1_colmap.py` `"av>=18.1"` in `"av>=18.1,<19"` ändern. (Mit der Pipeline vom Herbst 2026 nötig; neuere Versionen haben es evtl. behoben.) |
|
||||
| `av.open() got an unexpected keyword argument 'metadata_errors'` | PyAV 19 hat diese Option entfernt. **Behoben in der Pipeline ab Oktober 2026 (`av1-3dgs-pipeline-faad5aac4.zip`)** – sie kann PyAV 18.1 und 19; einfach die aktuelle herunterladen (danke an [@andzejsp](https://github.com/andzejsp) für den Hinweis, #2). Nur bei einer älteren Pipeline die ältere Version festlegen: im `# /// script`-Kopf oben in `av1_to_3dgs.py` und `av1_colmap.py` `"av>=18.1"` in `"av>=18.1,<19"` ändern. (Mit der Pipeline vom Herbst 2026 nötig; neuere Versionen haben es evtl. behoben.) Die Splat-Werkstatt (ab 0.4.1) weist schon vor dem Start in ihren Einrichtungshinweisen darauf hin und nennt den Grund, falls eine Umwandlung daran scheitert. |
|
||||
| `Could not select unique evenly spaced capture instants` | Aufnahme zu kurz. Die Pipeline braucht mindestens 100 Aufnahmezeitpunkte – mindestens 10 Sekunden aufnehmen, besser 30+. |
|
||||
| Spirula findet keine GPU / nutzt llvmpipe | Vulkan-Treiber fehlt, siehe Schritt 1. |
|
||||
| Die Szene taucht in Gaussian XR nicht auf | Sie muss als echter Ordner (kein Symlink) mit den Galeriebildern in `Scenes/` von Gaussian XR liegen – das macht der Knopf *Auf die Frame*. Ein Steam-Update oder „Dateien überprüfen“ von Gaussian XR kann den Ordner zurücksetzen; dann die Szene einfach neu übertragen. |
|
||||
|
||||
+10
-2
@@ -88,7 +88,15 @@ Converts the result into the compact SOG format that Gaussian XR loads:
|
||||
npm install -g @playcanvas/splat-transform
|
||||
```
|
||||
|
||||
If you can't or don't want to install globally: `npm install --prefix ~/arcturus/node @playcanvas/splat-transform` and set `splat_transform = "~/arcturus/node/bin/splat-transform"` in the config.
|
||||
If `npm install -g` fails with a permission error, install it into your home instead – no root needed:
|
||||
|
||||
```bash
|
||||
npm install -g --prefix ~/arcturus/node @playcanvas/splat-transform
|
||||
```
|
||||
|
||||
and set `splat_transform = "~/arcturus/node/bin/splat-transform"` under `[paths]` in the config (with an underscore – `splat-transform =` is not a setting and is ignored; Splat Workshop points that out).
|
||||
|
||||
**Always set the full path in the config** if splat-transform is only on the PATH of your shell (`.bashrc`, `.zshrc`): started from the desktop or the tray, Splat Workshop does not read those files and would not find it. `install.sh` writes or prints the line for you.
|
||||
|
||||
## 5. Tell Splat Workshop where everything is
|
||||
|
||||
@@ -106,7 +114,7 @@ Restart Splat Workshop (tray → Quit, then start it again). If something is sti
|
||||
|
||||
| Symptom | Cause / fix |
|
||||
|---|---|
|
||||
| `av.open() got an unexpected keyword argument 'metadata_errors'` | PyAV 19 removed that option. Pin the older version: in the `# /// script` header at the top of `av1_to_3dgs.py` and `av1_colmap.py`, change `"av>=18.1"` to `"av>=18.1,<19"`. (Was needed with the pipeline from autumn 2026; newer versions may have fixed it.) |
|
||||
| `av.open() got an unexpected keyword argument 'metadata_errors'` | PyAV 19 removed that option. **Fixed in the pipeline from October 2026 on (`av1-3dgs-pipeline-faad5aac4.zip`)** – it supports PyAV 18.1 and 19; just download the current one (thanks to [@andzejsp](https://github.com/andzejsp) for spotting it, #2). Only with an older pipeline: pin the older version: in the `# /// script` header at the top of `av1_to_3dgs.py` and `av1_colmap.py`, change `"av>=18.1"` to `"av>=18.1,<19"`. (Was needed with the pipeline from autumn 2026; newer versions may have fixed it.) Splat Workshop (0.4.1 and newer) points this out in its setup hints before you start, and names it if a conversion fails because of it. |
|
||||
| `Could not select unique evenly spaced capture instants` | Recording too short. The pipeline needs at least 100 capture instants – record at least 10 seconds, better 30+. |
|
||||
| Spirula finds no GPU / uses llvmpipe | Vulkan driver missing, see step 1. |
|
||||
| The scene does not appear in Gaussian XR | It must be a real folder in Gaussian XR's `Scenes/` (no symlink) with the gallery images – Splat Workshop's *To the Frame* button does this for you. A Steam update or “verify files” of Gaussian XR can reset that folder; just copy the scene again. |
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 46 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 286 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 62 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 83 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 56 KiB |
+24
-3
@@ -26,19 +26,40 @@ for tool in ffmpeg ffprobe uv ssh curl; do
|
||||
command -v "$tool" >/dev/null && echo " ✓ $tool" || { echo " ✗ $tool"; missing=1; }
|
||||
done
|
||||
command -v splat-transform >/dev/null && echo " ✓ splat-transform" ||
|
||||
echo " ! splat-transform not on PATH (npm install -g @playcanvas/splat-transform, or set it in the config)"
|
||||
echo " ! splat-transform not on PATH (npm install -g --prefix ~/.local @playcanvas/splat-transform needs no root; or set its path in the config)"
|
||||
python3 -c 'import PySide6' 2>/dev/null && echo " ✓ PySide6 (tray icon)" ||
|
||||
echo " · PySide6 not installed – uv will fetch it on first start for the tray icon"
|
||||
[ $missing = 0 ] || echo "Install the missing tools first (see README)."
|
||||
|
||||
mkdir -p "$CONF" "$APPS" "$ICONS"
|
||||
created=0
|
||||
if [ ! -f "$CONF/config.toml" ]; then
|
||||
cp "$ROOT/config.example.toml" "$CONF/config.toml"
|
||||
echo "Created $CONF/config.toml – set the paths to the Arcturus pipeline and Spirula, and your Frame's address."
|
||||
created=1
|
||||
echo "Created $CONF/config.toml from config.example.toml – set the paths to the Arcturus pipeline and Spirula, and your Frame's address."
|
||||
else
|
||||
echo "Keeping existing $CONF/config.toml"
|
||||
echo "Keeping existing $CONF/config.toml (all settings with explanations: $ROOT/config.example.toml)"
|
||||
fi
|
||||
|
||||
# Started from the desktop, Splat Workshop does not see a PATH set in .bashrc/.zshrc: give it the full path
|
||||
st=$(command -v splat-transform || true)
|
||||
conf_st=$(python3 -c 'import sys, tomllib
|
||||
print(tomllib.load(open(sys.argv[1], "rb")).get("paths", {}).get("splat_transform", ""))' "$CONF/config.toml" 2>/dev/null || true)
|
||||
if [ -n "$st" ] && [ -z "$conf_st" ]; then
|
||||
if [ $created = 1 ]; then
|
||||
sed -i "s|^splat_transform = \"\"|splat_transform = \"$st\"|" "$CONF/config.toml"
|
||||
echo " ✓ splat_transform = \"$st\" written to the config"
|
||||
else
|
||||
echo " ! Add this line under [paths] in $CONF/config.toml – started from the desktop,"
|
||||
echo " Splat Workshop does not see the PATH of your shell:"
|
||||
echo " splat_transform = \"$st\""
|
||||
fi
|
||||
fi
|
||||
# Settings Splat Workshop does not know (typos such as "splat-transform" instead of "splat_transform")
|
||||
(cd "$ROOT" && python3 -c 'from splat_workshop import config
|
||||
for key, hint in config.load().unknown:
|
||||
print(f" ! Unknown setting \"{key}\" in the config" + (f" – did you mean \"{hint}\"?" if hint else " – it is ignored"))') || true
|
||||
|
||||
cp "$ROOT/web/icon.svg" "$ICONS/splat-workshop.svg"
|
||||
entry() {
|
||||
cat <<EOF
|
||||
|
||||
@@ -0,0 +1,209 @@
|
||||
# /// script
|
||||
# requires-python = ">=3.11"
|
||||
# dependencies = ["numpy", "scipy", "pillow"]
|
||||
# ///
|
||||
"""Clean up a finished scene or room: the things a reconstruction of a real room tends to get wrong.
|
||||
|
||||
Usage: uv run clean.py <in.ply> <out.ply> [--ceiling S] [--floor S] [--haze S] [--outside S]
|
||||
|
||||
Every strength S runs from 0 (off) to 1 (strongest). The room is found as for the floor plan (walls 0.9 to
|
||||
1.9 m above the floor, turned to them; Y points down).
|
||||
--ceiling A white ceiling has no texture: the reconstruction finds nothing to hold on to, leaves the
|
||||
ceiling thin and hangs a dark veil under it. Takes out the veil (dark or thin splats from
|
||||
10 cm to 60 cm under the ceiling – how deep grows with S; dark but solid things like a cupboard
|
||||
top or a bird cage stay if they are within 50 cm of a wall) and everything above the ceiling
|
||||
(found where walls and ceiling meet), and puts in a closed ceiling in the colour of what there
|
||||
is of it nearby.
|
||||
--floor Fills holes in the floor (where the floor itself has too little: more with S) in the colour of
|
||||
the floor nearby, and takes out what lies under it.
|
||||
--haze Takes out big, nearly transparent blobs floating in the room. Measured by their *smallest*
|
||||
axis: long thin splats (wires, bars of a cage, cables) are no haze. More with S.
|
||||
--outside Takes out what lies well outside the room (beyond the walls, above the ceiling, under the
|
||||
floor): from 1 m beyond it (S near 0) to 30 cm (S = 1).
|
||||
Prints what it did; the input is never changed.
|
||||
"""
|
||||
import argparse
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
import numpy as np
|
||||
from scipy.spatial import cKDTree
|
||||
|
||||
sys.path.insert(0, str(Path(__file__).resolve().parent))
|
||||
import floorplan as F # noqa: E402 (room box, wall angle)
|
||||
|
||||
C0 = 0.28209479177387814
|
||||
STEP = 0.02 # grid of a filled ceiling or floor (m)
|
||||
|
||||
|
||||
def read_ply(path):
|
||||
with open(path, "rb") as f:
|
||||
header = b""
|
||||
while not header.endswith(b"end_header\n"):
|
||||
line = f.readline()
|
||||
if not line:
|
||||
sys.exit(f"Not a PLY file: {path}")
|
||||
header += line
|
||||
props = [l.split()[-1].decode() for l in header.splitlines() if l.startswith(b"property")]
|
||||
n = int(next(l for l in header.splitlines() if l.startswith(b"element vertex")).split()[-1])
|
||||
v = np.fromfile(f, dtype=np.dtype([(p, "<f4") for p in props]), count=n)
|
||||
return header, v
|
||||
|
||||
|
||||
def write_ply(path, header, v):
|
||||
lines = [b"element vertex %d\n" % len(v) if l.startswith(b"element vertex") else l
|
||||
for l in header.splitlines(keepends=True)]
|
||||
tmp = Path(str(path) + ".tmp")
|
||||
with open(tmp, "wb") as f:
|
||||
f.write(b"".join(lines))
|
||||
v.tofile(f)
|
||||
tmp.replace(path)
|
||||
|
||||
|
||||
class Room:
|
||||
"""Where floor, ceiling and walls are, from the solid splats."""
|
||||
def __init__(self, xyz, alpha):
|
||||
solid = xyz[alpha > 0.5]
|
||||
if len(solid) < 1000:
|
||||
sys.exit("Too few solid splats to find the room")
|
||||
self.floor, _ = F.heights(solid[:, 1])
|
||||
up = self.floor - solid[:, 1]
|
||||
walls = solid[(up > 0.9) & (up < 1.9)][:, [0, 2]]
|
||||
sub = walls[np.random.default_rng(0).choice(len(walls), min(len(walls), 150_000), replace=False)]
|
||||
self.angle = F.wall_angle(sub, 0.03)
|
||||
box = F.room_box(F.rotate(walls, self.angle), 0.05)
|
||||
if box is None:
|
||||
sys.exit("No walls found")
|
||||
self.lo, self.hi = box
|
||||
self.up = self.floor - xyz[:, 1] # height above the floor of every splat
|
||||
self.p = F.rotate(xyz[:, [0, 2]], self.angle) # floor plan position, walls axis-aligned
|
||||
|
||||
def within(self, margin):
|
||||
"""Splats inside the walls, `margin` metres away from them (negative: beyond them)."""
|
||||
return np.all((self.p > self.lo + margin) & (self.p < self.hi - margin), axis=1)
|
||||
|
||||
def grid(self):
|
||||
g0, g1 = np.meshgrid(np.arange(self.lo[0], self.hi[0], STEP), np.arange(self.lo[1], self.hi[1], STEP),
|
||||
indexing="ij")
|
||||
return np.stack([g0.ravel(), g1.ravel()], 1)
|
||||
|
||||
|
||||
def layer(room, v, at, cells, ref, rgb, alpha):
|
||||
"""Flat splats (3 cm wide, 2 mm thick) at height `at` above the floor in the floor plan cells, in the
|
||||
colour of the reference splats `ref` nearby (half of it the overall colour: calm, no blotches)."""
|
||||
overall = np.average(rgb[ref], weights=alpha[ref], axis=0) if ref.any() else np.array([0.8, 0.8, 0.8])
|
||||
col = np.tile(overall, (len(cells), 1))
|
||||
if ref.sum() >= 10:
|
||||
d, j = cKDTree(room.p[ref]).query(cells, k=32, distance_upper_bound=0.5, workers=-1)
|
||||
ok = np.isfinite(d)
|
||||
j = np.where(ok, j, 0)
|
||||
w = np.where(ok, alpha[ref][j] / (0.05 + np.where(ok, d, 1)), 0)
|
||||
near = (w[:, :, None] * rgb[ref][j]).sum(1) / np.maximum(w.sum(1, keepdims=True), 1e-9)
|
||||
col = np.where(w.sum(1, keepdims=True) > 0, 0.5 * near + 0.5 * overall, overall)
|
||||
new = np.zeros(len(cells), dtype=v.dtype)
|
||||
xz = F.rotate(cells, -room.angle)
|
||||
new["x"], new["z"], new["y"] = xz[:, 0], xz[:, 1], room.floor - at
|
||||
for k in range(3):
|
||||
new[f"f_dc_{k}"] = (np.clip(col[:, k], 0, 1) - 0.5) / C0
|
||||
new["opacity"] = np.log(0.98 / 0.02)
|
||||
new["scale_0"] = new["scale_2"] = np.log(0.015)
|
||||
new["scale_1"] = np.log(0.002) # flat: y is up/down
|
||||
new["rot_0"] = 1.0
|
||||
return new
|
||||
|
||||
|
||||
def ceiling(room, v, rgb, lum, alpha, s):
|
||||
"""Height of the ceiling, what to take out (veil, above it), the new ceiling."""
|
||||
inside = room.within(0)
|
||||
# where walls and ceiling meet, solid splats pile up: the strongest line near the walls above 2 m
|
||||
# (the ceiling itself, white and thin, is no good to find it)
|
||||
corner = inside & ~room.within(0.3) & (alpha > 0.5) & (room.up > 2.0) & (room.up < 3.5)
|
||||
if corner.sum() < 100:
|
||||
print("Ceiling: not found, left as it is")
|
||||
return np.zeros(len(v), bool), v[:0]
|
||||
h, edges = np.histogram(room.up[corner], bins=np.arange(2.0, 3.5, 0.02))
|
||||
h = np.convolve(h, [1, 2, 1], "same")
|
||||
# the highest strong line: a cupboard or shelf top by the wall can be strong, too, but lies lower
|
||||
H = float(edges[np.flatnonzero(h >= 0.5 * h.max())[-1]] + 0.01)
|
||||
bright = inside & (lum > 0.3) & (room.up > 2.0)
|
||||
depth = 0.1 + 0.5 * s
|
||||
under = (room.up > H - depth) & (room.up < H - 0.03)
|
||||
veil = under & ((room.within(0.15) & (alpha < 0.3)) | (room.within(0.5) & (lum < 0.3)))
|
||||
above = inside & (room.up > H + 0.05)
|
||||
new = layer(room, v, H, room.grid(), bright & (np.abs(room.up - H) < 0.08), rgb, alpha)
|
||||
print(f"Ceiling {H:.2f} m above the floor: veil ({depth:.2f} m deep) {veil.sum():,} splats and "
|
||||
f"{above.sum():,} above it out, closed with {len(new):,}")
|
||||
return veil | above, new
|
||||
|
||||
|
||||
def floor(room, v, rgb, alpha, s):
|
||||
"""Holes in the floor filled, what lies under it out."""
|
||||
inside = room.within(0)
|
||||
below = inside & (room.up < -0.05)
|
||||
near = inside & (np.abs(room.up) < 0.04)
|
||||
cells = room.grid()
|
||||
n = (len(np.arange(room.lo[0], room.hi[0], STEP)), len(np.arange(room.lo[1], room.hi[1], STEP)))
|
||||
idx = np.clip(np.floor((room.p[near] - room.lo) / STEP).astype(np.int64), 0, np.array(n) - 1)
|
||||
n0 = n[1]
|
||||
cover = np.bincount(idx[:, 0] * n0 + idx[:, 1], alpha[near], len(cells))
|
||||
# a cell and its neighbours: a floor a centimetre off still counts
|
||||
c2 = cover.reshape(-1, n0)
|
||||
pad = np.pad(c2, 1)
|
||||
around = sum(pad[1 + dx:1 + dx + c2.shape[0], 1 + dy:1 + dy + c2.shape[1]]
|
||||
for dx in (-1, 0, 1) for dy in (-1, 0, 1)).ravel()
|
||||
hole = around < 1.5 * s
|
||||
new = layer(room, v, 0.0, cells[hole], near & (alpha > 0.3), rgb, alpha)
|
||||
print(f"Floor: {below.sum():,} splats under it out, {hole.sum():,} holes ({100 * hole.mean():.0f} %) filled")
|
||||
return below, new
|
||||
|
||||
|
||||
def haze(v, alpha, s):
|
||||
smallest = np.exp(np.stack([v["scale_0"], v["scale_1"], v["scale_2"]], 1).astype(np.float64)).min(1)
|
||||
size, opacity = 0.04 - 0.025 * s, 0.05 + 0.15 * s
|
||||
out = (smallest > size) & (alpha < opacity)
|
||||
print(f"Haze: {out.sum():,} splats out (all axes over {size * 100:.1f} cm, under {opacity * 100:.0f} % opaque)")
|
||||
return out
|
||||
|
||||
|
||||
def main():
|
||||
ap = argparse.ArgumentParser(description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter)
|
||||
ap.add_argument("src")
|
||||
ap.add_argument("dst")
|
||||
for k in ("ceiling", "floor", "haze", "outside"):
|
||||
ap.add_argument(f"--{k}", type=float, default=0.0)
|
||||
args = ap.parse_args()
|
||||
for k in ("ceiling", "floor", "haze", "outside"):
|
||||
if not 0 <= getattr(args, k) <= 1:
|
||||
sys.exit(f"--{k} must be between 0 and 1")
|
||||
header, v = read_ply(args.src)
|
||||
xyz = np.stack([v["x"], v["y"], v["z"]], 1).astype(np.float64)
|
||||
alpha = 1 / (1 + np.exp(-v["opacity"].astype(np.float64)))
|
||||
rgb = 0.5 + C0 * np.stack([v["f_dc_0"], v["f_dc_1"], v["f_dc_2"]], 1).astype(np.float64)
|
||||
lum = rgb @ [0.299, 0.587, 0.114]
|
||||
room = Room(xyz, alpha)
|
||||
print(f"Room {room.hi[0] - room.lo[0]:.1f} × {room.hi[1] - room.lo[1]:.1f} m, {len(v):,} splats")
|
||||
drop, added = np.zeros(len(v), bool), []
|
||||
if args.ceiling:
|
||||
d, new = ceiling(room, v, rgb, lum, alpha, args.ceiling)
|
||||
drop |= d
|
||||
added.append(new)
|
||||
if args.floor:
|
||||
d, new = floor(room, v, rgb, alpha, args.floor)
|
||||
drop |= d
|
||||
added.append(new)
|
||||
if args.haze:
|
||||
drop |= haze(v, alpha, args.haze)
|
||||
if args.outside:
|
||||
m = 1.0 - 0.7 * args.outside
|
||||
solid_in = room.up[room.within(0) & (alpha > 0.5)]
|
||||
top = max(np.percentile(solid_in, 99.5), 2.0) if len(solid_in) else 2.5
|
||||
out = ~room.within(-m) | (room.up < -m) | (room.up > top + m)
|
||||
print(f"Outside: {out.sum():,} splats more than {m:.2f} m outside the room out")
|
||||
drop |= out
|
||||
result = np.concatenate([v[~drop], *added])
|
||||
write_ply(args.dst, header, result)
|
||||
print(f"{len(result):,} splats ({drop.sum():,} out, {sum(len(a) for a in added):,} in)")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
+154
-19
@@ -5,7 +5,11 @@
|
||||
"""Put several scenes of one recording session together into one big scene.
|
||||
|
||||
Usage: uv run combine.py <out folder> <run folder>=<label> [<run folder>=<label> ...]
|
||||
[--align frame|images|shift|rigid] [--partition view|nearest]
|
||||
[--align frame|images|shift|rigid] [--partition view|nearest] [--rooms JSON]
|
||||
[--colour match|keep]
|
||||
|
||||
--rooms: the room of every recording, in the same order, e.g. '["Kitchen", "Kitchen", "Hallway"]' – a room
|
||||
can be made of several recordings (default: every recording is a room of its own).
|
||||
|
||||
All recordings of one session share the Steam Frame's tracking frame, so the rooms are already
|
||||
roughly in place. Steps:
|
||||
@@ -16,9 +20,16 @@ roughly in place. Steps:
|
||||
rigid images + a joint shift and slight rotation
|
||||
2. Who owns which part (--partition):
|
||||
view per 10 cm cube the recording that saw it from close by and looking at it; the first and
|
||||
last stretch of a recording along another recording's round (walking in/out) does not
|
||||
count, so the borders run through doors (default)
|
||||
last stretch of a recording along the round of another room's recording (walking in/out)
|
||||
does not count, so the borders between rooms run through doors (default). Recordings of
|
||||
the same room simply share it: every part from the recording that saw it best.
|
||||
nearest the recording whose camera was closest
|
||||
Either way a cube only goes to a recording that really has something there: at least a quarter of
|
||||
what the richest one has (splat opacity summed per cube). A camera that "looked at" a place from
|
||||
behind the sofa does not leave a dark hole there.
|
||||
2b. Colour (--colour): every training settles on its own brightness, so the same wall can come out a
|
||||
third darker in one recording than in the next. `match` (default) brings all of them to one
|
||||
brightness per colour channel, from the cubes they share; `keep` leaves them as they are.
|
||||
3. Every room is transformed, cut to its own part and appended – one room in memory at a time.
|
||||
|
||||
Writes <out>/spirula/scene.ply (all splats), <out>/scene.xrSceneTransform.json (start view of the
|
||||
@@ -39,6 +50,10 @@ from scipy.spatial import cKDTree
|
||||
from scipy.spatial.transform import Rotation
|
||||
|
||||
VOXEL, RADIUS, K = 0.10, 1.5, 64 # ownership: cube size, camera reach, cameras looked at
|
||||
SHARE = 0.25 # a cube's owner needs at least this share of the richest one's splats
|
||||
SOLID = 3.0 # summed opacity of a cube something really sits in
|
||||
GAIN = (0.7, 1.4) # colour matching never changes a recording more than this
|
||||
C0 = 0.28209479177387814 # spherical harmonics, band 0
|
||||
BOTH = 1.5 # an overlap: places within this distance of both recordings' cameras
|
||||
|
||||
|
||||
@@ -236,23 +251,116 @@ def joint_rigid(rooms, zones, poses, fixed, centre):
|
||||
return poses
|
||||
|
||||
|
||||
# ---------------------------------------------------------------- what every recording has where
|
||||
|
||||
def cube_codes(points):
|
||||
"""10 cm cube of every point as one number (±100 km is plenty)."""
|
||||
k = np.floor(points / VOXEL).astype(np.int64) + (1 << 20)
|
||||
return (k[:, 0] << 42) | (k[:, 1] << 21) | k[:, 2]
|
||||
|
||||
|
||||
def contents(clouds):
|
||||
"""clouds: per recording (cube codes, opacity, rgb) of its splats. Per cube: summed opacity and
|
||||
opacity-weighted colour of every recording – the cube codes (sorted), cover [cubes, n], colour [cubes, n, 3]."""
|
||||
codes = [c for c, _, _ in clouds]
|
||||
table = np.unique(np.concatenate(codes))
|
||||
cover = np.zeros((len(table), len(clouds)))
|
||||
colour = np.zeros((len(table), len(clouds), 3))
|
||||
for i, (c, (_, a, rgb)) in enumerate(zip(codes, clouds)):
|
||||
j = np.searchsorted(table, c)
|
||||
cover[:, i] = np.bincount(j, a, len(table))
|
||||
for ch in range(3):
|
||||
colour[:, i, ch] = np.bincount(j, a * rgb[:, ch], len(table))
|
||||
colour /= np.maximum(cover, 1e-9)[:, :, None]
|
||||
return table, cover, colour
|
||||
|
||||
|
||||
def around(table, cover):
|
||||
"""Summed over each cube and its 26 neighbours: two recordings' copies of one wall, a centimetre apart,
|
||||
often fall into neighbouring cubes – compared cube by cube, each would seem to have the wall alone."""
|
||||
out = np.zeros_like(cover)
|
||||
for dx, dy, dz in itertools.product((-1, 0, 1), repeat=3):
|
||||
n = table + ((dx << 42) + (dy << 21) + dz)
|
||||
j = np.clip(np.searchsorted(table, n), 0, len(table) - 1)
|
||||
hit = table[j] == n
|
||||
out[hit] += cover[j[hit]]
|
||||
return out
|
||||
|
||||
|
||||
def colour_gains(cover, colour, min_cubes=200):
|
||||
"""Per recording and colour channel a factor that brings all recordings to one brightness: from the
|
||||
cubes two of them both cover well, least squares on the log ratios, all factors together neutral."""
|
||||
n = cover.shape[1]
|
||||
gains = np.ones((n, 3))
|
||||
if n < 2:
|
||||
return gains
|
||||
for ch in range(3):
|
||||
rows, rhs = [], []
|
||||
for a, b in itertools.combinations(range(n), 2):
|
||||
m = (cover[:, a] > SOLID) & (cover[:, b] > SOLID) & (colour[:, a, ch] > 0.02) & (colour[:, b, ch] > 0.02)
|
||||
if m.sum() < min_cubes:
|
||||
continue
|
||||
row = np.zeros(n) # log g_a - log g_b = log(c_b / c_a)
|
||||
row[a], row[b] = 1, -1
|
||||
w = np.sqrt(m.sum())
|
||||
rows.append(row * w)
|
||||
rhs.append(np.median(np.log(colour[m, b, ch] / colour[m, a, ch])) * w)
|
||||
if not rows:
|
||||
continue
|
||||
rows.append(np.ones(n) * 100) # together neutral: the room keeps its overall brightness
|
||||
rhs.append(0.0)
|
||||
x, *_ = np.linalg.lstsq(np.array(rows), np.array(rhs), rcond=None)
|
||||
gains[:, ch] = np.clip(np.exp(x), *GAIN)
|
||||
return gains
|
||||
|
||||
|
||||
def apply_gain(v, gain):
|
||||
"""Colour times `gain` (per channel), the view-dependent part included."""
|
||||
rest = sorted((p for p in v.dtype.names if p.startswith("f_rest_")), key=lambda p: int(p[7:]))
|
||||
per = len(rest) // 3 # f_rest: all of red, then green, then blue
|
||||
for ch in range(3):
|
||||
g = np.float32(gain[ch])
|
||||
v[f"f_dc_{ch}"] = (g * (0.5 + C0 * v[f"f_dc_{ch}"]) - 0.5) / C0
|
||||
for p in rest[ch * per:(ch + 1) * per]:
|
||||
v[p] *= g
|
||||
|
||||
|
||||
# ---------------------------------------------------------------- ownership
|
||||
|
||||
def owners(rooms, poses, partition):
|
||||
"""Function: points -> index of the owning room."""
|
||||
def owners(rooms, poses, partition, have=None):
|
||||
"""Function: points -> index of the owning recording."""
|
||||
labels = list(rooms)
|
||||
cams = [poses[l](rooms[l]["cams"]) for l in labels]
|
||||
fwd = [(poses[l].R @ rooms[l]["fwd"].T).T for l in labels]
|
||||
owner = np.concatenate([np.full(len(c), i) for i, c in enumerate(cams)])
|
||||
|
||||
def richest(lab, codes):
|
||||
"""Only a recording with at least SHARE of the richest one's splats in a cube may own it."""
|
||||
if have is None:
|
||||
return lab
|
||||
table, cover = have
|
||||
j = np.clip(np.searchsorted(table, codes), 0, len(table) - 1)
|
||||
c = np.where((table[j] == codes)[:, None], cover[j], 0.0)
|
||||
able = c >= SHARE * c.max(1, keepdims=True)
|
||||
thin = ~able[np.arange(len(lab)), lab]
|
||||
lab = lab.copy()
|
||||
lab[thin] = c[thin].argmax(1)
|
||||
return lab
|
||||
|
||||
if partition == "nearest":
|
||||
tree = cKDTree(np.vstack(cams))
|
||||
return lambda p: owner[tree.query(p, workers=-1)[1]], {}
|
||||
return lambda p: richest(owner[tree.query(p, workers=-1)[1]], cube_codes(p)), {}
|
||||
|
||||
# walking in and out: the first and last stretch of a recording along another recording's path ...
|
||||
# walking in and out: the first and last stretch of a recording along the path of another room's
|
||||
# recording ... (recordings of the same room cover the same place on purpose: that is no walking in)
|
||||
n = len(cams)
|
||||
room = [rooms[l]["room"] for l in labels]
|
||||
elsewhere = lambda i, arrays: [a for j, a in enumerate(arrays) if room[j] != room[i]]
|
||||
|
||||
def edges(i, others):
|
||||
inside = cKDTree(others).query(cams[i])[0] < 0.4
|
||||
if not others:
|
||||
return np.zeros(len(cams[i]), bool)
|
||||
inside = cKDTree(np.vstack(others)).query(cams[i])[0] < 0.4
|
||||
order = np.argsort(rooms[labels[i]]["times"])
|
||||
flag = np.zeros(len(order), bool)
|
||||
for seq in (order, order[::-1]):
|
||||
@@ -261,13 +369,14 @@ def owners(rooms, poses, partition):
|
||||
break
|
||||
flag[k] = True
|
||||
return flag
|
||||
cand = [edges(i, np.vstack([cams[j] for j in range(n) if j != i])) for i in range(n)]
|
||||
cand = [edges(i, elsewhere(i, cams)) for i in range(n)]
|
||||
# ... counts only if another recording covered that place during its own round; otherwise two
|
||||
# recordings that hand over to each other (one ends where the next starts) would cancel out
|
||||
transit = []
|
||||
for i in range(n):
|
||||
core = np.vstack([cams[j][~cand[j]] for j in range(n) if j != i])
|
||||
transit.append(cand[i] & (cKDTree(core).query(cams[i])[0] < 0.4))
|
||||
core = [c for c in elsewhere(i, [cams[j][~cand[j]] for j in range(n)]) if len(c)]
|
||||
transit.append(cand[i] & (cKDTree(np.vstack(core)).query(cams[i])[0] < 0.4) if core
|
||||
else np.zeros(len(cams[i]), bool))
|
||||
transit = np.concatenate(transit)
|
||||
C, F, O = np.vstack(cams)[~transit], np.vstack(fwd)[~transit], owner[~transit]
|
||||
tree = cKDTree(C)
|
||||
@@ -286,11 +395,17 @@ def owners(rooms, poses, partition):
|
||||
cos = np.einsum("nkd,nkd->nk", to, F[j]) / np.maximum(np.linalg.norm(to, axis=2), 1e-6)
|
||||
w = np.where(ok & (cos > 0.3), (RADIUS - np.where(ok, d, RADIUS)) * cos, 0.0)
|
||||
score = np.stack([(w * (O[j] == r)).sum(1) for r in range(n)], axis=1)
|
||||
codes = cube_codes(c)
|
||||
if have is not None: # among the recordings that really have something there
|
||||
table, cover = have
|
||||
k = np.clip(np.searchsorted(table, codes), 0, len(table) - 1)
|
||||
cv = np.where((table[k] == codes)[:, None], cover[k], 0.0)
|
||||
score = np.where(cv >= SHARE * cv.max(1, keepdims=True), score, -1.0)
|
||||
best = score.argmax(1)
|
||||
none = score.max(1) == 0
|
||||
none = score.max(1) <= 0
|
||||
if none.any():
|
||||
best[none] = O[tree.query(c[none], workers=-1)[1]]
|
||||
lab[s:s + 200_000] = best
|
||||
lab[s:s + 200_000] = richest(best, codes)
|
||||
return lab[inv.ravel()]
|
||||
return own, {labels[i]: int(t.sum()) for i, t in enumerate(np.split(transit, np.cumsum([len(c) for c in cams])[:-1]))}
|
||||
|
||||
@@ -303,7 +418,13 @@ def main():
|
||||
ap.add_argument("runs", nargs="+", help="run folder=label")
|
||||
ap.add_argument("--align", choices=("frame", "images", "shift", "rigid"), default="images")
|
||||
ap.add_argument("--partition", choices=("view", "nearest"), default="view")
|
||||
ap.add_argument("--rooms", default="", help="JSON list: the room of every recording (default: one each)")
|
||||
ap.add_argument("--colour", choices=("match", "keep"), default="match")
|
||||
args = ap.parse_args()
|
||||
room_of = json.loads(args.rooms) if args.rooms else []
|
||||
if room_of and (not isinstance(room_of, list) or len(room_of) != len(args.runs)
|
||||
or not all(isinstance(r, str) and r for r in room_of)):
|
||||
sys.exit("--rooms needs one room name per recording")
|
||||
out = Path(args.out)
|
||||
(out / "spirula").mkdir(parents=True, exist_ok=True)
|
||||
started = time.time()
|
||||
@@ -322,7 +443,7 @@ def main():
|
||||
both = [k for k, n in enumerate(names) if n in recorded]
|
||||
if len(both) < 10:
|
||||
sys.exit(f"{label}: too few cameras with Frame tracking – was it made with the Arcturus pipeline?")
|
||||
rooms[label] = {"run": run, "cams": centres[both], "fwd": fwd[both],
|
||||
rooms[label] = {"run": run, "room": room_of[i] if room_of else label, "cams": centres[both], "fwd": fwd[both],
|
||||
"times": np.array([image_time(names[k]) for k in both]),
|
||||
"tracked": np.array([recorded[names[k]] for k in both]),
|
||||
"pts": read_points(run / "dataset/sparse/0/points3D.bin")}
|
||||
@@ -331,7 +452,7 @@ def main():
|
||||
# how far each room's reconstruction is from the Frame's tracking, as delivered and fitted
|
||||
fit = {l: umeyama(r["cams"], r["tracked"]) for l, r in rooms.items()}
|
||||
rms = lambda p, r: float(np.sqrt((np.linalg.norm(p(r["cams"]) - r["tracked"], axis=1) ** 2).mean()))
|
||||
room_info = {l: {"run": str(r["run"]), "cameras": len(r["cams"]), "tracking_cm": round(rms(Pose(), r) * 100, 1),
|
||||
room_info = {l: {"run": str(r["run"]), "room": r["room"], "cameras": len(r["cams"]), "tracking_cm": round(rms(Pose(), r) * 100, 1),
|
||||
"fitted_cm": round(rms(fit[l], r) * 100, 1)} for l, r in rooms.items()}
|
||||
# From here on everything is in the fitted frame; `poses` are applied on top of it.
|
||||
for l, r in rooms.items():
|
||||
@@ -372,7 +493,20 @@ def main():
|
||||
progress(100)
|
||||
|
||||
print("@@ cphase 1", flush=True)
|
||||
own, transit = owners(rooms, poses, args.partition)
|
||||
clouds = [] # what every recording has where (one at a time in memory)
|
||||
for l, r in rooms.items():
|
||||
_, v = read_ply(r["run"] / "spirula" / "scene.ply")
|
||||
xyz = final[l](np.stack([v["x"], v["y"], v["z"]], axis=1).astype(np.float64))
|
||||
rgb = 0.5 + C0 * np.stack([v["f_dc_0"], v["f_dc_1"], v["f_dc_2"]], axis=1).astype(np.float64)
|
||||
clouds.append((cube_codes(xyz), 1 / (1 + np.exp(-v["opacity"].astype(np.float64))), rgb.astype(np.float32)))
|
||||
del v, xyz, rgb
|
||||
table, cover, colour = contents(clouds)
|
||||
del clouds
|
||||
gains = colour_gains(cover, colour) if args.colour == "match" else np.ones((len(rooms), 3))
|
||||
for l, g in zip(rooms, gains):
|
||||
if np.abs(g - 1).max() > 0.005:
|
||||
print(f"{l}: colour × {g[0]:.2f} {g[1]:.2f} {g[2]:.2f}", flush=True)
|
||||
own, transit = owners(rooms, poses, args.partition, (table, around(table, cover)))
|
||||
body = out / "spirula" / "scene.body.tmp"
|
||||
total, kept, header = 0, {}, None
|
||||
with open(body, "wb") as fb:
|
||||
@@ -382,6 +516,7 @@ def main():
|
||||
keep = own(xyz) == i
|
||||
v, xyz = v[keep], xyz[keep]
|
||||
v["x"], v["y"], v["z"] = xyz.T.astype(np.float32)
|
||||
apply_gain(v, gains[i])
|
||||
q = Rotation.from_matrix(final[l].R).as_quat() # (x, y, z, w)
|
||||
rot = quat_mul(np.array([q[3], q[0], q[1], q[2]]),
|
||||
np.stack([v["rot_0"], v["rot_1"], v["rot_2"], v["rot_3"]], axis=1).astype(np.float64))
|
||||
@@ -404,9 +539,9 @@ def main():
|
||||
|
||||
# start view: the one of the room in the middle
|
||||
shutil.copy(rooms[hub]["run"] / "scene.xrSceneTransform.json", out / "scene.xrSceneTransform.json")
|
||||
for l in rooms:
|
||||
room_info[l].update(kept[l], walk_in_out_cameras=transit.get(l, 0))
|
||||
result = {"align": args.align, "partition": args.partition, "hub": hub, "splats": total,
|
||||
for l, g in zip(rooms, gains):
|
||||
room_info[l].update(kept[l], walk_in_out_cameras=transit.get(l, 0), colour=[round(float(x), 3) for x in g])
|
||||
result = {"align": args.align, "partition": args.partition, "colour": args.colour, "hub": hub, "splats": total,
|
||||
"rooms": room_info, "seams_before": before, "seams": after,
|
||||
"seconds": round(time.time() - started)}
|
||||
(out / "combine.json").write_text(json.dumps(result, ensure_ascii=False, indent=1))
|
||||
|
||||
+14
-3
@@ -7,6 +7,9 @@
|
||||
# Environment:
|
||||
# ALIGN=frame|images|shift|rigid how the rooms are fitted together (default: images, see combine.py)
|
||||
# PARTITION=view|nearest where the borders between the recordings run (default: view)
|
||||
# COLOUR=match|keep bring all recordings to one brightness (default: match)
|
||||
# ROOMS='["Kitchen","Kitchen","Hallway"]' the room of every recording, in order: a room can be made of
|
||||
# several recordings (default: every recording is a room of its own)
|
||||
# FRAME_SPLATS=1000000 splats in the Frame version (the full version keeps all)
|
||||
# FULL=0 skip the full SOG for the PC (the step that needs the most memory)
|
||||
# FULL_NAME="..." name plate of the full version (default: "<name> (full)")
|
||||
@@ -59,7 +62,8 @@ main() {
|
||||
trap 'exit 143' TERM; trap 'exit 130' INT; trap 'exit 129' HUP
|
||||
|
||||
echo "Putting $# scenes together as \"$name\" (alignment ${ALIGN:-images}, borders ${PARTITION:-view})"
|
||||
uv run -q "$HERE/combine.py" "$tmp" "$@" --align "${ALIGN:-images}" --partition "${PARTITION:-view}"
|
||||
uv run -q "$HERE/combine.py" "$tmp" "$@" --align "${ALIGN:-images}" --partition "${PARTITION:-view}" --colour "${COLOUR:-match}" \
|
||||
${ROOMS:+--rooms "$ROOMS"}
|
||||
total=$(python3 -c 'import json,sys; print(json.load(open(sys.argv[1]))["splats"])' "$tmp/combine.json")
|
||||
|
||||
# Frame version: fewer splats
|
||||
@@ -81,8 +85,15 @@ main() {
|
||||
cp "$tmp/scene.xrSceneTransform.json" "$tmp/full/scene.xrSceneTransform.json"
|
||||
fi
|
||||
|
||||
# Preview for the gallery: the floor plan of all rooms
|
||||
uv run -q "$HERE/floorplan.py" "$tmp/plan.png" "$@" ${PLAN_COMMA:+--comma} >/dev/null
|
||||
# Preview for the gallery: the floor plan of all rooms (labelled by room, not by recording)
|
||||
plan_args=("$@")
|
||||
if [ -n "${ROOMS:-}" ]; then
|
||||
mapfile -t plan_args < <(python3 -c '
|
||||
import json, sys
|
||||
for arg, room in zip(sys.argv[2:], json.loads(sys.argv[1])):
|
||||
print(arg.partition("=")[0] + "=" + room)' "$ROOMS" "$@")
|
||||
fi
|
||||
uv run -q "$HERE/floorplan.py" "$tmp/plan.png" "${plan_args[@]}" ${PLAN_COMMA:+--comma} > "$tmp/plan.json"
|
||||
uv run -q "$HERE/make_gallery.py" --plan "$tmp/plan.png" "$tmp" "$name" "$stem"
|
||||
if [ -d "$tmp/full" ]; then
|
||||
uv run -q "$HERE/make_gallery.py" --plan "$tmp/plan.png" "$tmp/full" "${FULL_NAME:-$name (full)}" "$stem-full"
|
||||
|
||||
+16
-5
@@ -13,6 +13,7 @@ any manual alignment. Per scene the plan shows:
|
||||
- walls as bright lines (splats in the wall height band, where they pile up)
|
||||
- the path the camera was carried along (registered camera positions)
|
||||
- name and approximate size
|
||||
Several recordings with the same label are one room (made of several recordings): one name, one size.
|
||||
The plan is rotated so the walls are axis-aligned.
|
||||
Seen from above, Y down means +x and +z form a mirrored pair on screen (rows count downwards):
|
||||
x is drawn right to left, otherwise the plan comes out mirror-inverted.
|
||||
@@ -168,8 +169,16 @@ def main():
|
||||
inside = np.ones(len(xyz), bool)
|
||||
up = floor - xyz[:, 1] # height above the floor
|
||||
walls = inside & (up > 0.9 * m) & (up < 1.9 * m)
|
||||
scenes.append({"label": label or run.name, "xyz": xyz[inside], "rgb": rgb[inside], "up": up[inside],
|
||||
"walls": xyz[walls][:, [0, 2]], "cams": load_cameras(run), "floor": floor})
|
||||
cams = load_cameras(run)
|
||||
s = {"label": label or run.name, "xyz": xyz[inside], "rgb": rgb[inside], "up": up[inside],
|
||||
"walls": xyz[walls][:, [0, 2]], "cams": [cams] if cams is not None else [], "floor": floor}
|
||||
same = next((x for x in scenes if x["label"] == s["label"]), None)
|
||||
if same: # one more recording of this room
|
||||
for k in ("xyz", "rgb", "up", "walls"):
|
||||
same[k] = np.concatenate([same[k], s[k]])
|
||||
same["cams"] += s["cams"]
|
||||
else:
|
||||
scenes.append(s)
|
||||
|
||||
all_walls = np.vstack([s["walls"] for s in scenes])
|
||||
sub = all_walls[rng.choice(len(all_walls), min(len(all_walls), 150_000), replace=False)]
|
||||
@@ -177,7 +186,7 @@ def main():
|
||||
for s in scenes:
|
||||
s["p"] = rotate(s["xyz"][:, [0, 2]], angle)
|
||||
s["w"] = rotate(s["walls"], angle)
|
||||
s["c"] = rotate(s["cams"][:, [0, 2]], angle) if s["cams"] is not None else None
|
||||
s["c"] = [rotate(c[:, [0, 2]], angle) for c in s["cams"]]
|
||||
s["box"] = room_box(s["w"], 0.05 * m)
|
||||
if s["box"] is not None: # keep only this room (plus a margin)
|
||||
b0, b1 = s["box"][0] - 0.35 * m, s["box"][1] + 0.35 * m
|
||||
@@ -212,8 +221,10 @@ def main():
|
||||
f_label, f_small, f_title = font(26), font(17), font(30)
|
||||
for i, s in enumerate(scenes):
|
||||
col = COLORS[i % len(COLORS)]
|
||||
if args.style == "pretty" and s["c"] is not None and len(s["c"]) > 1:
|
||||
x, z = px(s["c"])
|
||||
for c in (s["c"] if args.style == "pretty" else []): # every recording's path
|
||||
if len(c) < 2:
|
||||
continue
|
||||
x, z = px(c)
|
||||
pts = list(zip(x.tolist(), z.tolist()))
|
||||
for k in range(0, len(pts) - 1, 2): # dotted line
|
||||
d.line([pts[k], pts[k + 1]], fill=col + (255,), width=2)
|
||||
|
||||
@@ -0,0 +1,167 @@
|
||||
# /// script
|
||||
# requires-python = ">=3.11"
|
||||
# dependencies = ["numpy", "scipy"]
|
||||
# ///
|
||||
"""EXPERIMENTAL, not wired into the interface yet (0.4): splats in space the cameras looked through.
|
||||
|
||||
For every (sampled) image: the SfM points it saw give a coarse depth map (per cell the nearest seen
|
||||
surface). A splat that projects into such a cell clearly in front of that surface sat in the line of sight
|
||||
of a camera that saw something behind it: free space. Removed when enough images say so.
|
||||
Usage: freespace.py <scene.ply> <out.ply> <run>[,<run>...] [--every N] [--strength S] [--solid A]
|
||||
<run> the recordings the scene was made of (their sparse model and the Frame's tracking); the
|
||||
scene must be in their fitted frame, as combine.py makes it (alignment "images")
|
||||
--solid A where the SfM points say nothing (white walls and ceilings), use the splats more opaque than A
|
||||
|
||||
First try on a real living room (15.10.2026): only 0.4 % of the splats found, mostly faint ones. The SfM
|
||||
points – the only reliable "something is here" – are missing exactly on white surfaces, and the dark veil
|
||||
under a white ceiling hangs closer to it (10–35 cm) than this can tell apart; scripts/clean.py --ceiling
|
||||
is the tool for that.
|
||||
"""
|
||||
import argparse
|
||||
import json
|
||||
import struct
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
import numpy as np
|
||||
from scipy.spatial.transform import Rotation
|
||||
|
||||
sys.path.insert(0, str(Path(__file__).resolve().parent))
|
||||
import combine as C # noqa: E402
|
||||
|
||||
NP = {0: 3, 1: 4, 2: 4, 3: 5, 4: 8, 5: 8, 6: 12, 7: 5, 8: 4, 9: 5, 10: 12}
|
||||
GRID = 48 # depth cells per image side
|
||||
|
||||
|
||||
def read_cams(path):
|
||||
out = {}
|
||||
with open(path, "rb") as f:
|
||||
n, = struct.unpack("<Q", f.read(8))
|
||||
for _ in range(n):
|
||||
cid, model, w, h = struct.unpack("<iiQQ", f.read(24))
|
||||
out[cid] = (model, w, h, np.array(struct.unpack("<%dd" % NP[model], f.read(8 * NP[model]))))
|
||||
return out
|
||||
|
||||
|
||||
def read_images(path):
|
||||
out = []
|
||||
with open(path, "rb") as f:
|
||||
n, = struct.unpack("<Q", f.read(8))
|
||||
for _ in range(n):
|
||||
_, qw, qx, qy, qz, tx, ty, tz, cid = struct.unpack("<i7di", f.read(64))
|
||||
name = b""
|
||||
while (ch := f.read(1)) != b"\0":
|
||||
name += ch
|
||||
k, = struct.unpack("<Q", f.read(8))
|
||||
obs = np.frombuffer(f.read(24 * k), dtype=np.dtype([("x", "<f8"), ("y", "<f8"), ("id", "<i8")]))
|
||||
R = Rotation.from_quat([qx, qy, qz, qw]).as_matrix()
|
||||
out.append((name.decode(), R, np.array([tx, ty, tz]), cid, obs[obs["id"] >= 0].copy()))
|
||||
return out
|
||||
|
||||
|
||||
def read_points3d(path):
|
||||
ids, xyz = [], []
|
||||
with open(path, "rb") as f:
|
||||
n, = struct.unpack("<Q", f.read(8))
|
||||
for _ in range(n):
|
||||
pid, x, y, z, _, _, _, e, k = struct.unpack("<Q3d3BdQ", f.read(51))
|
||||
f.seek(8 * k, 1)
|
||||
ids.append(pid)
|
||||
xyz.append((x, y, z))
|
||||
ids = np.array(ids)
|
||||
table = np.full(ids.max() + 1, -1)
|
||||
table[ids] = np.arange(len(ids))
|
||||
return table, np.array(xyz)
|
||||
|
||||
|
||||
def project(cam, pc):
|
||||
"""Camera coordinates -> pixels (OPENCV_FISHEYE or pinhole); valid only for z > 0."""
|
||||
model, w, h, p = cam
|
||||
x, y = pc[:, 0] / pc[:, 2], pc[:, 1] / pc[:, 2]
|
||||
if model == 5:
|
||||
fx, fy, cx, cy, k1, k2, k3, k4 = p
|
||||
r = np.sqrt(x * x + y * y)
|
||||
th = np.arctan(r)
|
||||
thd = th * (1 + k1 * th**2 + k2 * th**4 + k3 * th**6 + k4 * th**8)
|
||||
s = np.where(r > 1e-9, thd / np.maximum(r, 1e-9), 1.0)
|
||||
return fx * x * s + cx, fy * y * s + cy
|
||||
fx, fy, cx, cy = (p[0], p[0], p[1], p[2]) if model in (0, 2, 3) else p[:4]
|
||||
return fx * x + cx, fy * y + cy
|
||||
|
||||
|
||||
def main():
|
||||
ap = argparse.ArgumentParser()
|
||||
ap.add_argument("src")
|
||||
ap.add_argument("dst")
|
||||
ap.add_argument("runs")
|
||||
ap.add_argument("--every", type=int, default=4)
|
||||
ap.add_argument("--strength", type=float, default=0.5)
|
||||
ap.add_argument("--solid", type=float, default=0.0)
|
||||
args = ap.parse_args()
|
||||
header, v = C.read_ply(Path(args.src))
|
||||
P = np.stack([v["x"], v["y"], v["z"]], 1).astype(np.float64)
|
||||
A = 1 / (1 + np.exp(-v["opacity"].astype(np.float64)))
|
||||
free = np.zeros(len(v), np.int32)
|
||||
seen = np.zeros(len(v), np.int32)
|
||||
for run in args.runs.split(","):
|
||||
run = Path(run)
|
||||
sp = run / "dataset/sparse/0"
|
||||
cams, imgs = read_cams(sp / "cameras.bin"), read_images(sp / "images.bin")
|
||||
table, X = read_points3d(sp / "points3D.bin")
|
||||
# the room's frame: fitted to the Frame's tracking, as combine.py does (alignment "images")
|
||||
ai = json.loads((run / "dataset/main.aiscene").read_text())
|
||||
rec = {f["path"].removeprefix("images/"): np.array(f["worldFromCam"])[:3, 3] for f in ai["frames"]}
|
||||
names = [i[0].replace("\\", "/") for i in imgs]
|
||||
centres = np.array([-i[1].T @ i[2] for i in imgs])
|
||||
both = [k for k, nm in enumerate(names) if nm in rec]
|
||||
fit = C.umeyama(centres[both], np.array([rec[names[k]] for k in both]))
|
||||
# splats into this recording's own frame (inverse of the fit), cameras stay as they are
|
||||
Q = (fit.R.T @ ((P - fit.t) / fit.s).T).T
|
||||
for name, R, t, cid, obs in imgs[::args.every]:
|
||||
cam = cams[cid]
|
||||
_, w, h, _ = cam
|
||||
pts = X[table[obs["id"]]]
|
||||
pc = (R @ pts.T).T + t
|
||||
ok = pc[:, 2] > 0.05
|
||||
cx = np.clip((obs["x"][ok] / w * GRID).astype(int), 0, GRID - 1)
|
||||
cy = np.clip((obs["y"][ok] / h * GRID).astype(int), 0, GRID - 1)
|
||||
depth = np.full(GRID * GRID, np.inf)
|
||||
np.minimum.at(depth, cy * GRID + cx, pc[ok, 2])
|
||||
sc = (R @ Q.T).T + t
|
||||
front = sc[:, 2] > 0.1
|
||||
if args.solid: # where SfM saw nothing (a white ceiling): the solid splats
|
||||
so = front & (A > args.solid)
|
||||
us, vs = project(cam, sc[so])
|
||||
ins = (us >= 0) & (us < w) & (vs >= 0) & (vs < h)
|
||||
cs = (np.clip((vs[ins] / h * GRID).astype(int), 0, GRID - 1) * GRID
|
||||
+ np.clip((us[ins] / w * GRID).astype(int), 0, GRID - 1))
|
||||
sd = np.full(GRID * GRID, np.inf)
|
||||
np.minimum.at(sd, cs, sc[so][ins, 2])
|
||||
depth = np.where(np.isfinite(depth), depth, sd)
|
||||
u, vv = project(cam, sc[front])
|
||||
inside = (u >= 0) & (u < w) & (vv >= 0) & (vv < h)
|
||||
idx = np.flatnonzero(front)[inside]
|
||||
cell = (np.clip((vv[inside] / h * GRID).astype(int), 0, GRID - 1) * GRID
|
||||
+ np.clip((u[inside] / w * GRID).astype(int), 0, GRID - 1))
|
||||
d = depth[cell]
|
||||
known = np.isfinite(d)
|
||||
z = sc[idx, 2]
|
||||
seen[idx[known]] += 1
|
||||
margin = 0.15 + 0.1 * d[known]
|
||||
free[idx[known][z[known] < d[known] - margin]] += 1
|
||||
print(run.name, "images used:", len(imgs[::args.every]), flush=True)
|
||||
s = args.strength
|
||||
need = int(round(6 - 4 * s)) # images that looked through it
|
||||
frac = 0.7 - 0.3 * s # of those that saw the place at all
|
||||
drop = (free >= need) & (free >= frac * np.maximum(seen, 1)) & (A < 0.9)
|
||||
print(f"free-space splats: {drop.sum():,} of {len(v):,} ({100 * drop.mean():.1f} %), "
|
||||
f"opacity median {np.median(A[drop]) if drop.any() else 0:.2f}")
|
||||
lines = [b"element vertex %d\n" % (~drop).sum() if l.startswith(b"element vertex") else l
|
||||
for l in header.splitlines(keepends=True)]
|
||||
with open(args.dst, "wb") as f:
|
||||
f.write(b"".join(lines))
|
||||
v[~drop].tofile(f)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
Executable
+75
@@ -0,0 +1,75 @@
|
||||
#!/bin/bash
|
||||
# A splat file from another program as a scene (0.6) – then copied to the Frame, versions, mesh … like any
|
||||
# other scene.
|
||||
#
|
||||
# Usage: scripts/import.sh <splat file> <run folder> "<display name>" [up] [scale]
|
||||
# <splat file> .ply .compressed.ply .sog .spz .splat .ksplat (whatever splat-transform reads)
|
||||
# up where "up" is in the file: y-down (Spirula Studio, COLMAP, the Frame – default), y-up, z-up
|
||||
# scale factor for the size, e.g. 0.01 if the file is in centimetres (default 1)
|
||||
# Writes <run folder>/ with spirula/scene.ply, scene.sog, scene.xrSceneTransform.json, a preview from the
|
||||
# top view and a name plate. Lines starting with "@@" are progress markers.
|
||||
set -euo pipefail
|
||||
# Everything in one block: bash reads it completely before it starts, so updating this file
|
||||
# (git pull, editing) does not affect a run that is already going.
|
||||
{
|
||||
|
||||
HERE=$(cd "$(dirname "$(readlink -f "$0")")" && pwd)
|
||||
ROOT=$(dirname "$HERE")
|
||||
eval "$(cd "$ROOT" && python3 -m splat_workshop.config --shell)"
|
||||
|
||||
src=$(realpath "${1:?Give a splat file}")
|
||||
out=${2:?Give the run folder}
|
||||
name=${3:?Give a name}
|
||||
up=${4:-y-down}
|
||||
scale=${5:-1}
|
||||
[ -f "$src" ] || { echo "No such file: $src" >&2; exit 1; }
|
||||
[ -n "$SPLAT_TRANSFORM" ] || { echo "splat-transform not found" >&2; exit 1; }
|
||||
[ -e "$out" ] && { echo "Already there: $out" >&2; exit 1; }
|
||||
case "$up" in
|
||||
y-down) turn=() ;;
|
||||
y-up) turn=(-r 180,0,0) ;; # +Y becomes -Y (checked: splat-transform -r 180,0,0)
|
||||
z-up) turn=(-r -90,0,0) ;; # +Z becomes -Y (splat-transform -r 90,0,0 turns +Z into +Y)
|
||||
*) echo "up must be y-down, y-up or z-up" >&2; exit 1 ;;
|
||||
esac
|
||||
[[ "$scale" =~ ^[0-9]+(\.[0-9]+)?$ ]] && awk -v s="$scale" 'BEGIN { exit !(s > 0) }' \
|
||||
|| { echo "scale must be a number above 0" >&2; exit 1; }
|
||||
size=()
|
||||
[ "$scale" != 1 ] && size=(-s "$scale")
|
||||
slug=$(basename "$out")
|
||||
stem=$(printf '%s' "$slug" | tr 'A-Z' 'a-z')
|
||||
|
||||
tmp=$out.tmp
|
||||
rm -rf "$tmp"
|
||||
mkdir -p "$tmp/spirula"
|
||||
trap 'rm -rf "$tmp"' EXIT
|
||||
echo "@@ vstep 1 2 convert"
|
||||
echo "Importing $(basename "$src") as \"$name\" (up: $up, scale: $scale) ..."
|
||||
"$SPLAT_TRANSFORM" -w "$src" "${turn[@]}" "${size[@]}" -N "$tmp/spirula/scene.ply"
|
||||
"$SPLAT_TRANSFORM" -w "$tmp/spirula/scene.ply" "$tmp/scene.sog"
|
||||
# (the same line the pipeline writes: the scene list reads the number of splats from it)
|
||||
python3 -c 'import sys
|
||||
with open(sys.argv[1], "rb") as f:
|
||||
n = next(int(l.split()[-1]) for l in f if l.startswith(b"element vertex"))
|
||||
print(f"spirula: {n:,} Gaussians in {sys.argv[1]}")' "$tmp/spirula/scene.ply"
|
||||
# Gaussian XR starts at the scene's origin, as it is in the file
|
||||
cat > "$tmp/scene.xrSceneTransform.json" <<'JSON'
|
||||
{"transform": [[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]], "worldScale": 1.0, "worldScaleOffset": [0, 0, 0]}
|
||||
JSON
|
||||
|
||||
echo "@@ vstep 2 2 preview"
|
||||
# Preview for the gallery: the top view as for the floor plan; if that finds no room, plain colour
|
||||
if uv run -q "$HERE/floorplan.py" "$tmp/plan.png" "$tmp=$name" >/dev/null 2>&1; then
|
||||
uv run -q "$HERE/make_gallery.py" --plan "$tmp/plan.png" "$tmp" "$name" "$stem"
|
||||
else
|
||||
uv run -q --no-project --with pillow python3 -c 'import sys
|
||||
from PIL import Image
|
||||
Image.new("RGBA", (512, 512), (40, 46, 60, 255)).save(sys.argv[1])' "$tmp/$stem.gallery.png"
|
||||
uv run -q "$HERE/make_gallery.py" --label "$tmp/$stem.sceneinfo.png" "$name"
|
||||
fi
|
||||
mv "$tmp" "$out"
|
||||
trap - EXIT
|
||||
echo "Gaussian XR initial view: (imported scene) Display rotation 0°"
|
||||
echo "@@ done local"
|
||||
echo "Done: $out"
|
||||
exit
|
||||
}
|
||||
Executable
+111
@@ -0,0 +1,111 @@
|
||||
#!/bin/bash
|
||||
# A mesh (surface) of a finished scene or tour, for 3D programs and 3D printing – made by Spirula Studio
|
||||
# (`spirula mesh`) from the splats inside the room (scripts/clean.py --outside), then stood upright with
|
||||
# the floor at height 0 (scripts/upright.py).
|
||||
#
|
||||
# Usage: scripts/mesh.sh <run folder> <formats> [texture]
|
||||
# <formats> comma-separated: glb, ply, obj, stl
|
||||
# glb colours (texture or per corner); Y up as glTF wants it – Blender, Windows 3D viewer, web
|
||||
# ply colours per corner; Z up – MeshLab, CloudCompare, Blender
|
||||
# obj with a texture, or without colours; Y up as is custom for OBJ – nearly every 3D program
|
||||
# stl no colours; Z up – slicers for 3D printing
|
||||
# texture 1: a texture from the training images (only if they are still there, see "clean up"),
|
||||
# otherwise colours per corner from the splats
|
||||
# Writes <run folder>/mesh/ (replaced as a whole when done). Lines starting with "@@" are progress markers.
|
||||
set -euo pipefail
|
||||
# Everything in one block: bash reads it completely before it starts, so updating this file
|
||||
# (git pull, editing) does not affect a run that is already going.
|
||||
{
|
||||
|
||||
HERE=$(cd "$(dirname "$(readlink -f "$0")")" && pwd)
|
||||
ROOT=$(dirname "$HERE")
|
||||
eval "$(cd "$ROOT" && python3 -m splat_workshop.config --shell)"
|
||||
|
||||
out=$(realpath "${1:?Give a run folder}")
|
||||
formats=${2:?Give the formats, e.g. glb,stl}
|
||||
texture=${3:-0}
|
||||
src=$out/spirula/scene.ply
|
||||
[ -f "$src" ] || { echo "No spirula/scene.ply in $out" >&2; exit 1; }
|
||||
[ -x "$SPIRULA_BIN" ] || { echo "Spirula Studio not found: $SPIRULA_BIN" >&2; exit 1; }
|
||||
IFS=',' read -ra want <<< "$formats"
|
||||
for f in "${want[@]}"; do
|
||||
case "$f" in glb|ply|obj|stl) ;; *) echo "Unknown mesh format: $f (glb, ply, obj, stl)" >&2; exit 1 ;; esac
|
||||
done
|
||||
slug=$(basename "$out")
|
||||
stem=$(printf '%s' "$slug" | tr 'A-Z' 'a-z')
|
||||
|
||||
# Colours: a texture needs the cameras and the training images; without them colours per corner
|
||||
data=(--no-data)
|
||||
if [ "$texture" = 1 ]; then
|
||||
if [ -d "$out/dataset/images" ] && [ -d "$out/dataset/sparse" ]; then
|
||||
data=(--data "$out/dataset")
|
||||
else
|
||||
echo "No training images any more – colours per corner instead of a texture"
|
||||
texture=0
|
||||
fi
|
||||
fi
|
||||
colour_of() { # the colour each format gets
|
||||
case "$1" in
|
||||
glb) [ "$texture" = 1 ] && echo texture || echo vertex ;;
|
||||
ply) echo vertex ;;
|
||||
obj) [ "$texture" = 1 ] && echo texture || echo none ;;
|
||||
stl) echo none ;;
|
||||
esac
|
||||
}
|
||||
colours=$(for f in "${want[@]}"; do colour_of "$f"; done | sort -u | paste -sd,)
|
||||
|
||||
tmp=$out/mesh.tmp
|
||||
rm -rf "$tmp"
|
||||
mkdir -p "$tmp"
|
||||
trap 'rm -rf "$tmp"' EXIT
|
||||
echo "@@ vstep 1 2 mesh"
|
||||
# what lies well outside the room (big blobs explaining the view through a window or beyond the walls)
|
||||
# would become lumps floating around the room: out first, as the "Edges" clean-up does
|
||||
from=$src
|
||||
if uv run -q "$HERE/clean.py" "$src" "$tmp/inside.ply" --outside 1 >/dev/null 2>&1; then
|
||||
from=$tmp/inside.ply
|
||||
else
|
||||
echo "No room found (walls) – meshing everything"
|
||||
fi
|
||||
echo "Meshing $slug ($formats; colours: $colours) ..."
|
||||
"$SPIRULA_BIN" mesh "$from" "${data[@]}" --format "$formats" --color "$colours" --output "$tmp/$stem"
|
||||
rm -f "$tmp/inside.ply"
|
||||
|
||||
# Spirula names the files <stem>.<ext>, or <stem>_<colour>.<ext> when it made several colours:
|
||||
# keep the one colour every format was meant to have, under <stem>.<ext>
|
||||
echo "@@ vstep 2 2 upright"
|
||||
keep=()
|
||||
for f in "${want[@]}"; do
|
||||
c=$(colour_of "$f")
|
||||
case "$c" in vertex) tag=vertexcolor ;; none) tag=nocolor ;; texture) tag=texture ;; esac
|
||||
file=""
|
||||
for cand in "$tmp/${stem}_${tag}.$f" "$tmp/${stem}_${tag}"*".$f" "$tmp/$stem.$f"; do
|
||||
[ -f "$cand" ] && { file=$cand; break; }
|
||||
done
|
||||
[ -n "$file" ] || { echo "Spirula made no $f file" >&2; exit 1; }
|
||||
if [ "$c" != texture ] && [ "$file" != "$tmp/$stem.$f" ]; then
|
||||
mv "$file" "$tmp/$stem.$f" # (a texture's file names are referenced inside: they stay)
|
||||
file=$tmp/$stem.$f
|
||||
fi
|
||||
keep+=("$file")
|
||||
done
|
||||
for f in "$tmp"/*; do # the other colour pairs Spirula made along the way
|
||||
case " ${keep[*]} " in *" $f "*) continue ;; esac
|
||||
case "$f" in *.mtl|*.png|*.jpg|*.jpeg) continue ;; esac
|
||||
rm -f "$f"
|
||||
done
|
||||
# upright, the floor (found as for the floor plan) at height 0: the room stands on the ground plane
|
||||
uv run -q --no-project --with numpy --with pillow python3 "$HERE/upright.py" --floor-from "$src" "${keep[@]}"
|
||||
|
||||
python3 - "$tmp/mesh.json" "$formats" "$texture" <<'PY'
|
||||
import json, sys, time
|
||||
path, formats, texture = sys.argv[1:]
|
||||
json.dump({"formats": formats.split(","), "texture": texture == "1", "created": time.time()}, open(path, "w"), indent=1)
|
||||
PY
|
||||
rm -rf "$out/mesh"
|
||||
mv "$tmp" "$out/mesh"
|
||||
trap - EXIT
|
||||
echo "@@ done local"
|
||||
echo "Done: $out/mesh"
|
||||
exit
|
||||
}
|
||||
+28
-2
@@ -13,6 +13,10 @@
|
||||
# max ~8 image pairs per second of video (100-500), full resolution, up to 3 M splats, 50k steps
|
||||
# FRAMES, SCALE, MAXG, ITER override single preset values
|
||||
# NO_UPLOAD=1 only compute, don't copy to the Frame
|
||||
# PART=120-245 only this stretch of the recording (seconds): cut losslessly with the original
|
||||
# timestamps (the pipeline matches the images to the poses by time) into
|
||||
# runs/.parts/<name>.mp4, which goes again once the scene is done. A long recording in
|
||||
# several parts gets up to 500 image pairs per part.
|
||||
# FRESH=1 start an existing run of the same name over; its result stays until the new one
|
||||
# is done and comes back if the new run fails or is cancelled
|
||||
# Interrupted? Run the same command again with --resume.
|
||||
@@ -62,6 +66,24 @@ out=$RUNS_DIR/$slug
|
||||
log=$RUNS_DIR/$slug.log
|
||||
mkdir -p "$RUNS_DIR"
|
||||
|
||||
# A stretch of the recording: cut it once (the same file again for --resume)
|
||||
secs=
|
||||
if [ -n "${PART:-}" ]; then
|
||||
start=${PART%-*}; end=${PART#*-}
|
||||
[[ "$start" =~ ^[0-9]+(\.[0-9]+)?$ && "$end" =~ ^[0-9]+(\.[0-9]+)?$ ]] \
|
||||
&& awk -v a="$start" -v b="$end" 'BEGIN { exit !(b > a) }' \
|
||||
|| { echo "PART must be <start>-<end> in seconds, e.g. 120-245" >&2; exit 1; }
|
||||
cut=$RUNS_DIR/.parts/$slug.mp4
|
||||
if [ ! -f "$cut" ]; then
|
||||
mkdir -p "$RUNS_DIR/.parts"
|
||||
echo "Cutting $start-$end s out of $(basename "$in") ..."
|
||||
ffmpeg -v error -y -copyts -ss "$start" -i "$in" -to "$end" -map 0 -c copy -copy_unknown "$cut.tmp.mp4"
|
||||
mv "$cut.tmp.mp4" "$cut"
|
||||
fi
|
||||
in=$cut
|
||||
secs=$(awk -v a="$start" -v b="$end" 'BEGIN { print b - a }')
|
||||
fi
|
||||
|
||||
# FRESH: set the previous result aside, delete it only once the new one is there
|
||||
prev=$RUNS_DIR/.previous/$slug
|
||||
restore_previous() {
|
||||
@@ -109,8 +131,8 @@ fi
|
||||
|
||||
# Image pairs from the duration: <per second>, clamped to the pipeline limits 100..500
|
||||
pairs() {
|
||||
local secs
|
||||
secs=$(ffprobe -v error -show_entries format=duration -of csv=p=0 "$in")
|
||||
local secs=$secs
|
||||
[ -n "$secs" ] || secs=$(ffprobe -v error -show_entries format=duration -of csv=p=0 "$in")
|
||||
awk -v s="$secs" -v r="$1" 'BEGIN { f = int(s * r + 0.5); if (f < 100) f = 100; if (f > 500) f = 500; print f }'
|
||||
}
|
||||
|
||||
@@ -132,6 +154,10 @@ SS_LANG=en uv run av1_to_3dgs.py "$in" "$out" \
|
||||
--splat-transform "$SPLAT_TRANSFORM" \
|
||||
"${quality[@]}" "$@" 2>&1 | tee -a "$log"
|
||||
[ -f "$out/scene.sog" ] || { echo "No scene.sog was produced, see $log" >&2; exit 1; }
|
||||
if [ -n "${PART:-}" ]; then
|
||||
rm -f "$cut" # cut again from the recording when needed
|
||||
rmdir "$RUNS_DIR/.parts" 2>/dev/null || true
|
||||
fi
|
||||
rm -rf "$prev"
|
||||
rmdir "$RUNS_DIR/.previous" 2>/dev/null || true
|
||||
|
||||
|
||||
@@ -77,7 +77,19 @@ ssh -o ConnectTimeout=8 "$FRAME_HOST" "mkdir -p $FRAME_SCENES && \
|
||||
for f in *.sog *.xrSceneTransform.json *.gallery.png *.sceneinfo.png; do
|
||||
case \$f in $stem.*) ;; *) rm -f -- \"\$f\" ;; esac
|
||||
done"
|
||||
# How far it is: every 2 s the size of the folder on the Frame against what is being copied ("@@ upbytes")
|
||||
total=$(du -cb "$out/$stem".{sog,xrSceneTransform.json,gallery.png,sceneinfo.png} | tail -1 | cut -f1)
|
||||
echo "@@ upbytes 0 $total"
|
||||
( while sleep 2; do
|
||||
now=$(ssh -o ConnectTimeout=5 "$FRAME_HOST" "du -cb $FRAME_SCENES/$folder 2>/dev/null | tail -1 | cut -f1" 2>/dev/null) || continue
|
||||
[ -n "$now" ] && echo "@@ upbytes $now $total"
|
||||
done ) &
|
||||
watch=$!
|
||||
trap 'kill $watch 2>/dev/null || true' EXIT
|
||||
scp -q "$out/$stem".{sog,xrSceneTransform.json,gallery.png,sceneinfo.png} "$FRAME_HOST:$FRAME_SCENES/$folder/"
|
||||
kill $watch 2>/dev/null || true
|
||||
trap - EXIT
|
||||
echo "@@ upbytes $total $total"
|
||||
ssh "$FRAME_HOST" "chmod 755 $FRAME_SCENES/$folder/*"
|
||||
echo "@@ done frame $folder"
|
||||
echo
|
||||
|
||||
@@ -0,0 +1,145 @@
|
||||
"""Stand a mesh upright: our scenes have Y pointing down (like the Steam Frame's tracking). 3D programs
|
||||
expect Z up for PLY and STL (Blender, slicers for 3D printing) and Y up for glTF/GLB (by its standard) and
|
||||
OBJ (by custom) – Blender turns those two into Z up itself on import. Without this a room lies on its side
|
||||
or upside down. (Checked by importing each format in Blender 5.2.)
|
||||
|
||||
Usage: python3 upright.py [--floor Y] <file> [<file> ...] (.ply .obj .stl .glb .gltf; changed in place)
|
||||
|
||||
PLY, STL: positions and normals turned so that up (-Y) becomes +Z: (x, y, z) -> (x, z, -y)
|
||||
OBJ: turned 180° about X, up (-Y) becomes +Y: (x, y, z) -> (x, -y, -z)
|
||||
GLB/glTF: the scene's root nodes go under one new node turned 180° about X: (x, y, z) -> (x, -y, -z)
|
||||
– nothing else in the file is touched (textures, materials, accessors stay as they are)
|
||||
--floor Y where the floor is in the scene (Y down): it is moved to height 0, so the room stands on
|
||||
the ground plane (the scene's origin is where the Frame was at the start, at eye height)
|
||||
--floor-from S the same, found in the scene's splats S (spirula/scene.ply) as for the floor plan
|
||||
"""
|
||||
import json
|
||||
import struct
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
import numpy as np
|
||||
|
||||
Z_UP = np.array([[1, 0, 0], [0, 0, 1], [0, -1, 0]], dtype=np.float64) # proper rotation, det +1
|
||||
Y_UP_QUAT = [1.0, 0.0, 0.0, 0.0] # x, y, z, w: 180° about X
|
||||
LIFT = 0.0 # the floor's height before (Y down)
|
||||
|
||||
|
||||
def _replace(path: Path, data: bytes):
|
||||
tmp = path.with_name(path.name + ".tmp")
|
||||
tmp.write_bytes(data)
|
||||
tmp.replace(path)
|
||||
|
||||
|
||||
def ply(path: Path):
|
||||
raw = path.read_bytes()
|
||||
end = raw.index(b"end_header\n") + len(b"end_header\n")
|
||||
header = raw[:end].decode("ascii", "replace").splitlines()
|
||||
if "format binary_little_endian 1.0" not in header:
|
||||
sys.exit(f"{path}: only binary little-endian PLY is supported")
|
||||
sizes = {"float": "<f4", "double": "<f8", "uchar": "u1", "char": "i1", "ushort": "<u2", "short": "<i2",
|
||||
"uint": "<u4", "int": "<i4"}
|
||||
props, count, first = [], 0, True
|
||||
for line in header:
|
||||
parts = line.split()
|
||||
if parts[:2] == ["element", "vertex"]:
|
||||
count = int(parts[2])
|
||||
elif parts[:1] == ["element"]:
|
||||
first = False # properties after this belong to faces etc.
|
||||
elif parts[:1] == ["property"] and first and count:
|
||||
if parts[1] == "list":
|
||||
sys.exit(f"{path}: list properties on vertices are not supported")
|
||||
props.append((parts[2], sizes[parts[1]]))
|
||||
dtype = np.dtype(props)
|
||||
v = np.frombuffer(raw, dtype=dtype, count=count, offset=end).copy()
|
||||
for a, b, c in (("x", "y", "z"), ("nx", "ny", "nz")):
|
||||
if a in dtype.names:
|
||||
xyz = np.stack([v[a], v[b], v[c]], 1).astype(np.float64) @ Z_UP.T
|
||||
if a == "x":
|
||||
xyz[:, 2] += LIFT
|
||||
v[a], v[b], v[c] = xyz.T
|
||||
_replace(path, raw[:end] + v.tobytes() + raw[end + v.nbytes:])
|
||||
|
||||
|
||||
def obj(path: Path):
|
||||
out = []
|
||||
with open(path, "rb") as f:
|
||||
for line in f:
|
||||
if line.startswith((b"v ", b"vn ")):
|
||||
tag, rest = line.split(None, 1)
|
||||
nums = rest.split()
|
||||
x, y, z = (float(n) for n in nums[:3])
|
||||
x, y, z = x, -y, -z # Y up (180° about X)
|
||||
y += LIFT if tag == b"v" else 0.0
|
||||
line = b"%s %.7g %.7g %.7g%s\n" % (tag, x, y, z, (b" " + b" ".join(nums[3:])) if nums[3:] else b"")
|
||||
out.append(line)
|
||||
_replace(path, b"".join(out))
|
||||
|
||||
|
||||
def stl(path: Path):
|
||||
raw = path.read_bytes()
|
||||
if raw[:5] == b"solid" and b"facet" in raw[:512]:
|
||||
sys.exit(f"{path}: only binary STL is supported")
|
||||
n, = struct.unpack_from("<I", raw, 80)
|
||||
tri = np.frombuffer(raw, dtype=np.dtype([("n", "<f4", 3), ("v", "<f4", (3, 3)), ("attr", "<u2")]),
|
||||
count=n, offset=84).copy()
|
||||
tri["n"] = tri["n"] @ Z_UP.T
|
||||
tri["v"] = tri["v"] @ Z_UP.T
|
||||
tri["v"][..., 2] += LIFT
|
||||
_replace(path, raw[:84] + tri.tobytes())
|
||||
|
||||
|
||||
def _wrap(gltf: dict):
|
||||
for scene in gltf.get("scenes", []):
|
||||
root = {"name": "upright (Y up)", "rotation": Y_UP_QUAT, "translation": [0.0, LIFT, 0.0],
|
||||
"children": scene.get("nodes", [])}
|
||||
gltf.setdefault("nodes", []).append(root)
|
||||
scene["nodes"] = [len(gltf["nodes"]) - 1]
|
||||
|
||||
|
||||
def glb(path: Path):
|
||||
raw = path.read_bytes()
|
||||
magic, version, _ = struct.unpack_from("<4sII", raw)
|
||||
if magic != b"glTF" or version != 2:
|
||||
sys.exit(f"{path}: not a glTF 2 binary")
|
||||
jlen, jtype = struct.unpack_from("<I4s", raw, 12)
|
||||
if jtype != b"JSON":
|
||||
sys.exit(f"{path}: first chunk is not JSON")
|
||||
gltf = json.loads(raw[20:20 + jlen])
|
||||
_wrap(gltf)
|
||||
js = json.dumps(gltf, separators=(",", ":")).encode()
|
||||
js += b" " * (-len(js) % 4) # chunks are 4-byte aligned, JSON padded with spaces
|
||||
rest = raw[20 + jlen:]
|
||||
total = 12 + 8 + len(js) + len(rest)
|
||||
_replace(path, struct.pack("<4sII", b"glTF", 2, total) + struct.pack("<I4s", len(js), b"JSON") + js + rest)
|
||||
|
||||
|
||||
def gltf(path: Path):
|
||||
data = json.loads(path.read_text())
|
||||
_wrap(data)
|
||||
_replace(path, json.dumps(data).encode())
|
||||
|
||||
|
||||
def main():
|
||||
global LIFT
|
||||
args = sys.argv[1:]
|
||||
if args[:1] == ["--floor"]:
|
||||
LIFT, args = float(args[1]), args[2:]
|
||||
elif args[:1] == ["--floor-from"]:
|
||||
sys.path.insert(0, str(Path(__file__).resolve().parent))
|
||||
import floorplan
|
||||
xyz, _ = floorplan.load_ply(Path(args[1]), np.random.default_rng(0))
|
||||
LIFT, args = (float(floorplan.heights(xyz[:, 1])[0]) if len(xyz) else 0.0), args[2:]
|
||||
print(f"floor: {LIFT:.2f}")
|
||||
for arg in args:
|
||||
p = Path(arg)
|
||||
kind = p.suffix.lower().lstrip(".")
|
||||
fn = {"ply": ply, "obj": obj, "stl": stl, "glb": glb, "gltf": gltf}.get(kind)
|
||||
if fn is None:
|
||||
sys.exit(f"{p}: unknown mesh format")
|
||||
fn(p)
|
||||
print(f"upright: {p.name}")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
+40
-12
@@ -3,11 +3,13 @@
|
||||
# optionally shown in the original's size (models). Each version is a complete scene in
|
||||
# <run folder>/versions/<key>/ and can be copied to the Frame next to the others.
|
||||
#
|
||||
# Usage: scripts/versions.sh <run folder> "<key>|<splats>|<scale>|<name plate>" ...
|
||||
# Usage: scripts/versions.sh <run folder> "<key>|<splats>|<scale>|<name plate>[|<clean-up>]" ...
|
||||
# <key> folder name of the version, e.g. 1m, 0.75m, all, 1m-1x87
|
||||
# <splats> number of splats, or "all"
|
||||
# <scale> 1, or e.g. 87: Gaussian XR shows it in the original's size (worldScale 87)
|
||||
# <name plate> text on the name plate in the gallery, e.g. "Flat · 1 M"
|
||||
# <clean-up> optional, e.g. "ceiling=0.5,haze=0.3": cleaned up first (scripts/clean.py; ceiling,
|
||||
# floor, haze, outside, each 0 to 1), then reduced
|
||||
# The splats come from <run folder>/spirula/scene.ply. Lines starting with "@@" are progress markers.
|
||||
set -euo pipefail
|
||||
# Everything in one block: bash reads it completely before it starts, so updating this file
|
||||
@@ -39,7 +41,7 @@ echo "Making $# version(s) of $slug ($total splats)"
|
||||
i=0
|
||||
for spec in "$@"; do
|
||||
i=$((i + 1))
|
||||
IFS='|' read -r key splats scale plate <<< "$spec"
|
||||
IFS='|' read -r key splats scale plate clean <<< "$spec"
|
||||
case "$key" in ''|.*|*/*) echo "Unusable version name: $key" >&2; exit 1 ;; esac
|
||||
echo "@@ vstep $i $# $key"
|
||||
dir=$out/versions/$key
|
||||
@@ -47,17 +49,40 @@ for spec in "$@"; do
|
||||
rm -rf "$tmp"
|
||||
mkdir -p "$tmp"
|
||||
trap 'rm -rf "$tmp"' EXIT
|
||||
if [ "$splats" = all ] || [ "$splats" -ge "$total" ]; then
|
||||
echo "$key: all $total splats"
|
||||
"$SPLAT_TRANSFORM" -w "$src" "$tmp/scene.sog"
|
||||
made=$total
|
||||
from=$src
|
||||
have=$total
|
||||
if [ -n "${clean:-}" ]; then
|
||||
args=()
|
||||
IFS=',' read -ra parts <<< "$clean"
|
||||
for kv in "${parts[@]}"; do
|
||||
k=${kv%%=*} v=${kv#*=}
|
||||
case "$k" in ceiling|floor|haze|outside) ;; *) echo "Unknown clean-up: $k" >&2; exit 1 ;; esac
|
||||
[[ "$v" =~ ^(0(\.[0-9]+)?|1(\.0+)?)$ ]] || { echo "Clean-up strength must be 0 to 1: $kv" >&2; exit 1; }
|
||||
args+=("--$k" "$v")
|
||||
done
|
||||
echo "$key: cleaning up ($clean)"
|
||||
uv run -q "$HERE/clean.py" "$src" "$tmp/clean.ply" "${args[@]}"
|
||||
from=$tmp/clean.ply
|
||||
have=$(python3 -c 'import sys
|
||||
with open(sys.argv[1], "rb") as f:
|
||||
print(next(int(l.split()[-1]) for l in f if l.startswith(b"element vertex")))' "$from")
|
||||
fi
|
||||
if [ "$splats" = all ] || [ "$splats" -ge "$have" ]; then
|
||||
echo "$key: all $have splats"
|
||||
"$SPLAT_TRANSFORM" -w "$from" "$tmp/scene.sog"
|
||||
made=$have
|
||||
else
|
||||
echo "$key: reducing $total to $splats splats"
|
||||
"$SPLAT_TRANSFORM" -w "$src" --decimate "$splats" "$tmp/reduced.ply"
|
||||
echo "$key: reducing $have to $splats splats"
|
||||
"$SPLAT_TRANSFORM" -w "$from" --decimate "$splats" "$tmp/reduced.ply"
|
||||
"$SPLAT_TRANSFORM" -w "$tmp/reduced.ply" "$tmp/scene.sog"
|
||||
rm -f "$tmp/reduced.ply"
|
||||
made=$splats
|
||||
fi
|
||||
if [ -f "$tmp/clean.ply" ] && [ "$splats" = all ]; then
|
||||
mkdir -p "$tmp/spirula" # for the PC: Spirula Studio opens the ply
|
||||
mv "$tmp/clean.ply" "$tmp/spirula/scene.ply"
|
||||
fi
|
||||
rm -f "$tmp/clean.ply"
|
||||
stem=$(printf '%s-%s' "$slug" "$key" | tr 'A-Z' 'a-z')
|
||||
python3 - "$out/scene.xrSceneTransform.json" "$tmp/scene.xrSceneTransform.json" "$scale" <<'PY'
|
||||
import json, sys
|
||||
@@ -69,11 +94,14 @@ PY
|
||||
cp "$preview" "$tmp/$stem.gallery.png"
|
||||
fi
|
||||
uv run -q "$HERE/make_gallery.py" --label "$tmp/$stem.sceneinfo.png" "$plate"
|
||||
python3 - "$tmp/version.json" "$key" "$made" "$splats" "$scale" "$plate" <<'PY'
|
||||
python3 - "$tmp/version.json" "$key" "$made" "$splats" "$scale" "$plate" "${clean:-}" <<'PY'
|
||||
import json, sys, time
|
||||
path, key, made, target, scale, plate = sys.argv[1:]
|
||||
json.dump({"key": key, "splats": int(made), "target": target, "scale": float(scale), "label": plate,
|
||||
"created": time.time()}, open(path, "w"), indent=1)
|
||||
path, key, made, target, scale, plate, clean = sys.argv[1:]
|
||||
info = {"key": key, "splats": int(made), "target": target, "scale": float(scale), "label": plate,
|
||||
"created": time.time()}
|
||||
if clean:
|
||||
info["clean"] = {k: float(v) for k, v in (kv.split("=") for kv in clean.split(","))}
|
||||
json.dump(info, open(path, "w"), indent=1)
|
||||
PY
|
||||
rm -rf "$dir"
|
||||
mv "$tmp" "$dir"
|
||||
|
||||
@@ -5,7 +5,9 @@ Order: built-in defaults < ~/.config/splat-workshop/config.toml (or $SPLAT_WORKS
|
||||
|
||||
`python3 -m splat_workshop.config --shell` prints the values as shell assignments for scripts/.
|
||||
"""
|
||||
import difflib
|
||||
import os
|
||||
import re
|
||||
import shlex
|
||||
import shutil
|
||||
import sys
|
||||
@@ -28,13 +30,51 @@ DEFAULTS = {
|
||||
"video_player": "",
|
||||
},
|
||||
"frame": {"host": ""},
|
||||
"server": {"port": 8771, "lan": False, "idle_minutes": 20, "language": "auto"},
|
||||
"server": {"port": 8771, "lan": False, "idle_minutes": 20, "language": "auto", "check_updates": True},
|
||||
}
|
||||
|
||||
|
||||
def unknown_keys(data: dict) -> list[tuple[str, str]]:
|
||||
"""Settings in the config file that Splat Workshop does not know (e.g. a typo: "splat-transform"),
|
||||
as ("section.key", suggestion or "")."""
|
||||
out = []
|
||||
for section, values in data.items():
|
||||
if section not in DEFAULTS:
|
||||
close = difflib.get_close_matches(section, DEFAULTS, n=1, cutoff=0.6)
|
||||
out.append((section, close[0] if close else ""))
|
||||
continue
|
||||
if not isinstance(values, dict):
|
||||
continue
|
||||
for key in values:
|
||||
if key not in DEFAULTS[section]:
|
||||
close = difflib.get_close_matches(key.replace("-", "_"), DEFAULTS[section], n=1, cutoff=0.6)
|
||||
out.append((f"{section}.{key}", f"{section}.{close[0]}" if close else ""))
|
||||
return out
|
||||
|
||||
|
||||
# PyAV 19 removed av.open(metadata_errors=...), which the Arcturus pipeline (autumn 2026) uses
|
||||
PYAV_FILES = ("av1_to_3dgs.py", "av1_colmap.py")
|
||||
RX_AV_DEP = re.compile(r'^#\s*"av(?P<spec>[^"]*)"', re.M)
|
||||
|
||||
|
||||
def pyav_unpinned(pipeline: Path) -> list[str]:
|
||||
"""Pipeline scripts that use metadata_errors but allow PyAV 19 or newer."""
|
||||
out = []
|
||||
for name in PYAV_FILES:
|
||||
try:
|
||||
text = (pipeline / name).read_text(errors="replace")
|
||||
except OSError:
|
||||
continue
|
||||
m = RX_AV_DEP.search(text)
|
||||
if "metadata_errors" in text and m and "<19" not in m["spec"].replace(" ", ""):
|
||||
out.append(name)
|
||||
return out
|
||||
|
||||
|
||||
class Config:
|
||||
def __init__(self, data: dict, source: Path | None):
|
||||
def __init__(self, data: dict, source: Path | None, unknown=()):
|
||||
self.source = source
|
||||
self.unknown = list(unknown)
|
||||
base = source.parent if source else Path.home()
|
||||
|
||||
def path(v: str) -> Path:
|
||||
@@ -57,18 +97,24 @@ class Config:
|
||||
self.lan = (lan != "0") if lan is not None else bool(s["lan"])
|
||||
self.idle_minutes = int(s["idle_minutes"])
|
||||
self.language = s.get("language", "auto")
|
||||
self.check_updates = bool(s.get("check_updates", True))
|
||||
# Internal state (jobs, caches) lives next to the runs, so it moves with the data
|
||||
self.state_dir = Path(os.environ.get("SPLAT_WORKSHOP_STATE") or self.runs.parent / ".splat-workshop")
|
||||
|
||||
def problems(self) -> list[tuple[str, dict]]:
|
||||
"""Missing prerequisites as (message key, params) for the setup hints in the UI."""
|
||||
out = []
|
||||
for key, suggestion in self.unknown:
|
||||
out.append(("setup.unknown_key" if suggestion else "setup.unknown_key.plain",
|
||||
{"key": key, "suggestion": suggestion, "file": str(self.source)}))
|
||||
if not (self.pipeline / "av1_to_3dgs.py").is_file():
|
||||
out.append(("setup.pipeline", {"path": str(self.pipeline)}))
|
||||
elif bad := pyav_unpinned(self.pipeline):
|
||||
out.append(("setup.pyav", {"files": ", ".join(bad), "path": str(self.pipeline)}))
|
||||
if not os.access(self.spirula, os.X_OK):
|
||||
out.append(("setup.spirula", {"path": str(self.spirula)}))
|
||||
if not self.splat_transform:
|
||||
out.append(("setup.splat_transform", {}))
|
||||
out.append(("setup.splat_transform", {"file": str(self.source or CONFIG_FILE)}))
|
||||
for tool in ("ffmpeg", "ffprobe", "uv"):
|
||||
if not shutil.which(tool):
|
||||
out.append(("setup.tool", {"tool": tool}))
|
||||
@@ -76,7 +122,8 @@ class Config:
|
||||
|
||||
|
||||
def slugify(name: str) -> str:
|
||||
"""Folder/file name from a display name: ä→ae etc., accents dropped, only [A-Za-z0-9._-]."""
|
||||
"""Folder/file name from a display name: ä→ae etc., accents dropped, only [A-Za-z0-9._-]; no dot or
|
||||
dash at the ends ("Tour 12.10." → Tour-12.10: Windows file systems such as NTFS refuse a trailing dot)."""
|
||||
for a, b in (("ä", "ae"), ("ö", "oe"), ("ü", "ue"), ("Ä", "Ae"), ("Ö", "Oe"), ("Ü", "Ue"), ("ß", "ss")):
|
||||
name = name.replace(a, b)
|
||||
name = unicodedata.normalize("NFKD", name).encode("ascii", "ignore").decode()
|
||||
@@ -88,7 +135,7 @@ def slugify(name: str) -> str:
|
||||
elif not dash:
|
||||
out.append("-")
|
||||
dash = True
|
||||
return "".join(out).strip("-")
|
||||
return "".join(out).strip("-.")
|
||||
|
||||
|
||||
def _merge(base: dict, over: dict) -> dict:
|
||||
@@ -102,12 +149,12 @@ def _merge(base: dict, over: dict) -> dict:
|
||||
|
||||
|
||||
def load() -> Config:
|
||||
data, source = DEFAULTS, None
|
||||
data, source, unknown = DEFAULTS, None, []
|
||||
if CONFIG_FILE.is_file():
|
||||
with open(CONFIG_FILE, "rb") as fh:
|
||||
data = _merge(DEFAULTS, tomllib.load(fh))
|
||||
source = CONFIG_FILE
|
||||
return Config(data, source)
|
||||
own = tomllib.load(fh)
|
||||
data, source, unknown = _merge(DEFAULTS, own), CONFIG_FILE, unknown_keys(own)
|
||||
return Config(data, source, unknown)
|
||||
|
||||
|
||||
def shell(cfg: Config) -> str:
|
||||
|
||||
@@ -13,13 +13,26 @@ TEXTS = {
|
||||
"inhibit.download": "Downloading a recording from the Frame",
|
||||
"inhibit.combine": "Putting “{name}” together",
|
||||
"tour.full_name": "{name} (full)",
|
||||
"inhibit.busy": "Busy (converting, putting together, copying)",
|
||||
"notify.standby.title": "Everything done", "notify.standby": "The PC goes to standby in {s} seconds – to stop it, untick “Standby when done” in Splat Workshop.",
|
||||
"notify.standby_failed.title": "No standby", "notify.standby_failed": "The PC could not go to standby: {why}",
|
||||
"inhibit.mesh": "Making a mesh of “{name}”", "inhibit.import": "Importing “{name}”",
|
||||
"import.step.convert": "Converting", "import.step.preview": "Preview", "pick.splat": "Choose a splat file",
|
||||
"pick.recording": "Choose a recording", "mesh.step.mesh": "Meshing", "mesh.step.upright": "Standing it upright",
|
||||
"inhibit.versions": "Making versions of “{name}”", "ver.all": "all splats", "ver.size": "{n} M",
|
||||
"ver.clean.ceiling": "ceiling", "ver.clean.floor": "floor", "ver.clean.haze": "haze", "ver.clean.outside": "edges",
|
||||
"notify.failed.title": "Conversion failed",
|
||||
"notify.failed": "“{name}” – details in Splat Workshop",
|
||||
"notify.download.title": "Fetched from the Frame",
|
||||
"notify.download": "{n} recording(s) are on this PC – you can switch the Frame off",
|
||||
"notify.download_failed.title": "Fetching failed",
|
||||
"notify.download_failed": "{n} recording(s) could not be fetched ({ok} did) – is the Frame switched on?",
|
||||
"part.name": "{name} · part {i} of {n}",
|
||||
"notify.parts_done.title": "All parts converted",
|
||||
"notify.parts_done": "“{name}”: {n} parts are one room now – it is being put together",
|
||||
"notify.parts_done_alone": "“{name}”: {n} parts are one room now – put it together in Splat Workshop",
|
||||
"notify.parts_failed.title": "Conversion in parts stopped",
|
||||
"notify.parts_failed": "“{name}”: part {i} of {n} failed – details in Splat Workshop",
|
||||
"notify.upload.title": "Copied to the Frame",
|
||||
"notify.upload": "“{name}” is in the Gaussian XR gallery",
|
||||
"notify.upload_failed.title": "Copying failed",
|
||||
@@ -38,6 +51,8 @@ TEXTS = {
|
||||
"tray.copied": "Address copied",
|
||||
"tray.cancel": "Cancel conversion …",
|
||||
"tray.quit": "Quit",
|
||||
"tray.update": "Check for updates", "tray.update.new": "Splat Workshop {latest} is out (you have {current}) – click for what's new. To update: git pull in the Splat Workshop folder, then restart.",
|
||||
"tray.update.none": "You have the newest version ({current}).", "tray.update.offline": "GitHub could not be reached – try again later.",
|
||||
"tray.server_down": "Server is not responding",
|
||||
"dlg.cancel.title": "Cancel conversion?",
|
||||
"dlg.cancel.text": "“{name}” is being converted right now ({phase}).",
|
||||
@@ -67,13 +82,26 @@ TEXTS = {
|
||||
"inhibit.download": "Lädt eine Aufnahme von der Frame",
|
||||
"inhibit.combine": "Setzt „{name}“ zusammen",
|
||||
"tour.full_name": "{name} (voll)",
|
||||
"inhibit.busy": "Beschäftigt (Umwandeln, Zusammensetzen, Kopieren)",
|
||||
"notify.standby.title": "Alles fertig", "notify.standby": "Der PC geht in {s} Sekunden in den Standby – zum Abbrechen in der Splat-Werkstatt den Haken bei „Danach in den Standby“ entfernen.",
|
||||
"notify.standby_failed.title": "Kein Standby", "notify.standby_failed": "Der PC konnte nicht in den Standby: {why}",
|
||||
"inhibit.mesh": "Erstellt ein Mesh von „{name}“", "inhibit.import": "Importiert „{name}“",
|
||||
"import.step.convert": "Umwandeln", "import.step.preview": "Vorschau", "pick.splat": "Splat-Datei wählen",
|
||||
"pick.recording": "Aufnahme wählen", "mesh.step.mesh": "Vernetzen", "mesh.step.upright": "Aufrichten",
|
||||
"inhibit.versions": "Erstellt Fassungen von „{name}“", "ver.all": "alle Splats", "ver.size": "{n} Mio.",
|
||||
"ver.clean.ceiling": "Decke", "ver.clean.floor": "Boden", "ver.clean.haze": "Dunst", "ver.clean.outside": "Rand",
|
||||
"notify.failed.title": "Umwandlung fehlgeschlagen",
|
||||
"notify.failed": "„{name}“ – Details in der Splat-Werkstatt",
|
||||
"notify.download.title": "Von der Frame geholt",
|
||||
"notify.download": "{n} Aufnahme(n) liegen auf dem PC – du kannst die Frame abschalten",
|
||||
"notify.download_failed.title": "Holen fehlgeschlagen",
|
||||
"notify.download_failed": "{n} Aufnahme(n) konnten nicht geholt werden ({ok} schon) – ist die Frame an?",
|
||||
"part.name": "{name} · Teil {i} von {n}",
|
||||
"notify.parts_done.title": "Alle Teile umgewandelt",
|
||||
"notify.parts_done": "„{name}“: {n} Teile sind jetzt ein Raum – er wird zusammengesetzt",
|
||||
"notify.parts_done_alone": "„{name}“: {n} Teile sind jetzt ein Raum – in der Splat-Werkstatt zusammensetzen",
|
||||
"notify.parts_failed.title": "Umwandlung in Teilen angehalten",
|
||||
"notify.parts_failed": "„{name}“: Teil {i} von {n} ist fehlgeschlagen – Details in der Splat-Werkstatt",
|
||||
"notify.upload.title": "Auf die Frame übertragen",
|
||||
"notify.upload": "„{name}“ liegt in der Gaussian-XR-Galerie",
|
||||
"notify.upload_failed.title": "Übertragung fehlgeschlagen",
|
||||
@@ -92,6 +120,8 @@ TEXTS = {
|
||||
"tray.copied": "Adresse kopiert",
|
||||
"tray.cancel": "Umwandlung abbrechen …",
|
||||
"tray.quit": "Beenden",
|
||||
"tray.update": "Nach Updates suchen", "tray.update.new": "Die Splat-Werkstatt {latest} ist da (du hast {current}) – Klick zeigt, was neu ist. Aktualisieren: git pull im Ordner der Splat-Werkstatt, dann neu starten.",
|
||||
"tray.update.none": "Du hast die neueste Version ({current}).", "tray.update.offline": "GitHub war nicht erreichbar – später noch einmal versuchen.",
|
||||
"tray.server_down": "Server antwortet nicht",
|
||||
"dlg.cancel.title": "Umwandlung abbrechen?",
|
||||
"dlg.cancel.text": "Gerade wird „{name}“ umgewandelt ({phase}).",
|
||||
|
||||
+696
-57
File diff suppressed because it is too large.
Load diff
+36
-1
@@ -8,6 +8,7 @@ or be cancelled (it can be resumed later).
|
||||
import json
|
||||
import subprocess
|
||||
import sys
|
||||
import threading
|
||||
import time
|
||||
import urllib.error
|
||||
import urllib.request
|
||||
@@ -95,13 +96,17 @@ class Tray:
|
||||
self.a_status = QAction("", self.menu, enabled=False)
|
||||
self.a_lan = QAction("", self.menu, triggered=self.copy_lan, visible=False)
|
||||
self.a_cancel = QAction(t("tray.cancel"), self.menu, triggered=self.cancel, enabled=False)
|
||||
self.a_update = QAction(t("tray.update"), self.menu, triggered=self.check_update)
|
||||
self.update_result = None # from the background check, shown by refresh()
|
||||
self.update_url = None
|
||||
self.a_quit = QAction(t("tray.quit"), self.menu, triggered=self.quit)
|
||||
f = self.a_open.font()
|
||||
f.setBold(True)
|
||||
self.a_open.setFont(f)
|
||||
for a in (self.a_open, None, self.a_status, self.a_lan, None, self.a_cancel, None, self.a_quit):
|
||||
for a in (self.a_open, None, self.a_status, self.a_lan, None, self.a_cancel, None, self.a_update, self.a_quit):
|
||||
self.menu.addSeparator() if a is None else self.menu.addAction(a)
|
||||
self.tray.setContextMenu(self.menu)
|
||||
self.tray.messageClicked.connect(self.open_update)
|
||||
self.lan_url = None
|
||||
|
||||
self.ensure_server()
|
||||
@@ -128,6 +133,8 @@ class Tray:
|
||||
pass
|
||||
|
||||
def refresh(self):
|
||||
if self.update_result is not None:
|
||||
self.show_update()
|
||||
try:
|
||||
self.act = request("/api/activity")
|
||||
self.fails = 0
|
||||
@@ -179,6 +186,34 @@ class Tray:
|
||||
def open(self):
|
||||
webbrowser.open(BASE + "/")
|
||||
|
||||
def check_update(self):
|
||||
"""Ask GitHub now (in the background; the answer comes as a notification)."""
|
||||
self.a_update.setEnabled(False)
|
||||
|
||||
def run():
|
||||
try:
|
||||
self.update_result = request("/api/update/check", {}, timeout=20)
|
||||
except (OSError, ValueError):
|
||||
self.update_result = {"reached": False}
|
||||
threading.Thread(target=run, daemon=True).start()
|
||||
|
||||
def show_update(self):
|
||||
r, self.update_result = self.update_result, None
|
||||
self.a_update.setEnabled(True)
|
||||
u = r.get("update")
|
||||
if u:
|
||||
self.update_url = u.get("url")
|
||||
self.tray.showMessage(t("app"), t("tray.update.new", latest=u["latest"], current=u["current"]),
|
||||
QSystemTrayIcon.Information, 10000)
|
||||
else:
|
||||
self.update_url = None
|
||||
self.tray.showMessage(t("app"), t("tray.update.none", current=r.get("current", "")) if r.get("reached")
|
||||
else t("tray.update.offline"), QSystemTrayIcon.Information, 5000)
|
||||
|
||||
def open_update(self):
|
||||
if self.update_url:
|
||||
webbrowser.open(self.update_url)
|
||||
|
||||
def copy_lan(self):
|
||||
QGuiApplication.clipboard().setText(self.lan_url or "")
|
||||
self.tray.showMessage(t("app"), t("tray.copied"), QSystemTrayIcon.Information, 2000)
|
||||
|
||||
+71
-3
@@ -33,10 +33,13 @@ def script(path: Path, text: str):
|
||||
|
||||
|
||||
# Fake pipeline: behaves like av1_to_3dgs.py as far as Splat Workshop can see (progress lines, result files).
|
||||
# FAKE_PIPELINE=ok (default) | fail | slow (waits for 60 s, to be cancelled)
|
||||
# FAKE_PIPELINE=ok (default) | fail | slow (waits for 60 s, to be cancelled) | room (a synthetic recording of
|
||||
# room A from tests/synth.py that can really be put together: "part-1" in the recording's name walks round
|
||||
# the left half, other parts the right half)
|
||||
script(PIPE / "av1_to_3dgs.py", r'''
|
||||
import base64, json, os, sys, time
|
||||
from pathlib import Path
|
||||
TESTS = %r''' % str(Path(__file__).parent) + r'''
|
||||
out = Path(sys.argv[2])
|
||||
mode = os.environ.get("FAKE_PIPELINE", "ok")
|
||||
# like the real pipeline: an unfinished training blocks --resume ("Incomplete training retained")
|
||||
@@ -64,6 +67,17 @@ for step in (1000, 2000, 3000):
|
||||
time.sleep(20)
|
||||
(out / "spirula").mkdir(exist_ok=True)
|
||||
(out / "spirula" / "scene.ply").write_bytes(b"ply\n")
|
||||
if mode == "room":
|
||||
import re, shutil, tempfile
|
||||
sys.path.insert(0, TESTS)
|
||||
import synth
|
||||
first = re.search(r"part-1-of", Path(sys.argv[1]).name) is not None
|
||||
tmp = Path(tempfile.mkdtemp())
|
||||
made = synth.make_room(tmp, "x", "A", loop=(1.1, 1.5, 0.6, 0.8) if first else (2.9, 1.5, 0.6, 0.8),
|
||||
colour=(1, 0, 0) if first else (0, 1, 0))
|
||||
shutil.copytree(made / "dataset", out / "dataset", dirs_exist_ok=True)
|
||||
shutil.copy(made / "spirula" / "scene.ply", out / "spirula" / "scene.ply")
|
||||
shutil.rmtree(tmp)
|
||||
run_json.write_text(json.dumps({"status": "complete"}))
|
||||
print("spirula: 1,000 Gaussians in " + str(out / "spirula" / "scene.ply"), flush=True)
|
||||
(out / "scene.sog").write_bytes(b"fake sog")
|
||||
@@ -72,7 +86,28 @@ png = base64.b64decode("iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR4
|
||||
(out / (out.name.lower() + ".gallery.png")).write_bytes(png)
|
||||
print("Gaussian XR scene transform: " + str(out / "scene.xrSceneTransform.json"), flush=True)
|
||||
''')
|
||||
script(BIN / "spirula", "#!/bin/sh\nexit 0\n")
|
||||
# spirula: `spirula mesh` writes a tiny room in every format/colour pair the real one writes (tests/fake_mesh.py)
|
||||
script(BIN / "spirula", f'''#!{sys.executable}
|
||||
import json, sys
|
||||
from pathlib import Path
|
||||
sys.path.insert(0, "{Path(__file__).parent}")
|
||||
with open("{TOOL_LOG}", "a") as log:
|
||||
log.write(json.dumps(["spirula", *sys.argv[1:]]) + "\\n")
|
||||
args = sys.argv[1:]
|
||||
if args[:1] == ["mesh"]:
|
||||
import fake_mesh
|
||||
opt = lambda k: args[args.index(k) + 1]
|
||||
formats, colours, base = opt("--format").split(","), opt("--color").split(","), Path(opt("--output"))
|
||||
ok = {{("glb", "vertex"), ("glb", "none"), ("glb", "texture"), ("ply", "vertex"), ("ply", "none"),
|
||||
("obj", "none"), ("obj", "texture"), ("stl", "none")}}
|
||||
tag = {{"vertex": "_vertexcolor", "none": "_nocolor", "texture": "_texture"}}
|
||||
for f in formats:
|
||||
for c in colours:
|
||||
if (f, c) in ok:
|
||||
fake_mesh.write(base.with_name(base.name + (tag[c] if len(colours) > 1 else "") + "." + f), f, c)
|
||||
if c == "texture" and f == "obj":
|
||||
base.with_name(base.name + (tag[c] if len(colours) > 1 else "") + ".png").write_bytes(b"png")
|
||||
''')
|
||||
# splat-transform: copies the input (a .ply stays a .ply), writes a small file for .sog
|
||||
script(BIN / "splat-transform", f'''#!{sys.executable}
|
||||
import json, shutil, sys
|
||||
@@ -103,12 +138,35 @@ import json, sys
|
||||
with open("{TOOL_LOG}", "a") as log:
|
||||
log.write(json.dumps(["{tool}", *sys.argv[1:]]) + "\\n")
|
||||
''')
|
||||
# systemctl: the tests must never suspend this PC – a note in the tool log; FAKE_SUSPEND_FAIL=1: refused
|
||||
script(BIN / "systemctl", f'''#!{sys.executable}
|
||||
import json, os, sys
|
||||
with open("{TOOL_LOG}", "a") as log:
|
||||
log.write(json.dumps(["systemctl", *sys.argv[1:]]) + "\\n")
|
||||
if os.environ.get("FAKE_SUSPEND_FAIL"):
|
||||
sys.exit("Operation inhibited by \\"Steam\\" (Steam is downloading)")
|
||||
''')
|
||||
# notify-send: no desktop notifications from the tests, only a note in the tool log
|
||||
script(BIN / "notify-send", f'''#!{sys.executable}
|
||||
import json, sys
|
||||
with open("{TOOL_LOG}", "a") as log:
|
||||
log.write(json.dumps(["notify-send", *sys.argv[1:]]) + "\\n")
|
||||
''')
|
||||
# ffmpeg: cutting a part of a recording (-copyts) is only noted in the tool log and gives a small file;
|
||||
# everything else goes to the real ffmpeg
|
||||
script(BIN / "ffmpeg", f'''#!{sys.executable}
|
||||
import json, os, sys
|
||||
args = sys.argv[1:]
|
||||
if "-copyts" in args:
|
||||
with open("{TOOL_LOG}", "a") as log:
|
||||
log.write(json.dumps(["ffmpeg", *args]) + "\\n")
|
||||
open(args[-1], "wb").write(b"a part of a recording")
|
||||
sys.exit(0)
|
||||
real = {shutil.which("ffmpeg")!r}
|
||||
if not real:
|
||||
sys.exit("no ffmpeg")
|
||||
os.execv(real, [real, *args])
|
||||
''')
|
||||
# ffprobe: a good Arcturus recording (two video streams, gpmd, 60 s) unless the file name says otherwise:
|
||||
# "mono" one video stream, "nogpmd" no metadata stream, "short" 5 s, "brief" 15 s
|
||||
script(BIN / "ffprobe", f'''#!{sys.executable}
|
||||
@@ -175,6 +233,7 @@ runs = "{RUNS}"
|
||||
extra_recording_dirs = []
|
||||
[server]
|
||||
language = "en"
|
||||
check_updates = false
|
||||
[frame]
|
||||
host = ""
|
||||
''')
|
||||
@@ -189,6 +248,8 @@ from splat_workshop import server # noqa: E402 (after the environment is set u
|
||||
def clean():
|
||||
"""Every test starts with empty runs, recordings, state and trash."""
|
||||
yield
|
||||
for p in server.notes: # notifications still on their way belong to this test
|
||||
p.wait(10)
|
||||
st = server.load_state().get("job") or {}
|
||||
if server.pid_alive(st.get("pid", 0)):
|
||||
server.cancel_job()
|
||||
@@ -204,7 +265,7 @@ def clean():
|
||||
while server.download_busy() and time.time() < end:
|
||||
time.sleep(0.05)
|
||||
server.download, server.download_queue[:], server.download_batch = None, [], {}
|
||||
for k in ("FAKE_PIPELINE", "FAKE_FRAME_OFF", "FAKE_FRAME_CUT", "FAKE_FRAME_SLOW", "FAKE_FRAME_SHORT", "FAKE_SCP_SLOW",
|
||||
for k in ("FAKE_PIPELINE", "FAKE_SUSPEND_FAIL", "FAKE_FRAME_OFF", "FAKE_FRAME_CUT", "FAKE_FRAME_SLOW", "FAKE_FRAME_SHORT", "FAKE_SCP_SLOW",
|
||||
"FRAME_HOST"):
|
||||
os.environ.pop(k, None)
|
||||
os.environ["FRAME_HOST"] = ""
|
||||
@@ -289,6 +350,13 @@ class Client:
|
||||
def get(self, path, headers=None):
|
||||
return self.request("GET", path, headers=headers)
|
||||
|
||||
def raw(self, path):
|
||||
"""GET without decoding: status, body bytes, headers."""
|
||||
c = http.client.HTTPConnection("127.0.0.1", self.port, timeout=30)
|
||||
c.request("GET", path)
|
||||
r = c.getresponse()
|
||||
return r.status, r.read(), dict(r.getheaders())
|
||||
|
||||
def post(self, path, body=None, headers=None):
|
||||
return self.request("POST", path, body if body is not None else {}, headers)
|
||||
|
||||
|
||||
@@ -0,0 +1,92 @@
|
||||
"""Writers for the fake `spirula mesh` (tests/conftest.py) and readers for the tests: a tiny room as
|
||||
Spirula would mesh it – in the scene's own frame, Y down: the floor at y = +1.6, the ceiling at y = -0.9,
|
||||
both 4 x 4 m around x, z = 0. Each file holds two quads (four triangles)."""
|
||||
import json
|
||||
import struct
|
||||
|
||||
import numpy as np
|
||||
|
||||
FLOOR_Y, CEILING_Y = 1.6, -0.9
|
||||
V = np.array([[x, y, z] for y in (FLOOR_Y, CEILING_Y) for x, z in ((-2, -2), (2, -2), (2, 2), (-2, 2))], np.float32)
|
||||
F = np.array([[0, 1, 2], [0, 2, 3], [4, 6, 5], [4, 7, 6]], np.int32)
|
||||
N = np.array([[0, -1, 0]] * 4 + [[0, 1, 0]] * 4, np.float32) # floor faces up (-Y), ceiling down
|
||||
|
||||
|
||||
def write(path, fmt, colour):
|
||||
if fmt == "ply":
|
||||
props = "property float x\nproperty float y\nproperty float z\nproperty float nx\nproperty float ny\nproperty float nz\n"
|
||||
props += "property uchar red\nproperty uchar green\nproperty uchar blue\n" if colour == "vertex" else ""
|
||||
head = f"ply\nformat binary_little_endian 1.0\nelement vertex {len(V)}\n{props}element face {len(F)}\nproperty list uchar int vertex_indices\nend_header\n"
|
||||
body = b""
|
||||
for v, n in zip(V, N):
|
||||
body += struct.pack("<6f", *v, *n) + (bytes([200, 150, 100]) if colour == "vertex" else b"")
|
||||
for f in F:
|
||||
body += struct.pack("<B3i", 3, *f)
|
||||
path.write_bytes(head.encode() + body)
|
||||
elif fmt == "obj":
|
||||
lines = ["# fake"] + [f"v {x} {y} {z}" for x, y, z in V] + [f"vn {x} {y} {z}" for x, y, z in N]
|
||||
lines += [f"f {a + 1} {b + 1} {c + 1}" for a, b, c in F]
|
||||
path.write_text("\n".join(lines) + "\n")
|
||||
elif fmt == "stl":
|
||||
body = b"".join(struct.pack("<12fH", *N[f[0]], *V[f[0]], *V[f[1]], *V[f[2]], 0) for f in F)
|
||||
path.write_bytes(b"\0" * 80 + struct.pack("<I", len(F)) + body)
|
||||
elif fmt == "glb":
|
||||
buf = V.tobytes() + F.astype(np.uint32).tobytes()
|
||||
gltf = {"asset": {"version": "2.0"}, "scene": 0, "scenes": [{"nodes": [0]}], "nodes": [{"mesh": 0, "name": "room"}],
|
||||
"meshes": [{"primitives": [{"attributes": {"POSITION": 0}, "indices": 1}]}],
|
||||
"buffers": [{"byteLength": len(buf)}],
|
||||
"bufferViews": [{"buffer": 0, "byteOffset": 0, "byteLength": V.nbytes},
|
||||
{"buffer": 0, "byteOffset": V.nbytes, "byteLength": F.size * 4}],
|
||||
"accessors": [{"bufferView": 0, "componentType": 5126, "count": len(V), "type": "VEC3",
|
||||
"min": V.min(0).tolist(), "max": V.max(0).tolist()},
|
||||
{"bufferView": 1, "componentType": 5125, "count": F.size, "type": "SCALAR"}]}
|
||||
js = json.dumps(gltf).encode()
|
||||
js += b" " * (-len(js) % 4)
|
||||
buf += b"\0" * (-len(buf) % 4)
|
||||
path.write_bytes(struct.pack("<4sII", b"glTF", 2, 12 + 8 + len(js) + 8 + len(buf))
|
||||
+ struct.pack("<I4s", len(js), b"JSON") + js + struct.pack("<I4s", len(buf), b"BIN\0") + buf)
|
||||
|
||||
|
||||
def read_points(path):
|
||||
"""Vertex positions as a 3D program sees them (for GLB: with the node transforms applied)."""
|
||||
fmt = path.suffix[1:]
|
||||
raw = path.read_bytes()
|
||||
if fmt == "ply":
|
||||
end = raw.index(b"end_header\n") + len(b"end_header\n")
|
||||
colour = b"property uchar red" in raw[:end]
|
||||
dt = np.dtype([("p", "<f4", 3), ("n", "<f4", 3)] + ([("c", "u1", 3)] if colour else []))
|
||||
return np.frombuffer(raw, dt, count=len(V), offset=end)["p"].astype(float)
|
||||
if fmt == "obj":
|
||||
return np.array([[float(x) for x in l.split()[1:4]] for l in raw.decode().splitlines() if l.startswith("v ")])
|
||||
if fmt == "stl":
|
||||
n, = struct.unpack_from("<I", raw, 80)
|
||||
t = np.frombuffer(raw, np.dtype([("n", "<f4", 3), ("v", "<f4", (3, 3)), ("a", "<u2")]), count=n, offset=84)
|
||||
return t["v"].reshape(-1, 3).astype(float)
|
||||
if fmt == "glb":
|
||||
jl, = struct.unpack_from("<I", raw, 12)
|
||||
gltf = json.loads(raw[20:20 + jl])
|
||||
bin_ = raw[20 + jl + 8:]
|
||||
pts = np.frombuffer(bin_, np.float32, count=len(V) * 3).reshape(-1, 3).astype(float)
|
||||
|
||||
def transform(i, p):
|
||||
node = gltf["nodes"][i]
|
||||
if "rotation" in node:
|
||||
x, y, z, w = node["rotation"]
|
||||
R = np.array([[1 - 2 * (y * y + z * z), 2 * (x * y - z * w), 2 * (x * z + y * w)],
|
||||
[2 * (x * y + z * w), 1 - 2 * (x * x + z * z), 2 * (y * z - x * w)],
|
||||
[2 * (x * z - y * w), 2 * (y * z + x * w), 1 - 2 * (x * x + y * y)]])
|
||||
p = p @ R.T
|
||||
return p + np.array(node.get("translation", [0, 0, 0]))
|
||||
out = []
|
||||
for root in gltf["scenes"][gltf.get("scene", 0)]["nodes"]:
|
||||
def walk(i, chain):
|
||||
node = gltf["nodes"][i]
|
||||
if "mesh" in node:
|
||||
p = pts
|
||||
for j in reversed(chain + [i]):
|
||||
p = transform(j, p)
|
||||
out.append(p)
|
||||
for c in node.get("children", []):
|
||||
walk(c, chain + [i])
|
||||
walk(root, [])
|
||||
return np.vstack(out)
|
||||
+11
-2
@@ -123,13 +123,15 @@ SPLAT_SIZE = 0.02 # metres
|
||||
|
||||
def make_room(runs: Path, slug: str, room: str, error=(1.0, (0.03, 0.0, -0.02)), scale=1.0,
|
||||
drift=(0.0, 0.0, 0.0), turn=0.0, noise=0.005, walk_in_offset=0.3,
|
||||
name=None, recording=None, markers=(), colour=None):
|
||||
name=None, recording=None, markers=(), colour=None, loop=None):
|
||||
"""Write one synthetic room into runs/<slug>. Returns the run folder.
|
||||
|
||||
The reconstruction differs from the real world by `error` = (yaw in degrees, shift in m) and `scale`.
|
||||
The Frame's tracking of this recording is off by `drift` (m) and turned by `turn` (degrees, about the
|
||||
room's middle), plus `noise` (m) per pose. markers: True for red/green/blue at the corner, along +x and
|
||||
along +z, or a list of ((r, g, b), (x, y, z)) – blobs of 400 splats at real-world positions.
|
||||
loop: (x, z, radius x, radius z) – a round of its own in the room instead of the usual one, looking at the
|
||||
walls (outwards): several recordings of one room, e.g. one for each half.
|
||||
runs/<slug>/synth.json records how many splats are the room's own (of these, how many on the wall it
|
||||
shares with the other room – zero thickness, so it belongs to both) and how many were seen through the door."""
|
||||
rng = np.random.default_rng(zlib.crc32(slug.encode()))
|
||||
@@ -154,13 +156,20 @@ def make_room(runs: Path, slug: str, room: str, error=(1.0, (0.03, 0.0, -0.02)),
|
||||
|
||||
pos, times = path(room, walk_in_offset)
|
||||
centre = np.array([(x0 + x1) / 2, 0.0, 1.5])
|
||||
target = lambda c: centre
|
||||
if loop:
|
||||
lx, lz, rx, rz = loop
|
||||
t = np.linspace(0, 2 * np.pi, 140)
|
||||
pos = np.stack([lx + rx * np.cos(t), np.zeros_like(t), lz + rz * np.sin(t)], 1)
|
||||
times = np.linspace(0, 40, len(pos))
|
||||
target = lambda c: 2 * c - np.array([lx, 0.0, lz]) # outwards, at the walls
|
||||
yaw, shift = error
|
||||
E = Rotation.from_euler("y", yaw, degrees=True) # world -> reconstruction
|
||||
to_sfm = lambda p: scale * E.apply(p) + np.array(shift)
|
||||
T = Rotation.from_euler("y", turn, degrees=True) # the tracking's own turn
|
||||
names, Rs, Cs, frames = [], [], [], []
|
||||
for k, (c, t) in enumerate(zip(pos, times)):
|
||||
R_world = look_at(c.copy(), centre)
|
||||
R_world = look_at(c.copy(), target(c))
|
||||
image = f"cam0/{k:04d}-{t:.6f}.jpg"
|
||||
names.append(image)
|
||||
Rs.append(R_world @ E.as_matrix().T)
|
||||
|
||||
@@ -0,0 +1,236 @@
|
||||
"""Cleaning up a scene (0.4, scripts/clean.py): ceiling, floor, haze, outside – and as part of its versions.
|
||||
|
||||
The synthetic room is built so every kind of splat can be told apart afterwards by its colour: a white
|
||||
ceiling that the reconstruction left thin, a dark veil under it, a dark cupboard top by the wall, a bird
|
||||
cage of long thin bars, fat transparent blobs (haze), a floor with a hole, and things beyond the walls.
|
||||
The expectations come from how it is built, not from the code."""
|
||||
import json
|
||||
import subprocess
|
||||
import sys
|
||||
|
||||
import numpy as np
|
||||
import pytest
|
||||
|
||||
from conftest import ROOT, RUNS, server, wait_job
|
||||
import synth
|
||||
|
||||
CLEAN = ROOT / "scripts" / "clean.py"
|
||||
FLOOR, CEILING = 1.6, -0.9 # y points down: the room is 2.5 m high
|
||||
W, D = 4.0, 5.0 # x and z extent of the room
|
||||
WALL, FLOORC, CEILC = (0.6, 0.6, 0.6), (0.45, 0.3, 0.2), (0.85, 0.85, 0.82)
|
||||
VEIL, CUPBOARD, CAGE, HAZE, OUT = (0.12, 0.12, 0.13), (0.2, 0.1, 0.05), (0.3, 0.3, 0.35), (0.5, 0.5, 0.9), (0.9, 0.1, 0.9)
|
||||
LOGIT = lambda a: float(np.log(a / (1 - a)))
|
||||
|
||||
|
||||
def splats(pts, colour, opacity=0.95, scale=(0.02, 0.02, 0.02)):
|
||||
v = np.zeros(len(pts), dtype=np.dtype([(p, "<f4") for p in synth.PROPS]))
|
||||
v["x"], v["y"], v["z"] = np.asarray(pts).T
|
||||
for k in range(3):
|
||||
v[f"f_dc_{k}"] = (colour[k] - 0.5) / 0.28209479177387814
|
||||
v[f"scale_{k}"] = np.log(scale[k])
|
||||
v["opacity"] = LOGIT(opacity)
|
||||
v["rot_0"] = 1.0
|
||||
return v
|
||||
|
||||
|
||||
def grid(a0, a1, b0, b1, step):
|
||||
a, b = np.meshgrid(np.arange(a0, a1 + 1e-9, step), np.arange(b0, b1 + 1e-9, step), indexing="ij")
|
||||
return a.ravel(), b.ravel()
|
||||
|
||||
|
||||
def room(path):
|
||||
"""The living room as a reconstruction of a white ceiling tends to come out."""
|
||||
rng = np.random.default_rng(1)
|
||||
parts = []
|
||||
ys = np.arange(CEILING, FLOOR + 1e-9, 0.04)
|
||||
for x in (0.0, W): # walls
|
||||
z, y = grid(0, D, CEILING, FLOOR, 0.04)
|
||||
parts.append(splats(np.stack([np.full_like(z, x), y, z], 1), WALL))
|
||||
for z in (0.0, D):
|
||||
x, y = grid(0, W, CEILING, FLOOR, 0.04)
|
||||
parts.append(splats(np.stack([x, y, np.full_like(x, z)], 1), WALL))
|
||||
x, z = grid(0, W, 0, D, 0.03) # floor with a hole of 1 x 1 m
|
||||
hole = (x > 1.5) & (x < 2.5) & (z > 2.0) & (z < 3.0)
|
||||
parts.append(splats(np.stack([x[~hole], np.full((~hole).sum(), FLOOR), z[~hole]], 1), FLOORC))
|
||||
x, z = grid(0, W, 0, D, 0.12) # thin ceiling: little, half transparent ...
|
||||
parts.append(splats(np.stack([x, np.full_like(x, CEILING), z], 1), CEILC, opacity=0.4))
|
||||
x, z = grid(0, W, 0, D, 0.03) # ... but solid where it meets the walls
|
||||
edge = (x < 0.25) | (x > W - 0.25) | (z < 0.25) | (z > D - 0.25)
|
||||
parts.append(splats(np.stack([x[edge], np.full(edge.sum(), CEILING), z[edge]], 1), CEILC))
|
||||
n = 4000 # the veil: dark, thin, 10–30 cm under it
|
||||
veil = np.stack([rng.uniform(0.8, W - 0.8, n), CEILING + rng.uniform(0.1, 0.3, n), rng.uniform(0.8, D - 0.8, n)], 1)
|
||||
parts.append(splats(veil, VEIL, opacity=0.2, scale=(0.03, 0.03, 0.03)))
|
||||
x, z = grid(0.05, 0.4, 1.0, 2.0, 0.03) # a dark cupboard top at the wall, 2.2 m high
|
||||
parts.append(splats(np.stack([x, np.full_like(x, FLOOR - 2.2), z], 1), CUPBOARD))
|
||||
bars = [] # a bird cage: long thin bars, faint
|
||||
for bx in np.arange(1.8, 2.2, 0.02):
|
||||
for by in np.arange(FLOOR - 2.0, FLOOR - 1.2, 0.08):
|
||||
bars.append((bx, by, 2.5))
|
||||
parts.append(splats(bars, CAGE, opacity=0.15, scale=(0.001, 0.06, 0.001)))
|
||||
n = 300 # haze: fat, transparent blobs in the room
|
||||
blobs = np.stack([rng.uniform(1, 3, n), rng.uniform(FLOOR - 1.6, FLOOR - 0.6, n), rng.uniform(1, 4, n)], 1)
|
||||
parts.append(splats(blobs, HAZE, opacity=0.06, scale=(0.06, 0.06, 0.06)))
|
||||
n = 500 # beyond the walls, seen through the window
|
||||
out = np.stack([rng.uniform(-3, -1.5, n), rng.uniform(FLOOR - 2, FLOOR, n), rng.uniform(0, D, n)], 1)
|
||||
parts.append(splats(out, OUT))
|
||||
v = np.concatenate(parts)
|
||||
header = "ply\nformat binary_little_endian 1.0\nelement vertex %d\n%send_header\n" % (
|
||||
len(v), "".join(f"property float {p}\n" for p in synth.PROPS))
|
||||
path.parent.mkdir(parents=True, exist_ok=True)
|
||||
with open(path, "wb") as f:
|
||||
f.write(header.encode())
|
||||
v.tofile(f)
|
||||
return v
|
||||
|
||||
|
||||
def read(path):
|
||||
with open(path, "rb") as f:
|
||||
header = b""
|
||||
while not header.endswith(b"end_header\n"):
|
||||
header += f.readline()
|
||||
props = [l.split()[-1].decode() for l in header.splitlines() if l.startswith(b"property")]
|
||||
n = int(next(l for l in header.splitlines() if l.startswith(b"element vertex")).split()[-1])
|
||||
return np.fromfile(f, dtype=np.dtype([(p, "<f4") for p in props]), count=n)
|
||||
|
||||
|
||||
def colour_of(v):
|
||||
return 0.5 + 0.28209479177387814 * np.stack([v["f_dc_0"], v["f_dc_1"], v["f_dc_2"]], 1)
|
||||
|
||||
|
||||
def count(v, rgb):
|
||||
return int(np.all(np.abs(colour_of(v) - rgb) < 0.01, axis=1).sum())
|
||||
|
||||
|
||||
def clean(tmp_path, *args):
|
||||
src, dst = tmp_path / "in.ply", tmp_path / "out.ply"
|
||||
before = room(src)
|
||||
r = subprocess.run([sys.executable, str(CLEAN), str(src), str(dst), *args], capture_output=True, text=True)
|
||||
assert r.returncode == 0, r.stderr
|
||||
return before, read(dst), r.stdout
|
||||
|
||||
|
||||
def test_ceiling_veil_out_ceiling_closed(tmp_path):
|
||||
before, after, out = clean(tmp_path, "--ceiling", "0.5")
|
||||
assert "Ceiling 2.5" in out # found where walls and ceiling meet
|
||||
assert count(after, VEIL) == 0 # the veil is gone
|
||||
assert count(after, CUPBOARD) == count(before, CUPBOARD) # the dark cupboard top by the wall stays
|
||||
assert count(after, CAGE) == count(before, CAGE) # and the cage, far below the ceiling
|
||||
flat = after[np.isclose(after["y"], CEILING, atol=0.03) & (after["opacity"] > 3)]
|
||||
# closed: a solid layer over the whole room, in the ceiling's own colour
|
||||
assert len(flat) > (W / 0.02) * (D / 0.02) * 0.9
|
||||
assert np.allclose(np.median(colour_of(flat), 0), CEILC, atol=0.05)
|
||||
for k in ("x", "y", "z", "f_dc_0", "opacity", "scale_0"):
|
||||
assert np.isfinite(after[k]).all()
|
||||
|
||||
|
||||
def test_floor_holes_filled_in_the_floors_colour(tmp_path):
|
||||
before, after, out = clean(tmp_path, "--floor", "0.5")
|
||||
added = after[len(before):]
|
||||
inside = (added["x"] > 1.6) & (added["x"] < 2.4) & (added["z"] > 2.1) & (added["z"] < 2.9)
|
||||
assert inside.sum() > 0.8 * (0.8 / 0.02) ** 2 # the hole is closed ...
|
||||
assert len(added) < 1.3 * (1 / 0.02) ** 2 # ... and little more than the hole
|
||||
assert np.allclose(np.median(colour_of(added), 0), FLOORC, atol=0.05)
|
||||
assert np.allclose(added["y"], FLOOR, atol=0.01)
|
||||
|
||||
|
||||
def test_haze_goes_but_not_thin_bars(tmp_path):
|
||||
before, after, _ = clean(tmp_path, "--haze", "1")
|
||||
assert count(after, HAZE) == 0
|
||||
assert count(after, CAGE) == count(before, CAGE) # long and thin is no haze
|
||||
assert count(after, VEIL) == 0 # at full strength the veil is haze, too
|
||||
assert count(after, WALL) == count(before, WALL) and count(after, CUPBOARD) == count(before, CUPBOARD)
|
||||
|
||||
|
||||
def test_outside_goes(tmp_path):
|
||||
before, after, _ = clean(tmp_path, "--outside", "1")
|
||||
assert count(after, OUT) == 0 and count(after, WALL) == count(before, WALL)
|
||||
|
||||
|
||||
def test_nothing_switched_on_changes_nothing(tmp_path):
|
||||
before, after, _ = clean(tmp_path)
|
||||
assert len(after) == len(before) and np.array_equal(after["x"], before["x"])
|
||||
|
||||
|
||||
@pytest.mark.parametrize("args", [["--haze", "2"], ["--ceiling", "-0.1"]])
|
||||
def test_strengths_from_0_to_1(tmp_path, args):
|
||||
src = tmp_path / "in.ply"
|
||||
room(src)
|
||||
r = subprocess.run([sys.executable, str(CLEAN), str(src), str(tmp_path / "o.ply"), *args], capture_output=True, text=True)
|
||||
assert r.returncode != 0 and "between 0 and 1" in r.stderr
|
||||
|
||||
|
||||
# ---------------------------------------------------------------- as part of the versions
|
||||
|
||||
def scene(slug="Living"):
|
||||
run = RUNS / slug
|
||||
(run / "spirula").mkdir(parents=True, exist_ok=True)
|
||||
room(run / "spirula" / "scene.ply")
|
||||
(run / "scene.sog").write_bytes(b"sog")
|
||||
(run / "scene.xrSceneTransform.json").write_text(json.dumps({"worldScale": 1.0}))
|
||||
server.write_meta(slug, name="Living room")
|
||||
return run
|
||||
|
||||
|
||||
def test_a_cleaned_version(api):
|
||||
run = scene()
|
||||
total = len(read(run / "spirula" / "scene.ply"))
|
||||
status, r = api.post("/api/versions", {"slug": "Living", "sizes": "all", "clean": "ceiling=0.5,haze=0.3"})
|
||||
assert status == 200, r
|
||||
js = wait_job()
|
||||
assert js["result"] == "ok", js["tail"]
|
||||
v = {x["key"]: x for x in server.versions_of("Living")}
|
||||
assert list(v) == ["all-c50h30"]
|
||||
x = v["all-c50h30"]
|
||||
assert x["clean"] == {"ceiling": 0.5, "haze": 0.3} and x["label"] == "Living room · all splats · ceiling 50 % · haze 30 %"
|
||||
assert x["purpose"] == "pc" and x["ply"] # Spirula Studio can open it
|
||||
info = json.loads((run / "versions" / "all-c50h30" / "version.json").read_text())
|
||||
assert info["splats"] != total # counted after cleaning
|
||||
assert not (run / "versions" / "all-c50h30" / "clean.ply").exists()
|
||||
assert len(read(run / "versions" / "all-c50h30" / "spirula" / "scene.ply")) == info["splats"]
|
||||
assert len(read(run / "spirula" / "scene.ply")) == total # the scene itself is untouched
|
||||
|
||||
|
||||
def test_a_cleaned_and_a_plain_version_side_by_side(api):
|
||||
scene()
|
||||
api.post("/api/versions", {"slug": "Living", "sizes": "all"})
|
||||
wait_job()
|
||||
api.post("/api/versions", {"slug": "Living", "sizes": "all", "clean": "floor=1"})
|
||||
wait_job()
|
||||
assert sorted(x["key"] for x in server.versions_of("Living")) == ["all", "all-f100"]
|
||||
|
||||
|
||||
@pytest.mark.parametrize("clean,code", [("roof=0.5", "err.bad_value"), ("haze=2", "err.range"), ("haze=x", "err.bad_value"),
|
||||
("haze=nan", "err.bad_value"), ({"haze": 1}, "err.bad_request")])
|
||||
def test_odd_clean_ups_are_refused(api, clean, code):
|
||||
scene()
|
||||
status, r = api.post("/api/versions", {"slug": "Living", "sizes": "all", "clean": clean})
|
||||
assert status == 400 and r["error"]["code"] == code
|
||||
|
||||
|
||||
def test_cleaned_and_plain_in_one_go(api):
|
||||
"""For the Frame, with and without cleaning up, to compare: two versions, named by their strengths."""
|
||||
run = scene()
|
||||
status, r = api.post("/api/versions", {"slug": "Living", "sizes": "20000", "clean": "haze=0.4", "also_plain": True})
|
||||
assert status == 200, r
|
||||
assert wait_job()["result"] == "ok"
|
||||
v = {x["key"]: x for x in server.versions_of("Living")}
|
||||
assert set(v) == {"0.02m", "0.02m-h40"}
|
||||
assert v["0.02m-h40"]["label"] == "Living room · 0.02 M · haze 40 %" and v["0.02m"]["label"] == "Living room · 0.02 M"
|
||||
assert all(x["purpose"] == "frame" and not x["ply"] for x in v.values()) # Frame versions keep no ply
|
||||
assert not (run / "versions" / "0.02m-h40" / "spirula").exists()
|
||||
|
||||
|
||||
def test_a_version_opens_in_spirula(api, monkeypatch):
|
||||
run = scene()
|
||||
api.post("/api/versions", {"slug": "Living", "sizes": "all", "clean": "ceiling=0.5"})
|
||||
wait_job()
|
||||
api.post("/api/versions", {"slug": "Living", "sizes": "20000"})
|
||||
wait_job()
|
||||
opened = []
|
||||
monkeypatch.setattr(server.subprocess, "Popen", lambda cmd, **kw: opened.append(cmd))
|
||||
assert api.post("/api/open", {"slug": "Living", "version": "all-c50", "what": "spirula"})[0] == 200
|
||||
assert opened[-1][1] == str(run / "versions" / "all-c50" / "spirula" / "scene.ply")
|
||||
status, r = api.post("/api/open", {"slug": "Living", "version": "0.02m", "what": "spirula"}) # no ply
|
||||
assert status == 400 and r["error"]["code"] == "err.no_version"
|
||||
status, r = api.post("/api/open", {"slug": "Living", "version": "../x", "what": "spirula"})
|
||||
assert status == 400 and len(opened) == 1
|
||||
@@ -28,10 +28,11 @@ def two_rooms(drift_b=DRIFT_B, turn_b=0.0, b_far=False, walk_in_offset=0.3, scal
|
||||
return a, b
|
||||
|
||||
|
||||
def combine(*runs, align="images", partition="view"):
|
||||
def combine(*runs, align="images", partition="view", colour="keep"):
|
||||
"""Colour matching is off by default here: the rooms' and markers' own colours show where a splat came from."""
|
||||
out = BASE / f"out-{align}-{partition}"
|
||||
r = subprocess.run([sys.executable, str(COMBINE), str(out), *[f"{p}={p.name}" for p in runs],
|
||||
"--align", align, "--partition", partition], capture_output=True, text=True)
|
||||
"--align", align, "--partition", partition, "--colour", colour], capture_output=True, text=True)
|
||||
assert r.returncode == 0 or "@@ error" in r.stdout, r.stderr
|
||||
return out, r
|
||||
|
||||
@@ -131,7 +132,8 @@ def test_every_splat_is_written_once():
|
||||
@pytest.mark.parametrize("offset", [0.1, 0.3])
|
||||
def test_borders_run_through_the_door(offset):
|
||||
"""Room B starts its recording in room A (walking in). With borders 'through doors' that stretch
|
||||
claims nothing, so room A comes from room A's own recording; 'nearest camera' cuts into room A."""
|
||||
claims nothing, so room A comes from room A's own recording; 'nearest camera' cuts into room A (less
|
||||
since 0.3: a cube only goes to a recording that really has something there)."""
|
||||
def from_b_in_room_a(partition):
|
||||
out, r = combine(*two_rooms(drift_b=0.0, walk_in_offset=offset), partition=partition)
|
||||
v = read_ply(out / "spirula" / "scene.ply")
|
||||
@@ -142,9 +144,8 @@ def test_borders_run_through_the_door(offset):
|
||||
view, walk_in = from_b_in_room_a("view")
|
||||
assert walk_in > 10 # recognised as walking in
|
||||
assert view < 50 # practically nothing of room B inside room A
|
||||
if offset >= 0.3: # close to the round, room A's cameras win anyway
|
||||
nearest, _ = from_b_in_room_a("nearest")
|
||||
assert nearest > 10 * max(view, 5)
|
||||
nearest, _ = from_b_in_room_a("nearest")
|
||||
assert nearest > 2 * max(view, 5)
|
||||
|
||||
|
||||
@pytest.mark.xfail(strict=True, reason="known limit: walking in is only recognised up to 0.4 m from the other "
|
||||
|
||||
@@ -130,3 +130,18 @@ def test_the_same_folder_in_both_places(api, frame):
|
||||
assert api.post("/api/frame/remove", {"folder": "20_Kitchen", "place": "steam"})[0] == 200
|
||||
assert d.exists() and not (frame / server.FRAME_STEAM / "20_Kitchen").exists()
|
||||
assert api.post("/api/frame/remove", {"folder": "20_Kitchen", "place": "nowhere"})[0] == 400
|
||||
|
||||
|
||||
def test_an_old_frame_listing_is_answered_at_once_and_renewed_behind(frame):
|
||||
"""Asking a Frame that is switched off takes seconds; the scene list must not wait for it every time."""
|
||||
import time as _t
|
||||
first = server.frame_listing()
|
||||
assert first is not None
|
||||
server.frame_cache.update(t=_t.time() - 60, data={"files": [], "thumbs": [], "scenes": ["old"]})
|
||||
start = _t.time()
|
||||
assert server.frame_listing()["scenes"] == ["old"] # the last one, without waiting
|
||||
assert _t.time() - start < 0.5
|
||||
end = _t.time() + 10
|
||||
while server.frame_cache.get("renewing") and _t.time() < end:
|
||||
_t.sleep(0.05)
|
||||
assert server.frame_listing()["scenes"] != ["old"] # renewed in the background
|
||||
@@ -1,5 +1,6 @@
|
||||
"""Groups of scenes: one group per scene, suggestions, renaming, cleaning up together."""
|
||||
import json
|
||||
import pytest
|
||||
|
||||
from conftest import RUNS, server
|
||||
import synth
|
||||
@@ -78,3 +79,18 @@ def test_dissolving_a_group_keeps_its_scenes(api):
|
||||
assert api.post("/api/delete", {"slug": "Home"})[0] == 200
|
||||
assert api.get("/api/groups")[1]["groups"] == []
|
||||
assert {"Kitchen", "Hallway", "Statue"} <= {s["slug"] for s in server.scenes()}
|
||||
|
||||
|
||||
@pytest.mark.parametrize("name,slug", [("Rundgang 12.10.", "Rundgang-12.10"), ("Küche", "Kueche"),
|
||||
("...", ""), (".hidden", "hidden"), ("Flur 2", "Flur-2")])
|
||||
def test_folder_names_suit_every_file_system(name, slug):
|
||||
"""No dot at the end: NTFS (e.g. runs on a Windows disk) refuses it, and the copy loses the tour."""
|
||||
from splat_workshop import config
|
||||
assert config.slugify(name) == slug
|
||||
|
||||
|
||||
def test_a_tour_named_with_a_date_gets_a_folder_ntfs_accepts(api):
|
||||
synth.make_room(RUNS, "Kitchen", "A", name="Kitchen")
|
||||
synth.make_room(RUNS, "Hall", "B", name="Hall")
|
||||
status, r = api.post("/api/group", {"name": "Tour 12.10.", "members": "Kitchen,Hall"})
|
||||
assert status == 200 and r["slug"] == "Tour-12.10"
|
||||
@@ -0,0 +1,82 @@
|
||||
"""Your own splats (0.6, scripts/import.sh): a splat file from another program becomes a scene like the
|
||||
others, and goes to the Frame."""
|
||||
import json
|
||||
import time
|
||||
|
||||
import pytest
|
||||
|
||||
from conftest import RUNS, server, tools_called, wait_job
|
||||
import test_clean
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def splat(tmp_path):
|
||||
f = tmp_path / "garden_dslr.ply"
|
||||
test_clean.room(f)
|
||||
return f
|
||||
|
||||
|
||||
def transforms():
|
||||
return [c for c in tools_called() if c[0] == "splat-transform"]
|
||||
|
||||
|
||||
def test_a_splat_becomes_a_scene(api, splat):
|
||||
status, r = api.post("/api/import", {"path": str(splat), "name": "Garden"})
|
||||
assert status == 200, r
|
||||
js = wait_job()
|
||||
assert js["result"] == "ok" and js["kind"] == "import", js["tail"]
|
||||
run = RUNS / "Garden"
|
||||
for f in ("spirula/scene.ply", "scene.sog", "scene.xrSceneTransform.json", "garden.gallery.png", "garden.sceneinfo.png"):
|
||||
assert (run / f).exists(), f
|
||||
assert json.loads((run / "scene.xrSceneTransform.json").read_text())["worldScale"] == 1.0
|
||||
s = {x["slug"]: x for x in server.scenes()}["Garden"]
|
||||
assert s["name"] == "Garden" and s["ply"] and s["gaussians"] == len(test_clean.read(run / "spirula" / "scene.ply"))
|
||||
assert server.read_meta("Garden")["imported"] == "garden_dslr.ply"
|
||||
assert splat.exists() and not (RUNS / "Garden.tmp").exists() # the file itself stays
|
||||
first = transforms()[0]
|
||||
assert first[first.index("-w") + 1] == str(splat) and "-r" not in first and "-s" not in first
|
||||
|
||||
|
||||
@pytest.mark.parametrize("up,turn", [("y-up", "180,0,0"), ("z-up", "-90,0,0")])
|
||||
def test_up_and_size_are_set_right(api, splat, up, turn):
|
||||
assert api.post("/api/import", {"path": str(splat), "name": "Garden", "up": up, "scale": "0.01"})[0] == 200
|
||||
assert wait_job()["result"] == "ok"
|
||||
first = transforms()[0]
|
||||
assert first[first.index("-r") + 1] == turn and first[first.index("-s") + 1] == "0.01"
|
||||
|
||||
|
||||
def test_an_imported_scene_goes_to_the_frame(api, splat, frame):
|
||||
api.post("/api/import", {"path": str(splat), "name": "Garden"})
|
||||
wait_job()
|
||||
assert api.post("/api/upload", {"slug": "Garden"})[0] == 200
|
||||
end = time.time() + 60
|
||||
while (u := server.upload_status("Garden")) and u["running"] and time.time() < end:
|
||||
time.sleep(0.2)
|
||||
assert server.upload_status("Garden")["ok"], server.upload_status("Garden")
|
||||
folder = next((frame / server.FRAME_SCENES).iterdir())
|
||||
assert sorted(p.name for p in folder.iterdir()) == [
|
||||
"garden.gallery.png", "garden.sceneinfo.png", "garden.sog", "garden.xrSceneTransform.json"]
|
||||
|
||||
|
||||
def test_a_failed_import_frees_the_name(api, tmp_path):
|
||||
bad = tmp_path / "broken.ply"
|
||||
bad.write_bytes(b"not a splat")
|
||||
assert api.post("/api/import", {"path": str(bad), "name": "Broken"})[0] == 200
|
||||
assert wait_job()["result"] == "failed"
|
||||
server.watch_once(True)
|
||||
assert not (RUNS / "Broken").exists() and not server.meta_file("Broken").exists()
|
||||
|
||||
|
||||
@pytest.mark.parametrize("body,code", [
|
||||
({"path": "relative.ply"}, "err.import_file"), ({"path": "/nope/x.ply"}, "err.import_file"),
|
||||
({"suffix": ".txt"}, "err.import_file"), ({"up": "x-up"}, "err.bad_value"), ({"scale": "0"}, "err.range"),
|
||||
({"scale": "abc"}, "err.bad_value"), ({"name": "Taken"}, "err.scene_name_taken")])
|
||||
def test_odd_imports_are_refused(api, splat, body, code):
|
||||
(RUNS / "Taken").mkdir(parents=True)
|
||||
path = splat
|
||||
if "suffix" in body:
|
||||
path = splat.with_suffix(body.pop("suffix"))
|
||||
path.write_bytes(b"x")
|
||||
status, r = api.post("/api/import", {"path": str(path), "name": "Garden", **body})
|
||||
assert status == 400 and r["error"]["code"] == code
|
||||
assert server.load_state().get("job") is None
|
||||
@@ -0,0 +1,147 @@
|
||||
"""A mesh of a scene (0.5, scripts/mesh.sh + scripts/upright.py): made by Spirula Studio (faked here, see
|
||||
tests/fake_mesh.py), stood upright with the floor at height 0 – Z up for OBJ/PLY/STL, Y up for GLB, as 3D
|
||||
programs expect – instead of lying on its side as the scene does (Y down, like the Frame's tracking)."""
|
||||
import json
|
||||
import shutil
|
||||
import subprocess
|
||||
import sys
|
||||
|
||||
import numpy as np
|
||||
import pytest
|
||||
|
||||
from conftest import ROOT, RUNS, TRASH, server, tools_called, wait_job
|
||||
import fake_mesh
|
||||
import test_clean
|
||||
|
||||
UPRIGHT = ROOT / "scripts" / "upright.py"
|
||||
|
||||
|
||||
@pytest.mark.parametrize("fmt,colour", [("obj", "none"), ("ply", "vertex"), ("ply", "none"), ("stl", "none"), ("glb", "vertex")])
|
||||
def test_upright_puts_the_floor_at_the_bottom(tmp_path, fmt, colour):
|
||||
f = tmp_path / f"room.{fmt}"
|
||||
fake_mesh.write(f, fmt, colour)
|
||||
r = subprocess.run([sys.executable, str(UPRIGHT), "--floor", str(fake_mesh.FLOOR_Y), str(f)], capture_output=True, text=True)
|
||||
assert r.returncode == 0, r.stderr
|
||||
p = fake_mesh.read_points(f)
|
||||
up = 1 if fmt in ("glb", "obj") else 2 # glTF and OBJ: Y up; PLY and STL: Z up (as Blender imports them)
|
||||
k = 6 if fmt == "stl" else 4 # STL lists the corners of each triangle: 2 floor triangles
|
||||
floor, ceiling = p[:k, up], p[k:, up]
|
||||
assert np.allclose(floor, 0, atol=1e-5) # the floor at height 0 ...
|
||||
assert np.allclose(ceiling, fake_mesh.FLOOR_Y - fake_mesh.CEILING_Y, atol=1e-5) # ... the ceiling 2.5 m above
|
||||
if fmt in ("obj", "ply"): # a proper turn, not a mirror: x stays
|
||||
assert np.allclose(p[:, 0], fake_mesh.V[:, 0])
|
||||
if fmt == "ply": # normals turn along: the floor faces up
|
||||
raw = f.read_bytes()
|
||||
end = raw.index(b"end_header\n") + len(b"end_header\n")
|
||||
dt = np.dtype([("p", "<f4", 3), ("n", "<f4", 3)] + ([("c", "u1", 3)] if colour == "vertex" else []))
|
||||
n = np.frombuffer(raw, dt, count=8, offset=end)["n"]
|
||||
assert np.allclose(n[:4], [0, 0, 1]) and np.allclose(n[4:], [0, 0, -1])
|
||||
assert raw.endswith(b"".join(np.array([3], np.uint8).tobytes() + fake_mesh.F[i].astype("<i4").tobytes()
|
||||
for i in range(len(fake_mesh.F)))) # faces untouched
|
||||
|
||||
|
||||
def scene(slug="Living", images=False):
|
||||
run = RUNS / slug
|
||||
test_clean.room(run / "spirula" / "scene.ply")
|
||||
(run / "scene.sog").write_bytes(b"sog")
|
||||
if images:
|
||||
(run / "dataset" / "images").mkdir(parents=True)
|
||||
(run / "dataset" / "sparse").mkdir()
|
||||
server.write_meta(slug, name="Living room")
|
||||
return run
|
||||
|
||||
|
||||
def mesh_calls():
|
||||
return [c for c in tools_called() if c[:2] == ["spirula", "mesh"]]
|
||||
|
||||
|
||||
def test_a_mesh_for_blender_and_3d_printing(api):
|
||||
run = scene()
|
||||
m = server.mesh_of("Living")
|
||||
assert {k: m[k] for k in ("texture_possible", "files", "made")} == {"texture_possible": False, "files": [], "made": None}
|
||||
status, r = api.post("/api/mesh", {"slug": "Living", "formats": "glb,stl", "texture": True})
|
||||
assert status == 200, r
|
||||
js = wait_job()
|
||||
assert js["result"] == "ok" and js["kind"] == "mesh", js["tail"]
|
||||
m = server.mesh_of("Living")
|
||||
assert [f["name"] for f in m["files"]] == ["living.glb", "living.stl"] # one file per format, nothing else
|
||||
assert m["made"]["formats"] == ["glb", "stl"] and m["made"]["texture"] is False and not m["made"]["stale"]
|
||||
call = mesh_calls()[0]
|
||||
assert "--no-data" in call # no training images: no texture
|
||||
assert call[call.index("--color") + 1] == "none,vertex" # GLB with colours, STL without
|
||||
assert call[2].endswith("inside.ply") # meshed from inside the room only
|
||||
assert np.allclose(fake_mesh.read_points(run / "mesh" / "living.stl")[:, 2].min(), 0, atol=0.05)
|
||||
assert np.allclose(fake_mesh.read_points(run / "mesh" / "living.glb")[:, 1].min(), 0, atol=0.05)
|
||||
assert not (run / "mesh.tmp").exists()
|
||||
assert [(s["slug"], s["mesh"]) for s in server.scenes()] == [("Living", True)]
|
||||
|
||||
|
||||
def test_a_texture_when_the_training_images_are_there(api):
|
||||
run = scene(images=True)
|
||||
assert server.mesh_of("Living")["texture_possible"]
|
||||
api.post("/api/mesh", {"slug": "Living", "formats": "obj,ply", "texture": True})
|
||||
assert wait_job()["result"] == "ok"
|
||||
call = mesh_calls()[0]
|
||||
assert call[call.index("--data") + 1] == str(run / "dataset")
|
||||
assert call[call.index("--color") + 1] == "texture,vertex"
|
||||
names = [f["name"] for f in server.mesh_of("Living")["files"]]
|
||||
assert names == ["living.ply", "living_texture.obj", "living_texture.png"] # a texture keeps its names
|
||||
|
||||
|
||||
def test_a_new_mesh_replaces_the_old_and_can_be_deleted(api):
|
||||
run = scene()
|
||||
api.post("/api/mesh", {"slug": "Living", "formats": "glb,stl"})
|
||||
wait_job()
|
||||
api.post("/api/mesh", {"slug": "Living", "formats": "obj"})
|
||||
wait_job()
|
||||
assert [f["name"] for f in server.mesh_of("Living")["files"]] == ["living.obj"]
|
||||
assert api.post("/api/mesh/delete", {"slug": "Living"})[0] == 200
|
||||
assert not (run / "mesh").exists() and (TRASH / "mesh").exists()
|
||||
assert api.post("/api/mesh/delete", {"slug": "Living"})[1]["error"]["code"] == "err.no_mesh"
|
||||
|
||||
|
||||
@pytest.mark.parametrize("body,code", [({"formats": "fbx"}, "err.bad_value"), ({"formats": ""}, "err.bad_value"),
|
||||
({"slug": "Nope", "formats": "glb"}, "err.no_scene"),
|
||||
({"slug": "../x", "formats": "glb"}, "err.no_scene")])
|
||||
def test_odd_meshes_are_refused(api, body, code):
|
||||
scene()
|
||||
status, r = api.post("/api/mesh", {"slug": "Living", **body})
|
||||
assert status == 400 and r["error"]["code"] == code
|
||||
assert not mesh_calls()
|
||||
|
||||
|
||||
def test_mesh_sh_refuses_unknown_formats():
|
||||
run = scene()
|
||||
r = subprocess.run([str(ROOT / "scripts" / "mesh.sh"), str(run), "glb,fbx"], capture_output=True, text=True)
|
||||
assert r.returncode == 1 and "Unknown mesh format: fbx" in r.stderr and not mesh_calls()
|
||||
|
||||
|
||||
def test_mesh_files_can_be_downloaded(api):
|
||||
run = scene()
|
||||
api.post("/api/mesh", {"slug": "Living", "formats": "glb,stl"})
|
||||
wait_job()
|
||||
import urllib.parse
|
||||
status, body, headers = api.raw("/api/mesh/file?slug=Living&name=living.glb")
|
||||
assert status == 200 and body == (run / "mesh" / "living.glb").read_bytes()
|
||||
assert headers["Content-Type"] == "model/gltf-binary" and "attachment" in headers["Content-Disposition"]
|
||||
for bad in ("../scene.sog", "mesh.json", ".hidden", "living.sog", "", "/etc/passwd"):
|
||||
assert api.raw("/api/mesh/file?slug=Living&name=" + urllib.parse.quote(bad))[0] == 404, bad
|
||||
assert api.raw("/api/mesh/file?slug=..&name=living.glb")[0] == 404
|
||||
|
||||
|
||||
def test_open_in_blender_imports_the_mesh(api, monkeypatch):
|
||||
run = scene()
|
||||
api.post("/api/mesh", {"slug": "Living", "formats": "stl,glb"})
|
||||
wait_job()
|
||||
started = []
|
||||
monkeypatch.setattr(server, "blender_cmd", lambda: ["flatpak", "run", "org.blender.Blender"])
|
||||
monkeypatch.setattr(server.subprocess, "Popen", lambda cmd, **kw: started.append(cmd))
|
||||
assert api.post("/api/open", {"slug": "Living", "what": "blender"})[0] == 200
|
||||
cmd = started[-1]
|
||||
assert cmd[:3] == ["flatpak", "run", "org.blender.Blender"] and cmd[3] == "--python-expr"
|
||||
assert "import_scene.gltf" in cmd[4] and repr(str(run / "mesh" / "living.glb")) in cmd[4] # GLB first
|
||||
assert "bpy.app.timers.register" in cmd[4] # not right at start-up: Blender's window isn't ready then
|
||||
compile(cmd[4], "blender", "exec") # valid Python
|
||||
monkeypatch.setattr(server, "blender_cmd", lambda: None)
|
||||
status, r = api.post("/api/open", {"slug": "Living", "what": "blender"})
|
||||
assert status == 400 and r["error"]["code"] == "err.no_blender"
|
||||
@@ -0,0 +1,21 @@
|
||||
"""The page itself (web/index.html): what its script touches the moment it loads must already be there.
|
||||
In 0.5.1 the footer stood below the script; setting up its link failed, and the rest of the script –
|
||||
among it the regular status updates – never ran: a finished job stayed "running" until a reload."""
|
||||
import re
|
||||
|
||||
from conftest import ROOT
|
||||
|
||||
HTML = (ROOT / "web" / "index.html").read_text()
|
||||
|
||||
|
||||
def test_everything_the_script_sets_up_on_load_is_above_it():
|
||||
script = HTML.index("<script>")
|
||||
above = set(re.findall(r'id="([\w-]+)"', HTML[:script]))
|
||||
code = HTML[script:]
|
||||
on_load = set(re.findall(r'^\$\("#([\w-]+)"\)\.', code, re.M)) # statements at the top level
|
||||
missing = sorted(on_load - above)
|
||||
assert not missing, f"used when the page loads, but not (yet) in the page: {missing}"
|
||||
|
||||
|
||||
def test_the_status_is_polled():
|
||||
assert re.search(r"^setInterval\(poll, \d+\);", HTML, re.M)
|
||||
@@ -0,0 +1,161 @@
|
||||
"""A long recording in parts (0.3): each part gets up to 500 image pairs, the parts become one room.
|
||||
|
||||
The pipeline matches its images to the poses by the time stamps inside the recording, so a part has to be
|
||||
cut with the original time (ffmpeg -copyts) – checked here on the command splat.sh runs. The fake pipeline
|
||||
(FAKE_PIPELINE=room) gives every part a synthetic round through one half of room A, so putting the parts
|
||||
together really runs."""
|
||||
import json
|
||||
import os
|
||||
import subprocess
|
||||
|
||||
import pytest
|
||||
|
||||
from conftest import REC, ROOT, RUNS, TRASH, recording, server, tools_called, wait_for_tool, wait_job
|
||||
|
||||
NAME = "2026-10-14_16-57-54_stereo.mp4" # the fake ffprobe makes it 60 s long
|
||||
|
||||
|
||||
def cuts():
|
||||
return [c for c in tools_called() if c[0] == "ffmpeg"]
|
||||
|
||||
|
||||
def run_chain(timeout=120):
|
||||
"""Let the chain run on as the server's watcher does: a tick after every job – and one more, which
|
||||
must not do anything again."""
|
||||
was = True
|
||||
for _ in range(10):
|
||||
js = wait_job(timeout)
|
||||
running = server.watch_once(was)
|
||||
server.watch_once(running)
|
||||
nxt = server.job_status(tail=False)
|
||||
if not running and nxt["out"] == js["out"]:
|
||||
return js
|
||||
assert running and nxt["running"], "the watcher reports the next job as running"
|
||||
was = running
|
||||
raise AssertionError("the chain did not end")
|
||||
|
||||
|
||||
def notes():
|
||||
for p in server.notes: # notifications are sent in the background
|
||||
p.wait(10)
|
||||
return [c for c in tools_called() if c[0] == "notify-send"]
|
||||
|
||||
|
||||
def test_parts_are_equally_long_and_overlap_a_little():
|
||||
assert server.part_ranges(240, 3) == [(0.0, 82.0), (78.0, 162.0), (158.0, 240)]
|
||||
ranges = server.part_ranges(100, 2)
|
||||
assert ranges[0][0] == 0 and ranges[-1][1] == 100 and ranges[0][1] - ranges[1][0] == server.PART_OVERLAP
|
||||
|
||||
|
||||
def test_a_recording_in_parts_becomes_one_room(api):
|
||||
os.environ["FAKE_PIPELINE"] = "room"
|
||||
rec = recording(NAME)
|
||||
status, r = api.post("/api/parts", {"path": str(rec), "name": "Living room", "quality": "high", "parts": 2,
|
||||
"upload": False})
|
||||
assert status == 200, r
|
||||
job = server.job_status(tail=False)
|
||||
assert (job["chain"]["i"], job["chain"]["n"], job["part"]) == (0, 2, "0.00-32.00")
|
||||
js = run_chain()
|
||||
assert js["kind"] == "combine" and js["result"] == "ok", js.get("tail")
|
||||
# cut losslessly, with the original time, from the original – which stays
|
||||
assert [c[1:] for c in cuts()] == [
|
||||
["-v", "error", "-y", "-copyts", "-ss", "0.00", "-i", str(rec), "-to", "32.00", "-map", "0", "-c", "copy",
|
||||
"-copy_unknown", str(RUNS / ".parts" / "Living-room-part-1-of-2.mp4.tmp.mp4")],
|
||||
["-v", "error", "-y", "-copyts", "-ss", "28.00", "-i", str(rec), "-to", "60.00", "-map", "0", "-c", "copy",
|
||||
"-copy_unknown", str(RUNS / ".parts" / "Living-room-part-2-of-2.mp4.tmp.mp4")]]
|
||||
assert rec.read_bytes() == b"not really a video" and not (RUNS / ".parts").exists()
|
||||
# the parts: the original is their recording, each knows its stretch
|
||||
parts = {s: server.read_meta(s) for s in ("Living-room-part-1-of-2", "Living-room-part-2-of-2")}
|
||||
assert {s: (m["recording"], m["part"]) for s, m in parts.items()} == {
|
||||
"Living-room-part-1-of-2": (NAME, "0.00-32.00"), "Living-room-part-2-of-2": (NAME, "28.00-60.00")}
|
||||
room = {g["slug"]: g for g in server.groups()["groups"]}["Living-room"]
|
||||
assert room["room"] and room["members"] == list(parts) and room["result"] and not room["result"]["stale"]
|
||||
info = json.loads((RUNS / "Living-room" / "combine.json").read_text())
|
||||
assert {x["room"] for x in info["rooms"].values()} == {"Living room"}
|
||||
assert [n[-1] for n in notes() if "part" in n[-1]] == [
|
||||
"“Living room”: 2 parts are one room now – it is being put together"]
|
||||
|
||||
|
||||
def test_a_failed_part_stops_the_chain():
|
||||
os.environ["FAKE_PIPELINE"] = "fail"
|
||||
rec = recording(NAME)
|
||||
assert server.start_parts({"path": str(rec), "name": "Living room", "quality": "high", "parts": 3}) is None
|
||||
js = run_chain()
|
||||
assert js["result"] == "failed" and js["chain"]["i"] == 0
|
||||
assert len(cuts()) == 1 and "Living-room" not in {g["slug"] for g in server.groups()["groups"]}
|
||||
assert any("part 1 of 3 failed" in n[-1] for n in wait_for_tool("notify-send"))
|
||||
|
||||
|
||||
def test_a_cancelled_part_stops_the_chain_quietly():
|
||||
os.environ["FAKE_PIPELINE"] = "slow"
|
||||
rec = recording(NAME)
|
||||
assert server.start_parts({"path": str(rec), "name": "Living room", "quality": "high", "parts": 2}) is None
|
||||
import time
|
||||
time.sleep(1)
|
||||
server.cancel_job()
|
||||
js = run_chain(timeout=30)
|
||||
assert js["result"] == "cancelled" and len(cuts()) == 1
|
||||
assert not [n for n in notes() if "part" in n[-1]]
|
||||
|
||||
|
||||
@pytest.mark.parametrize("body,code", [
|
||||
({"parts": 1}, "err.range"), ({"parts": 11}, "err.range"), ({"parts": "x"}, "err.bad_value"),
|
||||
({"parts": 4}, "err.parts_too_short"), # 15 s each
|
||||
({"parts": 2, "path": "/etc/passwd"}, "err.unknown_recording"),
|
||||
({"parts": 2, "name": "Taken"}, "err.scene_name_taken"),
|
||||
])
|
||||
def test_parts_that_cannot_work_are_refused(api, body, code):
|
||||
rec = recording(NAME)
|
||||
(RUNS / "Taken").mkdir()
|
||||
full = {"path": str(rec), "name": "Living room", "quality": "high", **body}
|
||||
status, r = api.post("/api/parts", full)
|
||||
assert status == 400 and r["error"]["code"] == code
|
||||
assert server.load_state().get("job") is None
|
||||
|
||||
|
||||
def test_resuming_a_part_cuts_the_same_stretch():
|
||||
os.environ["FAKE_PIPELINE"] = "fail"
|
||||
rec = recording(NAME)
|
||||
server.start_parts({"path": str(rec), "name": "Living room", "quality": "high", "parts": 2})
|
||||
run_chain()
|
||||
os.environ["FAKE_PIPELINE"] = "ok"
|
||||
assert server.resume_run("Living-room-part-1-of-2", fresh=True) is None
|
||||
js = wait_job()
|
||||
assert js["part"] == "0.00-32.00" and js["result"] == "ok", js.get("tail")
|
||||
|
||||
|
||||
def test_the_original_of_parts_is_only_deleted_when_asked_twice(api):
|
||||
os.environ["FAKE_PIPELINE"] = "room"
|
||||
rec = recording(NAME)
|
||||
api.post("/api/parts", {"path": str(rec), "name": "Living room", "quality": "high", "parts": 2, "upload": False})
|
||||
run_chain()
|
||||
status, r = api.post("/api/recording/delete", {"name": NAME, "where": "pc"})
|
||||
assert status == 400 and r["error"]["code"] == "err.recording_has_parts" and r["error"]["params"]["n"] == 2
|
||||
assert rec.exists()
|
||||
assert api.post("/api/recording/delete", {"name": NAME, "where": "pc", "force": True})[0] == 200
|
||||
assert not rec.exists() and (TRASH / NAME).exists()
|
||||
assert (RUNS / "Living-room-part-1-of-2" / "scene.sog").exists() # the scenes stay
|
||||
|
||||
|
||||
def test_splat_sh_refuses_odd_stretches():
|
||||
rec = recording(NAME)
|
||||
for part in ("abc", "30-10", "5", "-3-4", "1-2;rm"):
|
||||
r = subprocess.run([str(ROOT / "scripts" / "splat.sh"), str(rec), "Odd"], capture_output=True, text=True,
|
||||
env={**os.environ, "PART": part, "NO_UPLOAD": "1"})
|
||||
assert r.returncode == 1 and "PART must be" in r.stderr, part
|
||||
assert not cuts() and not (RUNS / "Odd").exists()
|
||||
assert list(REC.iterdir()) == [rec]
|
||||
|
||||
|
||||
def test_deleting_a_part_that_did_not_finish_removes_its_cut():
|
||||
"""A failed or cancelled part keeps its piece of video (for resuming); deleting the run deletes it too
|
||||
– it is as big as that stretch of the recording, hidden and in no list."""
|
||||
os.environ["FAKE_PIPELINE"] = "fail"
|
||||
rec = recording(NAME)
|
||||
server.start_parts({"path": str(rec), "name": "Living room", "quality": "high", "parts": 2})
|
||||
run_chain()
|
||||
cut = RUNS / ".parts" / "Living-room-part-1-of-2.mp4"
|
||||
assert cut.exists()
|
||||
assert server.delete_scene("Living-room-part-1-of-2") is None
|
||||
assert not cut.exists() and not (RUNS / ".parts").exists() and not (TRASH / cut.name).exists()
|
||||
assert rec.exists()
|
||||
@@ -0,0 +1,324 @@
|
||||
"""Rooms made of several recordings (0.3): putting them together with the rooms of a home.
|
||||
|
||||
Several recordings of one room share it: every part comes from the recording that saw it best, and the
|
||||
recordings of one room are never mistaken for walking in from somewhere else. The expectations come from
|
||||
how the synthetic recordings were built (tests/synth.py): each has its own colour, so where a splat came
|
||||
from can be seen in the result – with colour matching off (COLOUR=keep), which would otherwise bring them
|
||||
closer together."""
|
||||
import json
|
||||
import subprocess
|
||||
import sys
|
||||
|
||||
import numpy as np
|
||||
|
||||
from conftest import BASE, ROOT, RUNS
|
||||
import synth
|
||||
|
||||
COMBINE = ROOT / "scripts" / "combine.py"
|
||||
RED, GREEN, HALL = (1.0, 0.0, 0.0), (0.0, 1.0, 0.0), (0.3, 0.3, 0.8)
|
||||
|
||||
|
||||
def combine(runs, rooms=None, name="out", colour="keep"):
|
||||
out = BASE / name
|
||||
cmd = [sys.executable, str(COMBINE), str(out), *[f"{p}={p.name}" for p in runs]]
|
||||
if rooms is not None:
|
||||
cmd += ["--rooms", json.dumps(rooms)]
|
||||
cmd += ["--colour", colour]
|
||||
r = subprocess.run(cmd, capture_output=True, text=True)
|
||||
return out, r
|
||||
|
||||
|
||||
def splats(out):
|
||||
with open(out / "spirula" / "scene.ply", "rb") as f:
|
||||
header = b""
|
||||
while not header.endswith(b"end_header\n"):
|
||||
header += f.readline()
|
||||
props = [l.split()[-1].decode() for l in header.splitlines() if l.startswith(b"property")]
|
||||
n = int(next(l for l in header.splitlines() if l.startswith(b"element vertex")).split()[-1])
|
||||
v = np.fromfile(f, dtype=np.dtype([(p, "<f4") for p in props]), count=n)
|
||||
colour = 0.5 + 0.28209479177387814 * np.stack([v["f_dc_0"], v["f_dc_1"], v["f_dc_2"]], 1)
|
||||
return v, colour
|
||||
|
||||
|
||||
def coloured(colour, rgb):
|
||||
return np.all(np.abs(colour - np.array(rgb)) < 0.02, axis=1)
|
||||
|
||||
|
||||
def test_a_room_from_two_recordings_takes_each_part_from_the_one_that_saw_it():
|
||||
left = synth.make_room(RUNS, "Left", "A", loop=(1.1, 1.5, 0.6, 0.8), colour=RED)
|
||||
right = synth.make_room(RUNS, "Right", "A", loop=(2.9, 1.5, 0.6, 0.8), colour=GREEN)
|
||||
out, r = combine([left, right], rooms=["Kitchen", "Kitchen"])
|
||||
assert r.returncode == 0, r.stderr
|
||||
v, colour = splats(out)
|
||||
red, green = coloured(colour, RED), coloured(colour, GREEN)
|
||||
left_wall, right_wall = v["x"] < 0.3, (v["x"] > 3.7) & (v["x"] < 4.3)
|
||||
assert red[left_wall].mean() > 0.9 and green[right_wall].mean() > 0.9
|
||||
# each place once: both recordings saw the whole room, the result holds it once
|
||||
made = json.loads((left / "synth.json").read_text())
|
||||
assert len(v) <= made["own"] + made["seen_through_door"]
|
||||
info = json.loads((out / "combine.json").read_text())
|
||||
assert {l: x["room"] for l, x in info["rooms"].items()} == {"Left": "Kitchen", "Right": "Kitchen"}
|
||||
assert all(x["walk_in_out_cameras"] == 0 for x in info["rooms"].values())
|
||||
assert info["seams"]["Left|Right"]["cm"] < 1.0 # the two recordings match
|
||||
|
||||
|
||||
|
||||
def thin_out(run, keep, gain=1.0):
|
||||
"""Change a synthetic recording's splats: keep only some (keep(v) -> mask), colours times `gain`."""
|
||||
path = run / "spirula" / "scene.ply"
|
||||
raw = path.read_bytes()
|
||||
end = raw.index(b"end_header\n") + len(b"end_header\n")
|
||||
props = [l.split()[-1].decode() for l in raw[:end].splitlines() if l.startswith(b"property")]
|
||||
v = np.frombuffer(raw[end:], dtype=np.dtype([(p, "<f4") for p in props])).copy()
|
||||
v = v[keep(v)]
|
||||
for k in range(3):
|
||||
v[f"f_dc_{k}"] = (gain * (0.5 + 0.28209479177387814 * v[f"f_dc_{k}"]) - 0.5) / 0.28209479177387814
|
||||
header = raw[:end].replace(b"element vertex %d" % int(raw[:end].split(b"element vertex ")[1].split()[0]),
|
||||
b"element vertex %d" % len(v))
|
||||
path.write_bytes(header + v.tobytes())
|
||||
|
||||
|
||||
def test_a_place_goes_to_a_recording_that_really_has_something_there():
|
||||
"""The right recording looked at the right wall, but its training left nothing there (behind the sofa,
|
||||
too dark, ...): the wall comes from the left recording instead of being a dark hole."""
|
||||
left = synth.make_room(RUNS, "Left", "A", loop=(1.1, 1.5, 0.6, 0.8), colour=RED)
|
||||
right = synth.make_room(RUNS, "Right", "A", loop=(2.9, 1.5, 0.6, 0.8), colour=GREEN)
|
||||
thin_out(right, lambda v: v["x"] < 3.0)
|
||||
out, r = combine([left, right], rooms=["Kitchen", "Kitchen"])
|
||||
assert r.returncode == 0, r.stderr
|
||||
v, colour = splats(out)
|
||||
right_wall = (v["x"] > 3.7) & (v["x"] < 4.3)
|
||||
assert right_wall.sum() > 1000 and coloured(colour, RED)[right_wall].mean() > 0.9
|
||||
assert coloured(colour, GREEN)[v["x"] < 0.3].mean() < 0.1 # the left wall still from the left
|
||||
|
||||
|
||||
def test_recordings_of_one_room_are_brought_to_one_brightness():
|
||||
grey = (0.6, 0.6, 0.6)
|
||||
left = synth.make_room(RUNS, "Left", "A", loop=(1.1, 1.5, 0.6, 0.8), colour=grey)
|
||||
right = synth.make_room(RUNS, "Right", "A", loop=(2.9, 1.5, 0.6, 0.8), colour=grey)
|
||||
for run in (left, right): # some view-dependent colour, too
|
||||
thin_out(run, lambda v: v["x"] > -1)
|
||||
raw = (run / "spirula" / "scene.ply").read_bytes()
|
||||
end = raw.index(b"end_header\n") + len(b"end_header\n")
|
||||
props = [l.split()[-1].decode() for l in raw[:end].splitlines() if l.startswith(b"property")]
|
||||
v = np.frombuffer(raw[end:], dtype=np.dtype([(p, "<f4") for p in props])).copy()
|
||||
v["f_rest_0"] = 0.1 # red, first band
|
||||
(run / "spirula" / "scene.ply").write_bytes(raw[:end] + v.tobytes())
|
||||
thin_out(right, lambda v: v["x"] > -1, gain=0.7) # its training came out darker
|
||||
out, r = combine([left, right], rooms=["Kitchen", "Kitchen"], colour="match")
|
||||
assert r.returncode == 0, r.stderr
|
||||
v, colour = splats(out)
|
||||
lw, rw = colour[v["x"] < 0.3, 0], colour[(v["x"] > 3.7) & (v["x"] < 4.3), 0]
|
||||
assert abs(np.median(lw) - np.median(rw)) < 0.01
|
||||
assert abs(np.median(lw) - np.sqrt(0.6 * 0.42)) < 0.01 # in between: the room keeps its brightness
|
||||
info = json.loads((out / "combine.json").read_text())
|
||||
assert info["colour"] == "match" and info["rooms"]["Right"]["colour"][0] > 1.1
|
||||
# the view-dependent part is scaled alike: seen from the side the two halves match, too
|
||||
rest = lambda m: float(np.median(v["f_rest_0"][m]))
|
||||
gl, gr = info["rooms"]["Left"]["colour"][0], info["rooms"]["Right"]["colour"][0]
|
||||
assert abs(rest(v["x"] < 0.3) - 0.1 * gl) < 0.002 and abs(rest((v["x"] > 3.7) & (v["x"] < 4.3)) - 0.1 * gr) < 0.002
|
||||
out, r = combine([left, right], rooms=["Kitchen", "Kitchen"], name="kept", colour="keep")
|
||||
v, colour = splats(out)
|
||||
assert abs(np.median(colour[v["x"] < 0.3, 0]) - 0.6) < 0.01
|
||||
|
||||
|
||||
def test_colour_matching_leaves_alone_what_it_cannot_compare():
|
||||
sys.path.insert(0, str(ROOT / "scripts"))
|
||||
import combine as C
|
||||
cover = np.zeros((10, 2)); cover[:, 0] = 5
|
||||
colour = np.full((10, 2, 3), 0.5)
|
||||
assert np.all(C.colour_gains(cover, colour) == 1) # nothing in common: unchanged
|
||||
cover[:] = 5; colour[:, 1] = 0.05 # wildly different: limited
|
||||
g = C.colour_gains(cover, colour, min_cubes=5)
|
||||
assert g.max() <= C.GAIN[1] and g.min() >= C.GAIN[0]
|
||||
|
||||
def test_recordings_of_one_room_do_not_hide_a_walk_in():
|
||||
"""Two rounds through the kitchen and the hallway's recording, which starts in the kitchen. Without
|
||||
rooms the two kitchen rounds look like walking in to each other, and the hallway's real walk-in is not
|
||||
recognised any more – it then claims part of the kitchen."""
|
||||
k1 = synth.make_room(RUNS, "K1", "A", colour=RED)
|
||||
k2 = synth.make_room(RUNS, "K2", "A", loop=(2.0, 1.5, 1.2, 0.8), colour=GREEN)
|
||||
hall = synth.make_room(RUNS, "Hall", "B")
|
||||
|
||||
def hall_in_kitchen(rooms, name):
|
||||
out, r = combine([k1, k2, hall], rooms=rooms, name=name)
|
||||
assert r.returncode == 0, r.stderr
|
||||
v, colour = splats(out)
|
||||
inside = (v["x"] > 0.2) & (v["x"] < 3.6)
|
||||
return int((inside & coloured(colour, HALL)).sum()), json.loads((out / "combine.json").read_text())
|
||||
with_rooms, info = hall_in_kitchen(["Kitchen", "Kitchen", "Hallway"], "rooms")
|
||||
assert info["rooms"]["Hall"]["walk_in_out_cameras"] > 10
|
||||
assert with_rooms < 50
|
||||
assert info["rooms"]["K1"]["walk_in_out_cameras"] == info["rooms"]["K2"]["walk_in_out_cameras"] == 0
|
||||
without, info = hall_in_kitchen(None, "plain")
|
||||
# the walk-in is not recognised; the hallway claims part of the kitchen – less than before 0.3, since a
|
||||
# cube only goes to a recording that really has something there
|
||||
assert info["rooms"]["Hall"]["walk_in_out_cameras"] == 0 and without > 2 * max(with_rooms, 5)
|
||||
|
||||
|
||||
def test_rooms_need_one_name_per_recording():
|
||||
left = synth.make_room(RUNS, "Left", "A", loop=(1.1, 1.5, 0.6, 0.8))
|
||||
right = synth.make_room(RUNS, "Right", "A", loop=(2.9, 1.5, 0.6, 0.8))
|
||||
for rooms in (["Kitchen"], ["Kitchen", ""], "Kitchen", ["Kitchen", 3]):
|
||||
out, r = combine([left, right], rooms=rooms)
|
||||
assert r.returncode != 0 and "--rooms" in r.stderr, rooms
|
||||
|
||||
|
||||
def test_the_floor_plan_shows_a_room_of_several_recordings_once():
|
||||
left = synth.make_room(RUNS, "Left", "A", loop=(1.1, 1.5, 0.6, 0.8), error=(0.0, (0, 0, 0)))
|
||||
right = synth.make_room(RUNS, "Right", "A", loop=(2.9, 1.5, 0.6, 0.8), error=(0.0, (0, 0, 0)))
|
||||
hall = synth.make_room(RUNS, "Hall", "B", error=(0.0, (0, 0, 0)))
|
||||
r = subprocess.run([sys.executable, str(ROOT / "scripts" / "floorplan.py"), str(BASE / "plan.png"),
|
||||
f"{left}=Kitchen", f"{right}=Kitchen", f"{hall}=Hallway"], capture_output=True, text=True)
|
||||
assert r.returncode == 0, r.stderr
|
||||
info = json.loads(r.stdout.strip().splitlines()[-1])
|
||||
sizes = {s["label"]: s["size"] for s in info["scenes"]}
|
||||
assert set(sizes) == {"Kitchen", "Hallway"}
|
||||
assert abs(max(sizes["Kitchen"]) - 4) < 0.3 and abs(min(sizes["Kitchen"]) - 3) < 0.3 # the whole 4 x 3 m room
|
||||
|
||||
|
||||
# ---------------------------------------------------------------- rooms in the web interface (server)
|
||||
|
||||
from conftest import server, wait_job # noqa: E402
|
||||
|
||||
|
||||
def make_home():
|
||||
"""The kitchen in two recordings (left and right half), the hallway in one – one session."""
|
||||
synth.make_room(RUNS, "Left", "A", name="Kitchen left", loop=(1.1, 1.5, 0.6, 0.8), colour=RED,
|
||||
recording="2026-10-12_16-40-00_stereo.mp4")
|
||||
synth.make_room(RUNS, "Right", "A", name="Kitchen right", loop=(2.9, 1.5, 0.6, 0.8), colour=GREEN,
|
||||
recording="2026-10-12_16-41-00_stereo.mp4")
|
||||
synth.make_room(RUNS, "Hall", "B", name="Hallway", recording="2026-10-12_16-43-00_stereo.mp4")
|
||||
|
||||
|
||||
def test_a_room_and_a_home_made_of_it(api):
|
||||
make_home()
|
||||
status, r = api.post("/api/group", {"name": "Kitchen", "members": "Left,Right", "room": True})
|
||||
assert status == 200 and r["slug"] == "Kitchen"
|
||||
status, r = api.post("/api/group", {"name": "Home", "members": "Kitchen,Hall"})
|
||||
assert status == 200
|
||||
by = {g["slug"]: g for g in api.get("/api/groups")[1]["groups"]}
|
||||
assert (by["Kitchen"]["room"], by["Kitchen"]["parent"], by["Kitchen"]["rooms"]) == (True, "Home", 1)
|
||||
assert (by["Home"]["room"], by["Home"]["members"], by["Home"]["rooms"]) == (False, ["Kitchen", "Hall"], 2)
|
||||
assert by["Home"]["scenes"] == ["Left", "Right", "Hall"]
|
||||
assert api.get("/api/groups")[1]["suggestion"] is None # everything is grouped
|
||||
|
||||
|
||||
def test_what_a_room_and_a_home_may_hold(api):
|
||||
make_home()
|
||||
synth.make_room(RUNS, "Other", "A", recording="2026-10-03_19-00-00_stereo.mp4")
|
||||
assert api.post("/api/group", {"name": "Kitchen", "members": "Left,Right", "room": True})[0] == 200
|
||||
assert api.post("/api/group", {"name": "Flat", "members": "Other"})[0] == 200
|
||||
for body in ({"name": "Room2", "members": "Kitchen,Hall", "room": True}, # a room holds recordings only
|
||||
{"name": "Home", "members": "Flat,Hall"}, # no group of groups of groups
|
||||
{"name": "Self", "members": "Self"}):
|
||||
status, r = api.post("/api/group", body)
|
||||
assert status == 400 and r["error"]["code"] == "err.bad_request", body
|
||||
assert api.post("/api/group", {"name": "Home", "members": "Kitchen,Hall"})[0] == 200
|
||||
status, r = api.post("/api/group", {"name": "Home 2", "members": "Kitchen"}) # a room in one home only
|
||||
assert status == 400 and r["error"]["code"] == "err.in_other_group"
|
||||
status, r = api.post("/api/group", {"slug": "Kitchen", "name": "Kitchen", "members": "Left,Right"})
|
||||
assert status == 400 and r["error"]["code"] == "err.room_in_group" # inside a home it stays a room
|
||||
|
||||
|
||||
def test_a_renamed_room_stays_in_its_home(api):
|
||||
make_home()
|
||||
api.post("/api/group", {"name": "Kitchen", "members": "Left,Right", "room": True})
|
||||
api.post("/api/group", {"name": "Home", "members": "Kitchen,Hall"})
|
||||
assert api.post("/api/group", {"slug": "Kitchen", "name": "Cooking", "members": "Left,Right", "room": True})[0] == 200
|
||||
by = {g["slug"]: g for g in api.get("/api/groups")[1]["groups"]}
|
||||
assert by["Home"]["members"] == ["Cooking", "Hall"] and by["Cooking"]["parent"] == "Home"
|
||||
assert api.post("/api/delete", {"slug": "Cooking"})[0] == 200 # dissolving the room
|
||||
assert {g["slug"]: g for g in api.get("/api/groups")[1]["groups"]}["Home"]["members"] == ["Hall"]
|
||||
|
||||
|
||||
def test_putting_a_home_together_from_its_recordings(api, monkeypatch):
|
||||
monkeypatch.setenv("COLOUR", "keep")
|
||||
make_home()
|
||||
api.post("/api/group", {"name": "Kitchen", "members": "Left,Right", "room": True})
|
||||
api.post("/api/group", {"name": "Home", "members": "Kitchen,Hall"})
|
||||
assert server.start_combine({"slug": "Home", "full": False}) is None
|
||||
js = wait_job()
|
||||
assert js["result"] == "ok", js["tail"]
|
||||
info = json.loads((RUNS / "Home" / "combine.json").read_text())
|
||||
assert {l: x["room"] for l, x in info["rooms"].items()} == {
|
||||
"Kitchen left": "Kitchen", "Kitchen right": "Kitchen", "Hallway": "Hallway"}
|
||||
v, colour = splats(RUNS / "Home")
|
||||
assert coloured(colour, RED)[v["x"] < 0.3].mean() > 0.9 and coloured(colour, GREEN)[(v["x"] > 3.7) & (v["x"] < 3.95)].mean() > 0.9
|
||||
home = {g["slug"]: g for g in api.get("/api/groups")[1]["groups"]}["Home"]
|
||||
assert home["result"] and not home["result"]["stale"]
|
||||
# the room alone, too
|
||||
assert server.start_combine({"slug": "Kitchen", "full": False}) is None
|
||||
assert wait_job()["result"] == "ok"
|
||||
info = json.loads((RUNS / "Kitchen" / "combine.json").read_text())
|
||||
assert {x["room"] for x in info["rooms"].values()} == {"Kitchen"}
|
||||
|
||||
|
||||
def test_a_home_without_rooms_is_put_together_as_before(api, monkeypatch):
|
||||
make_home()
|
||||
api.post("/api/group", {"name": "Home", "members": "Right,Hall"}) # (the left half does not reach the door)
|
||||
seen = {}
|
||||
real = server.subprocess.Popen
|
||||
|
||||
def popen(cmd, *a, **kw):
|
||||
if any("combine.sh" in str(c) for c in cmd):
|
||||
seen["rooms"] = kw["env"].get("ROOMS")
|
||||
return real(cmd, *a, **kw)
|
||||
monkeypatch.setattr(server.subprocess, "Popen", popen)
|
||||
assert server.start_combine({"slug": "Home", "full": False}) is None
|
||||
assert wait_job()["result"] == "ok"
|
||||
assert seen == {"rooms": None}
|
||||
|
||||
|
||||
def test_the_floor_plan_of_a_home_names_rooms(api):
|
||||
make_home()
|
||||
api.post("/api/group", {"name": "Kitchen", "members": "Left,Right", "room": True})
|
||||
api.post("/api/group", {"name": "Home", "members": "Kitchen,Hall"})
|
||||
info = server.floorplan(["Left", "Right", "Hall"], "classic", "en", "", "Home")[1]
|
||||
assert sorted(s["label"] for s in info["scenes"]) == ["Hallway", "Kitchen"]
|
||||
|
||||
|
||||
def test_a_homes_scale_reaches_the_rooms_and_their_recordings(api):
|
||||
make_home()
|
||||
api.post("/api/group", {"name": "Kitchen", "members": "Left,Right", "room": True})
|
||||
api.post("/api/group", {"name": "Home", "members": "Kitchen,Hall"})
|
||||
assert api.post("/api/scale", {"slug": "Home", "scale": "87", "with_scenes": True})[0] == 200
|
||||
scales = {x["slug"]: x["scale"] for x in api.get("/api/scenes")[1]}
|
||||
assert scales == {"Left": 87, "Right": 87, "Hall": 87}
|
||||
assert {g["slug"]: g["scale"] for g in api.get("/api/groups")[1]["groups"]} == {"Home": 87, "Kitchen": 87}
|
||||
|
||||
|
||||
def test_a_renamed_room_gets_a_floor_plan_with_its_new_name(api, monkeypatch):
|
||||
"""The floor plan (and the preview images made from it) carries the room's name: drawn again."""
|
||||
monkeypatch.setenv("COLOUR", "keep")
|
||||
make_home()
|
||||
api.post("/api/group", {"name": "Kitchen", "members": "Left,Right", "room": True})
|
||||
assert server.start_combine({"slug": "Kitchen", "full": False}) is None
|
||||
assert wait_job()["result"] == "ok"
|
||||
plan = RUNS / "Kitchen" / "plan.png"
|
||||
before = plan.read_bytes()
|
||||
status, r = api.post("/api/group", {"slug": "Kitchen", "name": "Big kitchen", "members": "Left,Right", "room": True})
|
||||
assert status == 200, r
|
||||
plan = RUNS / r["slug"] / "plan.png"
|
||||
assert plan.read_bytes() != before and not (plan.parent / "plan.new.png").exists()
|
||||
assert (plan.parent / f"{r['slug'].lower()}.gallery.png").exists()
|
||||
|
||||
|
||||
def test_two_rooms_of_the_same_name_stay_two_rooms(api):
|
||||
make_home()
|
||||
api.post("/api/group", {"name": "Kitchen", "members": "Left,Right", "room": True})
|
||||
server.write_meta("Hall", name="Kitchen") # e.g. renamed by mistake
|
||||
api.post("/api/group", {"name": "Home", "members": "Kitchen,Hall"})
|
||||
assert sorted(server.group_scenes("Home")) == [("Hall", "Kitchen (2)"), ("Left", "Kitchen"), ("Right", "Kitchen")]
|
||||
|
||||
|
||||
def test_the_preview_plan_of_a_home_names_its_rooms(api, monkeypatch):
|
||||
"""combine.sh gets the rooms (ROOMS) and labels the floor plan of the preview by them."""
|
||||
monkeypatch.setenv("COLOUR", "keep")
|
||||
make_home()
|
||||
api.post("/api/group", {"name": "Kitchen", "members": "Left,Right", "room": True})
|
||||
api.post("/api/group", {"name": "Home", "members": "Kitchen,Hall"})
|
||||
assert server.start_combine({"slug": "Home", "full": False}) is None
|
||||
assert wait_job()["result"] == "ok"
|
||||
plan = json.loads((RUNS / "Home" / "plan.json").read_text())
|
||||
assert sorted(s["label"] for s in plan["scenes"]) == ["Hallway", "Kitchen"]
|
||||
+23
-5
@@ -1,5 +1,6 @@
|
||||
"""Finished scenes: renaming, cleaning up, deleting, and runs that did not finish."""
|
||||
import json
|
||||
import os
|
||||
|
||||
from conftest import RUNS, TRASH, server
|
||||
import synth
|
||||
@@ -23,13 +24,13 @@ def test_renaming_moves_folder_files_and_log(api):
|
||||
(run / "aufnahme-12.10.-16-40.gallery.png").write_bytes(b"x")
|
||||
status, r = api.post("/api/rename", {"slug": "Aufnahme-12.10.-16-40", "new": "Büro 12.10."})
|
||||
assert status == 200, r
|
||||
new = RUNS / "Buero-12.10."
|
||||
new = RUNS / "Buero-12.10"
|
||||
assert new.is_dir() and not run.exists()
|
||||
assert (new / "buero-12.10..sog").exists() and (new / "buero-12.10..gallery.png").exists()
|
||||
assert (RUNS / "Buero-12.10..log").exists() and not (RUNS / "Aufnahme-12.10.-16-40.log").exists()
|
||||
meta = json.loads((RUNS / "Buero-12.10..ui.json").read_text())
|
||||
assert (new / "buero-12.10.sog").exists() and (new / "buero-12.10.gallery.png").exists()
|
||||
assert (RUNS / "Buero-12.10.log").exists() and not (RUNS / "Aufnahme-12.10.-16-40.log").exists()
|
||||
meta = json.loads((RUNS / "Buero-12.10.ui.json").read_text())
|
||||
assert meta["name"] == "Büro 12.10." and meta["folder_renamed"] is True
|
||||
assert server.no_resume("Buero-12.10.") == "renamed" # the pipeline remembers the old path
|
||||
assert server.no_resume("Buero-12.10") == "renamed" # the pipeline remembers the old path
|
||||
|
||||
|
||||
def test_renaming_to_a_taken_name_is_refused(api):
|
||||
@@ -89,3 +90,20 @@ def test_unfinished_runs_resume_or_start_over(api):
|
||||
assert api.post("/api/resume", {"slug": "Broken"})[1]["error"]["code"] == "err.not_resumable"
|
||||
assert api.post("/api/delete", {"slug": "old-test"})[0] == 200
|
||||
assert not (RUNS / "old-test.log").exists()
|
||||
|
||||
|
||||
def test_copying_to_the_frame_says_how_far_it_is(api, frame):
|
||||
"""to-frame.sh reports every 2 s how much is on the Frame already (\"@@ upbytes\"); the page shows a percentage."""
|
||||
import time
|
||||
synth.make_room(RUNS, "Kitchen", "A")
|
||||
(RUNS / "Kitchen" / "scene.sog").write_bytes(b"s" * 200_000)
|
||||
os.environ["FAKE_SCP_SLOW"] = "1"
|
||||
assert api.post("/api/upload", {"slug": "Kitchen"})[0] == 200
|
||||
seen = []
|
||||
end = time.time() + 30
|
||||
while (u := server.upload_status("Kitchen")) and u["running"] and time.time() < end:
|
||||
if "pct" in u:
|
||||
seen.append(u)
|
||||
time.sleep(0.2)
|
||||
assert server.upload_status("Kitchen")["ok"]
|
||||
assert seen and seen[0]["total"] > 200_000 and 0 <= seen[-1]["pct"] <= 99
|
||||
@@ -0,0 +1,71 @@
|
||||
"""Setup hints (0.4.1, from issues #1 and #2): typos in the config, splat-transform only on the shell's PATH,
|
||||
an Arcturus pipeline that PyAV 19 breaks."""
|
||||
import os
|
||||
import subprocess
|
||||
|
||||
import pytest
|
||||
|
||||
from conftest import ROOT, server
|
||||
from splat_workshop import config
|
||||
|
||||
UNPINNED = '''#!/usr/bin/env -S uv run --script
|
||||
# /// script
|
||||
# dependencies = [
|
||||
# "av>=18.1",
|
||||
# "numpy",
|
||||
# ]
|
||||
# ///
|
||||
import av
|
||||
av.open("x", metadata_errors="strict")
|
||||
'''
|
||||
|
||||
|
||||
def test_a_typo_in_the_config_is_named_with_the_right_spelling():
|
||||
unknown = config.unknown_keys({"paths": {"splat-transform": "/x", "pipeline": "/p"}, "frmae": {"host": ""}})
|
||||
assert unknown == [("paths.splat-transform", "paths.splat_transform"), ("frmae", "frame")]
|
||||
c = config.Config(config._merge(config.DEFAULTS, {}), None, unknown)
|
||||
keys = [k for k, _ in c.problems()]
|
||||
assert keys[:2] == ["setup.unknown_key", "setup.unknown_key"]
|
||||
|
||||
|
||||
def test_a_pipeline_that_pyav_19_breaks_is_found(tmp_path):
|
||||
for name in config.PYAV_FILES:
|
||||
(tmp_path / name).write_text(UNPINNED)
|
||||
assert config.pyav_unpinned(tmp_path) == list(config.PYAV_FILES)
|
||||
(tmp_path / "av1_colmap.py").write_text(UNPINNED.replace('"av>=18.1"', '"av>=18.1,<19"'))
|
||||
assert config.pyav_unpinned(tmp_path) == ["av1_to_3dgs.py"]
|
||||
c = config.Config(config._merge(config.DEFAULTS, {"paths": {"pipeline": str(tmp_path)}}), None)
|
||||
hint = dict(c.problems())["setup.pyav"]
|
||||
assert hint["files"] == "av1_to_3dgs.py"
|
||||
|
||||
|
||||
def test_a_conversion_failing_on_pyav_says_why():
|
||||
out = server.parse_output("Traceback ...\nTypeError: open() got an unexpected keyword argument 'metadata_errors'\n")
|
||||
assert out["info"]["hint"] == "hint.pyav"
|
||||
assert "hint" not in server.parse_output("Traceback ...\nValueError: something else\n")["info"]
|
||||
|
||||
|
||||
@pytest.mark.parametrize("existing", [False, True])
|
||||
def test_install_gives_the_full_path_of_splat_transform(tmp_path, existing):
|
||||
"""install.sh finds splat-transform on the shell's PATH: a new config gets the full path, an existing one
|
||||
a line to add – the app, started from the desktop, does not see that PATH."""
|
||||
home, xdg, bin_ = tmp_path / "home", tmp_path / "xdg", tmp_path / "bin"
|
||||
for d in (home, xdg, bin_):
|
||||
d.mkdir()
|
||||
(bin_ / "splat-transform").write_text("#!/bin/sh\n")
|
||||
(bin_ / "splat-transform").chmod(0o755)
|
||||
conf = xdg / "splat-workshop" / "config.toml"
|
||||
if existing:
|
||||
conf.parent.mkdir()
|
||||
conf.write_text('[paths]\nsplat-transform = "/typo"\n')
|
||||
env = {**os.environ, "HOME": str(home), "XDG_CONFIG_HOME": str(xdg), "XDG_DATA_HOME": str(tmp_path / "data"),
|
||||
"PATH": f"{bin_}:{os.environ['PATH']}"}
|
||||
env.pop("SPLAT_WORKSHOP_CONFIG", None)
|
||||
r = subprocess.run([str(ROOT / "install.sh")], env=env, capture_output=True, text=True, timeout=120)
|
||||
assert r.returncode == 0, r.stderr
|
||||
line = f'splat_transform = "{bin_ / "splat-transform"}"'
|
||||
if existing:
|
||||
assert line in r.stdout and line not in conf.read_text()
|
||||
assert 'Unknown setting "paths.splat-transform"' in r.stdout and '"paths.splat_transform"' in r.stdout
|
||||
else:
|
||||
assert line in conf.read_text() and "written to the config" in r.stdout
|
||||
@@ -0,0 +1,138 @@
|
||||
"""Standby when everything is done (0.3): after the last job – also after the parts of a long recording
|
||||
and putting them together – a minute's notice, then the PC suspends. The fake systemctl only notes it."""
|
||||
import os
|
||||
import time
|
||||
|
||||
import pytest
|
||||
|
||||
from conftest import recording, server, tools_called, wait_for_tool, wait_job
|
||||
|
||||
|
||||
@pytest.fixture(autouse=True)
|
||||
def quick(monkeypatch):
|
||||
monkeypatch.setattr(server, "STANDBY_GRACE", 0)
|
||||
yield
|
||||
server.release_awake()
|
||||
|
||||
|
||||
def suspends():
|
||||
return [c for c in tools_called() if c[0] == "systemctl"]
|
||||
|
||||
|
||||
def test_standby_after_the_job(api):
|
||||
assert server.start_job({"path": str(recording()), "name": "Room", "quality": "fast", "upload": False}) is None
|
||||
assert api.post("/api/standby", {"on": True})[1]["on"]
|
||||
server.standby_tick(busy=True)
|
||||
assert not suspends() and server.standby_status()["at"] is None # nothing while it runs
|
||||
wait_job()
|
||||
server.standby_tick(busy=False) # all done: the notice
|
||||
assert server.standby_status()["at"] and not suspends()
|
||||
assert any("standby" in n[-1].lower() for n in wait_for_tool("notify-send"))
|
||||
server.standby_tick(busy=False) # the minute is up
|
||||
assert suspends() == [["systemctl", "suspend"]]
|
||||
assert server.standby_status() == {"on": False, "at": None, "error": None} # once only
|
||||
server.standby_tick(busy=False)
|
||||
assert len(suspends()) == 1
|
||||
|
||||
|
||||
def test_work_starting_again_stops_the_countdown():
|
||||
server.set_standby(True)
|
||||
server.standby_tick(busy=False)
|
||||
assert server.standby_status()["at"]
|
||||
server.standby_tick(busy=True) # e.g. the next part started
|
||||
assert server.standby_status()["at"] is None and server.standby_status()["on"]
|
||||
assert not suspends()
|
||||
|
||||
|
||||
def test_switched_off_in_time():
|
||||
server.set_standby(True)
|
||||
server.standby_tick(busy=False)
|
||||
assert server.set_standby(False)["on"] is False
|
||||
server.standby_tick(busy=False)
|
||||
assert not suspends()
|
||||
|
||||
|
||||
def test_cancelling_a_job_means_someone_is_there():
|
||||
os.environ["FAKE_PIPELINE"] = "slow"
|
||||
server.start_job({"path": str(recording()), "name": "Room", "quality": "fast", "upload": False})
|
||||
server.set_standby(True)
|
||||
time.sleep(1)
|
||||
server.cancel_job()
|
||||
wait_job(30)
|
||||
server.standby_tick(busy=False)
|
||||
server.standby_tick(busy=False)
|
||||
assert not suspends() and not server.standby_status()["on"]
|
||||
|
||||
|
||||
def test_a_refused_standby_is_reported():
|
||||
os.environ["FAKE_SUSPEND_FAIL"] = "1"
|
||||
server.set_standby(True)
|
||||
server.standby_tick(busy=False)
|
||||
server.standby_tick(busy=False)
|
||||
assert "Steam" in server.standby_status()["error"]
|
||||
end = time.time() + 5 # notifications are sent in the background
|
||||
while not any("Steam" in c[-1] for c in tools_called() if c[0] == "notify-send") and time.time() < end:
|
||||
time.sleep(0.1)
|
||||
assert any("Steam" in c[-1] for c in tools_called() if c[0] == "notify-send")
|
||||
|
||||
|
||||
def test_kept_awake_between_jobs_and_let_go_after(monkeypatch):
|
||||
"""One lock of the server spans the few seconds between two jobs; it goes a little after the last."""
|
||||
monkeypatch.setattr(server, "can_inhibit", lambda: True)
|
||||
monkeypatch.setattr(server, "keep_awake", lambda cmd, why: cmd) # the lock is a process: here `sleep`
|
||||
monkeypatch.setattr(server, "AWAKE_AFTER", 0.5)
|
||||
server.hold_awake(True)
|
||||
p = server.awake["proc"]
|
||||
assert p and p.poll() is None
|
||||
server.hold_awake(False) # between two jobs: still held
|
||||
assert p.poll() is None
|
||||
server.hold_awake(True)
|
||||
assert server.awake["proc"] is p # the same lock, not a new one
|
||||
server.hold_awake(False)
|
||||
time.sleep(0.6)
|
||||
server.hold_awake(False)
|
||||
assert p.poll() is not None and server.awake["proc"] is None
|
||||
|
||||
|
||||
def test_one_notice_after_a_whole_chain_of_parts():
|
||||
"""Between two parts, and between the last part and putting them together, nothing announces the
|
||||
standby: the watcher's tick that starts the next part reports it as running."""
|
||||
os.environ["FAKE_PIPELINE"] = "room"
|
||||
assert server.start_parts({"path": str(recording("2026-10-14_16-57-54_stereo.mp4")), "name": "Living room",
|
||||
"quality": "high", "parts": 2, "upload": False}) is None
|
||||
server.set_standby(True)
|
||||
was, ticks = True, 0
|
||||
while ticks < 10:
|
||||
wait_job()
|
||||
running = server.watch_once(was)
|
||||
server.standby_tick(running)
|
||||
ticks += 1
|
||||
if not running:
|
||||
break
|
||||
assert server.standby_status()["at"] is None
|
||||
was = running
|
||||
assert server.job_status(tail=False)["kind"] == "combine"
|
||||
server.standby_tick(False)
|
||||
for p in server.notes:
|
||||
p.wait(10)
|
||||
notices = [c for c in tools_called() if c[0] == "notify-send" and "standby" in c[-1].lower()]
|
||||
assert len(notices) == 1 and suspends() == [["systemctl", "suspend"]]
|
||||
|
||||
|
||||
def test_the_own_lock_goes_before_the_standby(monkeypatch):
|
||||
monkeypatch.setattr(server, "can_inhibit", lambda: True)
|
||||
monkeypatch.setattr(server, "keep_awake", lambda cmd, why: cmd)
|
||||
server.hold_awake(True)
|
||||
lock = server.awake["proc"]
|
||||
held = []
|
||||
real = server.subprocess.run
|
||||
|
||||
def run(cmd, *a, **kw):
|
||||
if cmd[:2] == ["systemctl", "suspend"]:
|
||||
held.append(lock.poll() is None)
|
||||
return real(cmd, *a, **kw)
|
||||
monkeypatch.setattr(server.subprocess, "run", run)
|
||||
server.set_standby(True)
|
||||
server.standby_tick(False)
|
||||
server.standby_tick(False)
|
||||
assert held == [False] and server.awake["proc"] is None
|
||||
@@ -0,0 +1,98 @@
|
||||
"""Is there a newer version? (0.5.1, asked in issue #2): once a day the server asks GitHub for the newest
|
||||
release – in the background, switched off with check_updates = false – and the page shows a note."""
|
||||
import io
|
||||
import json
|
||||
import time
|
||||
|
||||
import pytest
|
||||
|
||||
from conftest import server
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def github(monkeypatch):
|
||||
"""A fake api.github.com: answers with `reply`, counts the requests."""
|
||||
seen = {"n": 0, "reply": {"tag_name": "v9.1.0", "html_url": "https://github.com/thunderheronight/splat-workshop/releases/tag/v9.1.0"}}
|
||||
|
||||
def urlopen(req, timeout=None):
|
||||
seen["n"] += 1
|
||||
seen["url"], seen["headers"] = req.full_url, dict(req.header_items())
|
||||
if seen["reply"] is None:
|
||||
raise OSError("offline")
|
||||
return io.BytesIO(json.dumps(seen["reply"]).encode())
|
||||
monkeypatch.setattr(server.urllib.request, "urlopen", urlopen)
|
||||
monkeypatch.setattr(server.CFG, "check_updates", True)
|
||||
server.UPDATE_FILE.unlink(missing_ok=True)
|
||||
yield seen
|
||||
server.UPDATE_FILE.unlink(missing_ok=True)
|
||||
|
||||
|
||||
def ask():
|
||||
server.ask_for_update()
|
||||
end = time.time() + 5
|
||||
while server.update_lock.locked() and time.time() < end:
|
||||
time.sleep(0.02)
|
||||
|
||||
|
||||
def test_a_newer_release_is_shown(github, api):
|
||||
ask()
|
||||
assert github["url"] == "https://api.github.com/repos/thunderheronight/splat-workshop/releases/latest"
|
||||
assert "Cookie" not in github["headers"] and "Authorization" not in github["headers"]
|
||||
info = api.get("/api/ping")[1]["update"]
|
||||
assert info == {"latest": "9.1.0", "current": server.VERSION,
|
||||
"url": "https://github.com/thunderheronight/splat-workshop/releases/tag/v9.1.0"}
|
||||
|
||||
|
||||
def test_asked_at_most_once_a_day(github):
|
||||
ask()
|
||||
ask()
|
||||
assert github["n"] == 1
|
||||
data = json.loads(server.UPDATE_FILE.read_text())
|
||||
data["checked"] -= server.UPDATE_EVERY + 1
|
||||
server.UPDATE_FILE.write_text(json.dumps(data))
|
||||
ask()
|
||||
assert github["n"] == 2
|
||||
|
||||
|
||||
@pytest.mark.parametrize("tag", ["v" + server.VERSION, "v0.1.0", "nonsense", None])
|
||||
def test_nothing_shown_for_the_same_an_older_or_an_odd_release(github, tag):
|
||||
github["reply"] = {"tag_name": tag, "html_url": "https://github.com/thunderheronight/splat-workshop/releases"}
|
||||
ask()
|
||||
assert server.update_info() is None
|
||||
|
||||
|
||||
def test_offline_is_no_problem(github):
|
||||
github["reply"] = None
|
||||
ask()
|
||||
assert server.update_info() is None and github["n"] == 1 # and not asked again right away
|
||||
ask()
|
||||
assert github["n"] == 1
|
||||
|
||||
|
||||
def test_a_link_elsewhere_is_not_shown(github):
|
||||
github["reply"] = {"tag_name": "v9.1.0", "html_url": "https://evil.example/download"}
|
||||
ask()
|
||||
assert server.update_info()["url"] == "https://github.com/thunderheronight/splat-workshop/releases/latest"
|
||||
|
||||
|
||||
def test_switched_off_never_asks(github, monkeypatch):
|
||||
monkeypatch.setattr(server.CFG, "check_updates", False)
|
||||
ask()
|
||||
assert github["n"] == 0 and server.update_info() is None
|
||||
|
||||
|
||||
def test_versions_compare_as_numbers():
|
||||
assert server.version_tuple("v0.10.0") > server.version_tuple("0.9.9")
|
||||
assert server.version_tuple("0.5.0-experimental") == (0, 5, 0) and server.version_tuple("x") == ()
|
||||
|
||||
|
||||
def test_checking_by_hand_asks_right_away(github, api, monkeypatch):
|
||||
"""Tray menu or page: asks now, even right after the daily check, and even when that is switched off."""
|
||||
ask()
|
||||
github["reply"]["tag_name"] = "v9.2.0"
|
||||
monkeypatch.setattr(server.CFG, "check_updates", False)
|
||||
status, r = api.post("/api/update/check", {})
|
||||
assert status == 200 and r["reached"] and r["update"]["latest"] == "9.2.0" and github["n"] == 2
|
||||
github["reply"] = None
|
||||
r = api.post("/api/update/check", {})[1]
|
||||
assert r["reached"] is False and r["current"] == server.VERSION
|
||||
+156
-12
@@ -15,10 +15,15 @@ const I18N = {
|
||||
"setup.hint": "Settings are in {file}. Restart Splat Workshop after changing them.",
|
||||
"setup.pipeline": "Arcturus pipeline not found in {path} (av1_to_3dgs.py). Download it from arcturus.vision/apps.",
|
||||
"setup.spirula": "Spirula Studio not found at {path}. Build it as described in the pipeline README.",
|
||||
"setup.splat_transform": "splat-transform not found – install it with: npm install -g @playcanvas/splat-transform",
|
||||
"setup.splat_transform": "splat-transform not found. Install it (without root: npm install -g --prefix ~/.local @playcanvas/splat-transform) and put its full path into {file}, e.g. splat_transform = \"/home/you/.local/bin/splat-transform\" – started from the desktop, Splat Workshop does not see a PATH set in .bashrc or .zshrc.",
|
||||
"setup.unknown_key": "Unknown setting “{key}” in {file} – did you mean “{suggestion}”? (Splat Workshop ignores it.)",
|
||||
"setup.unknown_key.plain": "Unknown setting “{key}” in {file} – Splat Workshop ignores it.",
|
||||
"setup.pyav": "The Arcturus pipeline in {path} will fail with “unexpected keyword argument 'metadata_errors'” (PyAV 19). In the # /// script header of {files}, change \"av>=18.1\" to \"av>=18.1,<19\" – see Troubleshooting in docs/arcturus-setup.md.",
|
||||
"setup.tool": "{tool} is not installed.",
|
||||
// job card
|
||||
"job.cancel": "Cancel", "job.dismiss": "Hide", "job.log": "Log",
|
||||
"job.standby": "💤 Standby when done", "job.standby.in": "💤 Standby in {s} s",
|
||||
"job.standby.title": "When everything is done (also the following parts, putting them together, copying to the Frame), the PC goes to standby after a minute's notice. Cancelling a job switches this off.",
|
||||
"job.psnr": "Image quality (PSNR) during training",
|
||||
"job.sub": "{rec} · {q} · {target} · for {time}", "job.toFrame": "→ Frame", "job.pcOnly": "PC only",
|
||||
"job.left": " · about {time} left",
|
||||
@@ -31,6 +36,7 @@ const I18N = {
|
||||
"res.cancelled": "Cancelled. Start again with the same name and choose “Resume” to continue.",
|
||||
"res.upload_failed": "The scene is finished, but copying to the Frame did not work (Frame off?). Use “To the Frame” in the list of finished scenes once it is on.",
|
||||
"res.failed": "Failed – the last lines of the log show why.",
|
||||
"hint.pyav": "Failed: the Arcturus pipeline does not work with PyAV 19 (“unexpected keyword argument 'metadata_errors'”). In the # /// script header of av1_to_3dgs.py and av1_colmap.py, change \"av>=18.1\" to \"av>=18.1,<19\", then resume – see Troubleshooting in docs/arcturus-setup.md.",
|
||||
"confirm.cancel": "Really cancel the conversion? With “Resume” you can continue later from the last saved state.",
|
||||
// step 1
|
||||
"s1.title": "Choose a recording", "tab.frame": "On the Frame", "tab.local": "On this PC",
|
||||
@@ -102,6 +108,19 @@ const I18N = {
|
||||
"t.frame": "Gaussian XR gallery on the Frame", "t.frame.sub": "Copied automatically after computing, with preview image and name plate",
|
||||
"t.pc": "This PC only", "t.pc.sub": "The result stays in the runs folder – e.g. to look at it in Spirula",
|
||||
"t.offline": "The Frame is not reachable right now. Computing works anyway – it just has to be on at the end.",
|
||||
"split": "Long recording",
|
||||
"split.parts": "Split the video into parts",
|
||||
"split.parts.pro": "more detail: {rate} instead of {whole} image pairs per second ({pairs} per part of {len})",
|
||||
"split.parts.con": "takes about {n} times as long; afterwards the parts are put together into one room automatically (small seams are possible where they meet)",
|
||||
"split.whole": "Convert in one piece",
|
||||
"split.whole.pro": "done sooner, one conversion, no seams between parts",
|
||||
"split.whole.con": "only {rate} instead of {full} image pairs per second – the pipeline takes at most 500 per recording, so fine details get lost more easily",
|
||||
"est.parts": "{n} parts × about {frames} image pairs · up to {maxg} M splats · {iter}k steps · together about {mins} min",
|
||||
"started.parts": "Started – {n} parts one after the other, then they become one room",
|
||||
"job.sub.part": "Part {i} of {n} of “{room}” · {q} · {time}",
|
||||
"err.parts_too_short": "The parts would be shorter than {secs} s – choose fewer parts",
|
||||
"err.recording_has_parts": "{n} scenes (e.g. “{name}”) were cut from this recording – it is their original: with it, the cuts can be made again (start over, resume).",
|
||||
"rdel.parts.confirm": "Delete it anyway? The finished scenes stay; without the original their parts can no longer be cut again.",
|
||||
"start": "Start conversion", "est.none": "Choose a recording first.", "est.busy": "A conversion is already running.",
|
||||
"est": "{frames} image pairs · {maxg} M splats · {iter}k steps · <b>about {mins} min</b> <span class=\"faint\">(rough estimate)</span>",
|
||||
"started": "Conversion started", "unusable": "This recording can't be used like this",
|
||||
@@ -167,7 +186,13 @@ const I18N = {
|
||||
"grp.new": "+ Group", "grp.new.tip": "Put scenes together in a group, e.g. all rooms of a flat",
|
||||
"grp.new.title": "New group", "grp.edit.title": "Edit group", "grp.name": "Name", "grp.pick": "Scenes in this group",
|
||||
"grp.noFree": "Every scene is already in a group – a scene can only be in one.", "grp.save": "Save", "grp.cancel": "Cancel",
|
||||
"grp.rooms": "{n} scenes", "grp.show": "▸ Show {n} scenes", "grp.hide": "▾ Hide scenes",
|
||||
"grp.room": "One room made of several recordings",
|
||||
"grp.room.hint": "e.g. two short rounds through the living room. When put together, every part comes from the recording that saw it best. A room can be part of a home group.",
|
||||
"grp.room.recordings": "{n} recordings", "grp.home.count": "{rooms} rooms from {n} recordings",
|
||||
"grp.room.combine": "Put the room together …",
|
||||
"err.room_in_group": "It is a room of “{group}” – take it out there first",
|
||||
"grp.rooms": "{n} scenes", "grp.show": "▸ Show {n} scenes", "grp.hide": "▾ Hide",
|
||||
"grp.show.rooms": "▸ Show {n} rooms", "grp.show.recordings": "▸ Show {n} recordings",
|
||||
"grp.combine": "Put the tour together …", "grp.recombine": "Put together again …", "grp.busy": "Being put together right now …",
|
||||
"grp.none": "Not put together yet.",
|
||||
"grp.tour": "Tour: Frame {frame} ({fsize}){full}", "grp.tour.full": " · full {n} ({size})",
|
||||
@@ -180,6 +205,7 @@ const I18N = {
|
||||
"grp.suggest.yes": "Create group …", "grp.suggest.no": "No thanks", "grp.suggest.name": "Tour {date}",
|
||||
"cmb.title": "Put “{name}” together",
|
||||
"cmb.hint": "All rooms of one recording session become one scene: a full version for the PC and a smaller one for the Frame. Afterwards the group shows how well the overlaps match – try another correction any time; the previous result stays until the new one is done.",
|
||||
"cmb.hint.room": "All recordings of this room become one scene: a full version for the PC and a smaller one for the Frame. Every place comes from a recording that really has it, and all recordings are brought to one brightness. Afterwards the room shows how well the recordings match – try another correction any time; the previous result stays until the new one is done.",
|
||||
"cmb.align": "Correction",
|
||||
"cmb.align.frame": "A – Frame only", "cmb.align.frame.text": "As the pipeline delivers the rooms (aligned on their first image). For comparison.",
|
||||
"cmb.align.images": "B – all images (recommended)", "cmb.align.images.text": "Every room fitted to the Frame's movement over all its images. Safe, no surprises.",
|
||||
@@ -196,6 +222,7 @@ const I18N = {
|
||||
"cmb.upload": "Copy to the Frame afterwards", "cmb.start": "Put together", "cmb.started": "Putting it together …",
|
||||
"cphase.0": "Aligning", "cphase.1": "Assembling", "cphase.2": "Reducing", "cphase.3": "Converting",
|
||||
"job.sub.combine": "{n} scenes · correction {align} · {target} · for {time}",
|
||||
"job.sub.combine.room": "{n} recordings of one room · correction {align} · {target} · for {time}",
|
||||
"err.in_other_group": "“{group}” already contains one of these scenes",
|
||||
"err.combine_too_few": "Putting together needs at least two finished scenes",
|
||||
"scale.button.title": "Scale – for models, e.g. a model railway", "scale.title": "Scale of “{name}”",
|
||||
@@ -207,13 +234,22 @@ const I18N = {
|
||||
"ver.button": "Versions ({n})", "ver.button.title": "Versions with fewer splats for the Frame or all splats for the PC – several side by side",
|
||||
"ver.title": "Versions of “{name}” ({n} splats)",
|
||||
"ver.hint": "Every version is its own scene and gets its own place in the Frame's gallery – e.g. 0.75 M and 2 M side by side to compare.",
|
||||
"ver.new": "New versions", "ver.frame": "For the Frame", "ver.pc": "For the PC", "ver.custom": "Own size", "ver.million": "million splats",
|
||||
"ver.new": "New version", "ver.custom": "Own size", "ver.million": "million splats",
|
||||
"ver.scales": "Scale", "ver.walk": "walk through it ({ratio})", "ver.all": "all splats",
|
||||
"ver.measured": "Measured on a Steam Frame (Gaussian XR, 10/2026): 0.57 M ≈ 36 fps, 2 M ≈ 23 fps, 5 M ≈ 14 fps.",
|
||||
"ver.make": "Make versions", "ver.pick": "Pick at least one size", "ver.started": "Making versions …",
|
||||
"ver.measured": "Measured on a Steam Frame (Gaussian XR, 10/2026): 0.75 M ≈ 36 fps, 1 M ≈ 35 fps, 1.5 M ≈ 29 fps, 2 M ≈ 24 fps, 5 M ≈ 14 fps.",
|
||||
"ver.for": "For", "ver.for.frame": "🥽 the Frame (headset)", "ver.for.pc": "🖥️ the PC (all splats, e.g. Spirula Studio)",
|
||||
"ver.size.head": "Size", "ver.fps.0_75": "≈ {fps} fps", "ver.fps.1": "≈ {fps} fps, clearly sharper", "ver.fps.1_5": "≈ {fps} fps, a little unsteady", "ver.fps.2": "≈ {fps} fps",
|
||||
"ver.plain": "Also make it without cleaning up, to compare",
|
||||
"ver.clean.none": "not cleaned up", "ver.slow": "{n} M splats: on the Frame only about 14 fps",
|
||||
"ver.template": "As template", "ver.template.title": "Put this version's settings into the form below – change one slider and make the next one",
|
||||
"ver.template.done": "Settings taken over – change what you want to compare",
|
||||
"ver.replaces": "{what} (replaces the existing one)", "ver.same.all": "All splats without cleaning up is the scene itself – open it in Spirula from the scene, or set a slider.",
|
||||
"ver.makes.1": "Makes:", "ver.makes.n": "Makes {n} versions:", "ver.make.1": "Make version", "ver.make.n": "Make {n} versions",
|
||||
"ver.show": "▸ Show {n} versions", "ver.first": "+ Versions …", "ver.show.1": "▸ Show 1 version", "ver.new.button": "+ New version …", "ver.hide": "▾ Hide versions", "ver.of": "Versions of “{name}”",
|
||||
"ver.pick": "Enter a size (at least 0.01 million)", "ver.started": "Making versions …",
|
||||
"ver.none": "No versions yet.", "ver.stale": "older than the scene", "ver.delete": "Delete version",
|
||||
"ver.confirm": "Move the version “{name}” ({size}) to the trash? A copy on the Frame is not touched.",
|
||||
"job.sub.versions": "{n} versions · for {time}", "err.no_version": "This version does not exist",
|
||||
"job.sub.versions": "{n} versions · for {time}", "job.sub.versions.1": "1 version · for {time}", "err.no_version": "This version does not exist",
|
||||
"err.no_versions": "Pick at least one size",
|
||||
"ver.unframe": "Off the Frame", "ver.unframe.title": "Remove this version from the Frame's gallery (it stays on the PC)",
|
||||
"ver.unframe.confirm": "Remove “{name}” from the Frame? Its folder in the gallery and the backup copy on the Frame are deleted; the version stays on this PC.",
|
||||
@@ -232,6 +268,42 @@ const I18N = {
|
||||
"fg.move.hint": "{n} scene(s) from Splat Workshop are still in Gaussian XR's own folder, where a Steam update can delete them.",
|
||||
"fg.move": "Move to own scenes", "fg.moved": "Moved to the own scenes on the Frame",
|
||||
"ver.recommended": "(recommended)",
|
||||
"update.text": "🎉 Splat Workshop {latest} is out (you have {current}).", "update.notes": "What's new",
|
||||
"update.later": "Later", "update.text.plain": "Splat Workshop {latest} is out", "update.none": "You have the newest version ({current})",
|
||||
"update.offline": "GitHub could not be reached – try again later", "foot.version": "Splat Workshop {v}", "foot.releases": "Releases",
|
||||
"foot.check": "Check for updates", "sc.uploading.pct": "Copying to the Frame … {pct} % ({done} of {total})", "update.how": "To update: run {cmd} in the Splat Workshop folder, then quit Splat Workshop (tray icon → Quit) and start it again. Your config and scenes stay.",
|
||||
"imp.button": "+ Import a splat …", "imp.button.title": "A splat file from another program as a scene",
|
||||
"imp.title": "Import a splat", "imp.hint": "A splat file from another program becomes a scene like the others. The file itself is not changed.",
|
||||
"imp.pick": "Choose file …", "imp.none": "No file chosen (.ply, .sog, .spz, .splat, .ksplat)", "imp.name": "Name",
|
||||
"imp.up": "Which way is up in the file?",
|
||||
"imp.up.y-down": "Y down (usual)", "imp.up.y-down.text": "Spirula Studio, COLMAP and most tools built on it – like the Frame's own scenes",
|
||||
"imp.up.y-up": "Y up", "imp.up.y-up.text": "If the scene stands upside down on the Frame",
|
||||
"imp.up.z-up": "Z up", "imp.up.z-up.text": "If the scene lies on its side on the Frame (e.g. from Blender)",
|
||||
"imp.scale": "Size × ", "imp.scale.hint": "1 = as in the file; 0.01 if it is in centimetres. Photo reconstructions have no real scale – try it on the Frame.",
|
||||
"imp.make": "Import", "imp.started": "Importing …", "job.sub.import": "Import · for {time}",
|
||||
"err.import_file": "Choose a splat file (.ply, .sog, .spz, .splat, .ksplat)",
|
||||
"mesh.button": "Mesh …", "mesh.button.has": "Mesh ✓", "mesh.button.title": "A mesh (surface) for 3D programs and 3D printing",
|
||||
"mesh.title": "Mesh of “{name}”",
|
||||
"mesh.hint": "Spirula Studio turns the splats into a surface – for Blender and other 3D programs or for 3D printing. It stands upright (the way Blender & co. expect each format) with the floor at height 0; what lies well outside the room is left out. In metres.",
|
||||
"mesh.new": "New mesh", "mesh.have": "Mesh", "mesh.make": "Make mesh", "mesh.pick": "Pick at least one format",
|
||||
"mesh.started": "Making the mesh …", "mesh.delete": "Delete the mesh",
|
||||
"mesh.confirm": "Move the mesh of “{name}” to the trash?",
|
||||
"mesh.f.glb": "GLB (recommended)", "mesh.f.glb.text": "With colours or texture, one file – Blender, Windows 3D viewer, the web",
|
||||
"mesh.f.stl": "STL", "mesh.f.stl.text": "No colours – slicers for 3D printing",
|
||||
"mesh.f.obj": "OBJ", "mesh.f.obj.text": "With a texture (if possible), otherwise without colours – nearly every 3D program",
|
||||
"mesh.f.ply": "PLY", "mesh.f.ply.text": "Colours per corner – MeshLab, CloudCompare",
|
||||
"mesh.texture": "With a texture from the training images (sharper colours, takes a little longer)",
|
||||
"mesh.texture.none": "No texture possible: the training images were cleaned up – colours per corner from the splats",
|
||||
"mesh.time": "Takes a few minutes and about 4 GB of memory; a new mesh replaces the old one.",
|
||||
"mesh.download.title": "Download this file (also from other devices at home)", "mesh.blender": "Open in Blender",
|
||||
"mesh.blender.starting": "Blender is starting …", "err.no_blender": "Blender is not installed",
|
||||
"job.sub.mesh": "Mesh · for {time}", "res.ok.mesh": "Done – the mesh of “{name}” is in {path}.", "err.no_mesh": "There is no mesh",
|
||||
"ver.clean": "Clean up", "ver.clean.off": "off",
|
||||
"ver.clean.hint": "Experimental. The scene itself stays as it is; only this version is cleaned up – compare it with one without.",
|
||||
"ver.clean.ceiling": "Ceiling", "ver.clean.ceiling.title": "A white ceiling gives the reconstruction nothing to hold on to: it stays thin, with a dark veil under it. Takes out the veil (deeper with more strength; dark things within 50 cm of a wall stay) and what lies above the ceiling, and puts in a closed ceiling in its own colour.",
|
||||
"ver.clean.floor": "Floor", "ver.clean.floor.title": "Fills holes in the floor in the colour of the floor around them (more holes count with more strength) and takes out what lies under the floor.",
|
||||
"ver.clean.haze": "Haze", "ver.clean.haze.title": "Takes out big, nearly transparent blobs floating in the room. Long thin things (bars, cables, wires) are no haze and stay. At full strength smaller and less transparent blobs go, too.",
|
||||
"ver.clean.outside": "Edges", "ver.clean.outside.title": "Takes out what lies well outside the room: beyond the walls, above the ceiling, under the floor – from 1 m beyond them to 30 cm at full strength. Also the view through a window.",
|
||||
"err.mixed_scale": "These scenes have different scales – set one scale for the group", "err.plan_failed": "The floor plan could not be drawn", "sc.replacing": "Being computed again – stays until the new one is done", "err.plan_busy": "Other floor plans are being drawn right now, try again in a moment",
|
||||
"plan.measure": "📏 Measure", "plan.measure.title": "Measure distances in the floor plan",
|
||||
"plan.measure.hint": "Click to set points · right-click removes the last one · horizontal distances, about ±5 cm",
|
||||
@@ -262,9 +334,14 @@ const I18N = {
|
||||
"setup.hint": "Die Einstellungen stehen in {file}. Nach Änderungen die Splat-Werkstatt neu starten.",
|
||||
"setup.pipeline": "Arcturus-Pipeline nicht gefunden in {path} (av1_to_3dgs.py). Download: arcturus.vision/apps.",
|
||||
"setup.spirula": "Spirula Studio nicht gefunden unter {path}. Bauen wie in der Pipeline-README beschrieben.",
|
||||
"setup.splat_transform": "splat-transform fehlt – installieren mit: npm install -g @playcanvas/splat-transform",
|
||||
"setup.splat_transform": "splat-transform nicht gefunden. Installieren (ohne root: npm install -g --prefix ~/.local @playcanvas/splat-transform) und den vollen Pfad in {file} eintragen, z. B. splat_transform = \"/home/du/.local/bin/splat-transform\" – vom Desktop gestartet sieht die Splat-Werkstatt keinen PATH aus .bashrc oder .zshrc.",
|
||||
"setup.unknown_key": "Unbekannte Einstellung „{key}“ in {file} – meintest du „{suggestion}“? (Die Splat-Werkstatt ignoriert sie.)",
|
||||
"setup.unknown_key.plain": "Unbekannte Einstellung „{key}“ in {file} – die Splat-Werkstatt ignoriert sie.",
|
||||
"setup.pyav": "Die Arcturus-Pipeline in {path} wird mit „unexpected keyword argument 'metadata_errors'“ scheitern (PyAV 19). Im # /// script-Kopf von {files} \"av>=18.1\" in \"av>=18.1,<19\" ändern – siehe Troubleshooting in docs/arcturus-setup.md.",
|
||||
"setup.tool": "{tool} ist nicht installiert.",
|
||||
"job.cancel": "Abbrechen", "job.dismiss": "Ausblenden", "job.log": "Protokoll",
|
||||
"job.standby": "💤 Danach in den Standby", "job.standby.in": "💤 Standby in {s} s",
|
||||
"job.standby.title": "Wenn alles fertig ist (auch die weiteren Teile, das Zusammensetzen, das Kopieren auf die Frame), geht der PC nach einer Minute Vorwarnung in den Standby. Abbrechen eines Jobs schaltet das aus.",
|
||||
"job.psnr": "Bildqualität (PSNR) im Training",
|
||||
"job.sub": "{rec} · {q} · {target} · seit {time}", "job.toFrame": "→ Frame", "job.pcOnly": "nur PC",
|
||||
"job.left": " · noch ca. {time}",
|
||||
@@ -277,6 +354,7 @@ const I18N = {
|
||||
"res.cancelled": "Abgebrochen. Mit gleichem Namen erneut starten und „Fortsetzen“ wählen, um weiterzumachen.",
|
||||
"res.upload_failed": "Die Szene ist fertig gerechnet, aber das Kopieren auf die Frame hat nicht geklappt (Frame aus?). In der Liste der fertigen Szenen „Auf die Frame“ nutzen, sobald sie an ist.",
|
||||
"res.failed": "Fehlgeschlagen – die letzten Zeilen im Protokoll zeigen warum.",
|
||||
"hint.pyav": "Fehlgeschlagen: Die Arcturus-Pipeline läuft nicht mit PyAV 19 („unexpected keyword argument 'metadata_errors'“). Im # /// script-Kopf von av1_to_3dgs.py und av1_colmap.py \"av>=18.1\" in \"av>=18.1,<19\" ändern und fortsetzen – siehe Troubleshooting in docs/arcturus-setup.md.",
|
||||
"confirm.cancel": "Umwandlung wirklich abbrechen? Mit „Fortsetzen“ geht es später ab dem letzten Zwischenstand weiter.",
|
||||
"s1.title": "Aufnahme wählen", "tab.frame": "Auf der Frame", "tab.local": "Auf dem PC",
|
||||
"dl.all": "Alle holen ({n} · {size})", "dl.all.title": "Alle Aufnahmen, die noch nicht auf dem PC sind, nacheinander holen",
|
||||
@@ -345,6 +423,19 @@ const I18N = {
|
||||
"t.frame": "Gaussian-XR-Galerie auf der Frame", "t.frame.sub": "Wird nach dem Rechnen automatisch kopiert, mit Vorschaubild und Namensschild",
|
||||
"t.pc": "Nur auf dem PC", "t.pc.sub": "Ergebnis bleibt im runs-Ordner – z. B. zum Ansehen in Spirula",
|
||||
"t.offline": "Die Frame ist gerade nicht erreichbar. Gerechnet wird trotzdem – sie muss nur am Ende eingeschaltet sein.",
|
||||
"split": "Lange Aufnahme",
|
||||
"split.parts": "Video aufteilen in Teile:",
|
||||
"split.parts.pro": "mehr Detail: {rate} statt {whole} Bildpaare pro Sekunde ({pairs} je Teil à {len})",
|
||||
"split.parts.con": "dauert etwa {n}-mal so lange; danach werden die Teile automatisch zu einem Raum zusammengesetzt (wo sie sich treffen, sind kleine Nähte möglich)",
|
||||
"split.whole": "Video nicht aufteilen",
|
||||
"split.whole.pro": "schneller fertig, eine einzige Umwandlung, keine Nähte zwischen Teilen",
|
||||
"split.whole.con": "nur {rate} statt {full} Bildpaare pro Sekunde – die Pipeline nimmt höchstens 500 pro Aufnahme, feine Details gehen eher verloren",
|
||||
"est.parts": "{n} Teile × etwa {frames} Bildpaare · bis {maxg} Mio. Splats · {iter}k Schritte · zusammen etwa {mins} min",
|
||||
"started.parts": "Gestartet – {n} Teile nacheinander, danach werden sie ein Raum",
|
||||
"job.sub.part": "Teil {i} von {n} von „{room}“ · {q} · {time}",
|
||||
"err.parts_too_short": "Die Teile wären kürzer als {secs} s – weniger Teile wählen",
|
||||
"err.recording_has_parts": "Aus dieser Aufnahme sind {n} Szenen geschnitten (z. B. „{name}“) – sie ist ihr Original: Damit lassen sich die Schnitte wiederholen (neu rechnen, fortsetzen).",
|
||||
"rdel.parts.confirm": "Trotzdem löschen? Die fertigen Szenen bleiben; ohne das Original lassen sich ihre Teile aber nicht mehr neu schneiden.",
|
||||
"start": "Umwandlung starten", "est.none": "Erst eine Aufnahme wählen.", "est.busy": "Es läuft schon eine Umwandlung.",
|
||||
"est": "{frames} Bildpaare · {maxg} Mio. Splats · {iter}k Schritte · <b>ca. {mins} min</b> <span class=\"faint\">(grobe Schätzung)</span>",
|
||||
"started": "Umwandlung gestartet", "unusable": "Die Aufnahme ist so nicht verwendbar",
|
||||
@@ -408,7 +499,13 @@ const I18N = {
|
||||
"grp.new": "+ Gruppe", "grp.new.tip": "Szenen in einer Gruppe zusammenfassen, z. B. alle Räume einer Wohnung",
|
||||
"grp.new.title": "Neue Gruppe", "grp.edit.title": "Gruppe bearbeiten", "grp.name": "Name", "grp.pick": "Szenen in dieser Gruppe",
|
||||
"grp.noFree": "Alle Szenen sind schon in einer Gruppe – eine Szene kann nur in einer sein.", "grp.save": "Speichern", "grp.cancel": "Abbrechen",
|
||||
"grp.rooms": "{n} Szenen", "grp.show": "▸ {n} Szenen zeigen", "grp.hide": "▾ Szenen ausblenden",
|
||||
"grp.room": "Ein Raum aus mehreren Aufnahmen",
|
||||
"grp.room.hint": "z. B. zwei kurze Runden durchs Wohnzimmer. Beim Zusammensetzen kommt jeder Teil aus der Aufnahme, die ihn am besten gesehen hat. Ein Raum kann Teil einer Wohnungs-Gruppe sein.",
|
||||
"grp.room.recordings": "{n} Aufnahmen", "grp.home.count": "{rooms} Räume aus {n} Aufnahmen",
|
||||
"grp.room.combine": "Raum zusammensetzen …",
|
||||
"err.room_in_group": "Das ist ein Raum von „{group}“ – erst dort herausnehmen",
|
||||
"grp.rooms": "{n} Szenen", "grp.show": "▸ {n} Szenen zeigen", "grp.hide": "▾ Ausblenden",
|
||||
"grp.show.rooms": "▸ {n} Räume zeigen", "grp.show.recordings": "▸ {n} Aufnahmen zeigen",
|
||||
"grp.combine": "Rundgang zusammensetzen …", "grp.recombine": "Neu zusammensetzen …", "grp.busy": "Wird gerade zusammengesetzt …",
|
||||
"grp.none": "Noch nicht zusammengesetzt.",
|
||||
"grp.tour": "Rundgang: Frame {frame} ({fsize}){full}", "grp.tour.full": " · voll {n} ({size})",
|
||||
@@ -420,6 +517,7 @@ const I18N = {
|
||||
"grp.suggest": "Diese {n} Szenen vom {date} wurden direkt nacheinander aufgenommen: {names}. Als Gruppe zusammenfassen?",
|
||||
"grp.suggest.yes": "Gruppe anlegen …", "grp.suggest.no": "Nein danke", "grp.suggest.name": "Rundgang {date}",
|
||||
"cmb.title": "„{name}“ zusammensetzen",
|
||||
"cmb.hint.room": "Alle Aufnahmen dieses Raums werden zu einer Szene: eine volle Fassung für den PC und eine kleinere für die Frame. Jede Stelle kommt von einer Aufnahme, die dort wirklich etwas hat, und alle Aufnahmen werden auf eine Helligkeit gebracht. Danach zeigt der Raum, wie gut die Aufnahmen zueinander passen – du kannst jederzeit eine andere Korrektur ausprobieren; das alte Ergebnis bleibt, bis das neue fertig ist.",
|
||||
"cmb.hint": "Alle Räume eines Aufnahmedurchgangs werden zu einer Szene: eine volle Fassung für den PC und eine kleinere für die Frame. Danach zeigt die Gruppe, wie gut die Übergänge passen – du kannst jederzeit eine andere Korrektur ausprobieren; das alte Ergebnis bleibt, bis das neue fertig ist.",
|
||||
"cmb.align": "Korrektur",
|
||||
"cmb.align.frame": "A – nur Frame", "cmb.align.frame.text": "So, wie die Pipeline die Räume liefert (am ersten Bild ausgerichtet). Zum Vergleich.",
|
||||
@@ -437,6 +535,7 @@ const I18N = {
|
||||
"cmb.upload": "Danach auf die Frame übertragen", "cmb.start": "Zusammensetzen", "cmb.started": "Wird zusammengesetzt …",
|
||||
"cphase.0": "Ausrichten", "cphase.1": "Zusammenbauen", "cphase.2": "Verkleinern", "cphase.3": "Umwandeln",
|
||||
"job.sub.combine": "{n} Szenen · Korrektur {align} · {target} · seit {time}",
|
||||
"job.sub.combine.room": "{n} Aufnahmen eines Raums · Korrektur {align} · {target} · seit {time}",
|
||||
"err.in_other_group": "„{group}“ enthält schon eine dieser Szenen",
|
||||
"err.combine_too_few": "Zum Zusammensetzen braucht es mindestens zwei fertige Szenen",
|
||||
"scale.button.title": "Maßstab – für Modelle, z. B. eine Modelleisenbahn", "scale.title": "Maßstab von „{name}“",
|
||||
@@ -448,13 +547,22 @@ const I18N = {
|
||||
"ver.button": "Fassungen ({n})", "ver.button.title": "Fassungen mit weniger Splats für die Frame oder allen Splats für den PC – mehrere nebeneinander",
|
||||
"ver.title": "Fassungen von „{name}“ ({n} Splats)",
|
||||
"ver.hint": "Jede Fassung ist eine eigene Szene und bekommt einen eigenen Platz in der Galerie der Frame – z. B. 0,75 Mio. und 2 Mio. nebeneinander zum Vergleichen.",
|
||||
"ver.new": "Neue Fassungen", "ver.frame": "Für die Frame", "ver.pc": "Für den PC", "ver.custom": "Eigene Größe", "ver.million": "Mio. Splats",
|
||||
"ver.new": "Neue Fassung", "ver.custom": "Eigene Größe", "ver.million": "Mio. Splats",
|
||||
"ver.scales": "Maßstab", "ver.walk": "begehbar ({ratio})", "ver.all": "alle Splats",
|
||||
"ver.measured": "Gemessen auf einer Steam Frame (Gaussian XR, 10/2026): 0,57 Mio. ≈ 36 fps, 2 Mio. ≈ 23 fps, 5 Mio. ≈ 14 fps.",
|
||||
"ver.make": "Fassungen erstellen", "ver.pick": "Mindestens eine Größe wählen", "ver.started": "Erstelle Fassungen …",
|
||||
"ver.measured": "Gemessen auf einer Steam Frame (Gaussian XR, 10/2026): 0,75 Mio. ≈ 36 fps, 1 Mio. ≈ 35 fps, 1,5 Mio. ≈ 29 fps, 2 Mio. ≈ 24 fps, 5 Mio. ≈ 14 fps.",
|
||||
"ver.for": "Wofür", "ver.for.frame": "🥽 die Frame (Brille)", "ver.for.pc": "🖥️ den PC (alle Splats, z. B. Spirula Studio)",
|
||||
"ver.size.head": "Größe", "ver.fps.0_75": "≈ {fps} fps", "ver.fps.1": "≈ {fps} fps, deutlich schärfer", "ver.fps.1_5": "≈ {fps} fps, leicht unruhig", "ver.fps.2": "≈ {fps} fps",
|
||||
"ver.plain": "Zusätzlich ohne Bereinigung erstellen, zum Vergleichen",
|
||||
"ver.clean.none": "nicht bereinigt", "ver.slow": "{n} Mio. Splats: auf der Frame nur etwa 14 fps",
|
||||
"ver.template": "Als Vorlage", "ver.template.title": "Die Einstellungen dieser Fassung ins Formular unten übernehmen – einen Regler ändern und die nächste erstellen",
|
||||
"ver.template.done": "Einstellungen übernommen – ändere, was du vergleichen willst",
|
||||
"ver.replaces": "{what} (ersetzt die vorhandene)", "ver.same.all": "Alle Splats ohne Bereinigung ist die Szene selbst – öffne sie bei der Szene in Spirula oder stell einen Regler.",
|
||||
"ver.makes.1": "Erstellt:", "ver.makes.n": "Erstellt {n} Fassungen:", "ver.make.1": "Fassung erstellen", "ver.make.n": "{n} Fassungen erstellen",
|
||||
"ver.show": "▸ {n} Fassungen zeigen", "ver.first": "+ Fassungen …", "ver.show.1": "▸ 1 Fassung zeigen", "ver.new.button": "+ Neue Fassung …", "ver.hide": "▾ Fassungen ausblenden", "ver.of": "Fassungen von „{name}“",
|
||||
"ver.pick": "Eine Größe angeben (mindestens 0,01 Mio.)", "ver.started": "Erstelle Fassungen …",
|
||||
"ver.none": "Noch keine Fassungen.", "ver.stale": "älter als die Szene", "ver.delete": "Fassung löschen",
|
||||
"ver.confirm": "Fassung „{name}“ ({size}) in den Papierkorb verschieben? Eine Kopie auf der Frame bleibt unberührt.",
|
||||
"job.sub.versions": "{n} Fassungen · seit {time}", "err.no_version": "Diese Fassung gibt es nicht",
|
||||
"job.sub.versions": "{n} Fassungen · seit {time}", "job.sub.versions.1": "1 Fassung · seit {time}", "err.no_version": "Diese Fassung gibt es nicht",
|
||||
"err.no_versions": "Mindestens eine Größe wählen",
|
||||
"ver.unframe": "Von der Frame nehmen", "ver.unframe.title": "Diese Fassung aus der Galerie der Frame entfernen (auf dem PC bleibt sie)",
|
||||
"ver.unframe.confirm": "„{name}“ von der Frame nehmen? Ihr Ordner in der Galerie und die Sicherungskopie auf der Frame werden gelöscht; auf dem PC bleibt die Fassung.",
|
||||
@@ -473,6 +581,42 @@ const I18N = {
|
||||
"fg.move.hint": "{n} Szene(n) aus der Werkstatt liegen noch im Ordner von Gaussian XR, wo ein Steam-Update sie löschen kann.",
|
||||
"fg.move": "Zu den eigenen Szenen verschieben", "fg.moved": "Zu den eigenen Szenen auf der Frame verschoben",
|
||||
"ver.recommended": "(empfohlen)",
|
||||
"update.text": "🎉 Die Splat-Werkstatt {latest} ist da (du hast {current}).", "update.notes": "Was ist neu",
|
||||
"update.later": "Später", "update.text.plain": "Die Splat-Werkstatt {latest} ist da", "update.none": "Du hast die neueste Version ({current})",
|
||||
"update.offline": "GitHub war nicht erreichbar – später noch einmal versuchen", "foot.version": "Splat-Werkstatt {v}", "foot.releases": "Versionen",
|
||||
"foot.check": "Nach Updates suchen", "sc.uploading.pct": "Wird auf die Frame übertragen … {pct} % ({done} von {total})", "update.how": "Zum Aktualisieren im Ordner der Splat-Werkstatt {cmd} ausführen, dann die Splat-Werkstatt beenden (Tray-Symbol → Beenden) und neu starten. Config und Szenen bleiben erhalten.",
|
||||
"imp.button": "+ Splat importieren …", "imp.button.title": "Eine Splat-Datei aus einem anderen Programm als Szene aufnehmen",
|
||||
"imp.title": "Splat importieren", "imp.hint": "Eine Splat-Datei aus einem anderen Programm wird zu einer Szene wie die anderen. Die Datei selbst bleibt unverändert.",
|
||||
"imp.pick": "Datei wählen …", "imp.none": "Keine Datei gewählt (.ply, .sog, .spz, .splat, .ksplat)", "imp.name": "Name",
|
||||
"imp.up": "Wo ist oben in der Datei?",
|
||||
"imp.up.y-down": "Y unten (üblich)", "imp.up.y-down.text": "Spirula Studio, COLMAP und die meisten Werkzeuge darauf – wie die Szenen der Frame selbst",
|
||||
"imp.up.y-up": "Y oben", "imp.up.y-up.text": "Wenn die Szene auf der Frame auf dem Kopf steht",
|
||||
"imp.up.z-up": "Z oben", "imp.up.z-up.text": "Wenn die Szene auf der Frame auf der Seite liegt (z. B. aus Blender)",
|
||||
"imp.scale": "Größe × ", "imp.scale.hint": "1 = wie in der Datei; 0,01, wenn sie in Zentimetern ist. Aus Fotos rekonstruierte Szenen haben keinen echten Maßstab – auf der Frame ausprobieren.",
|
||||
"imp.make": "Importieren", "imp.started": "Importiere …", "job.sub.import": "Import · seit {time}",
|
||||
"err.import_file": "Eine Splat-Datei wählen (.ply, .sog, .spz, .splat, .ksplat)",
|
||||
"mesh.button": "Mesh …", "mesh.button.has": "Mesh ✓", "mesh.button.title": "Ein Mesh (Oberfläche) für 3D-Programme und den 3D-Druck",
|
||||
"mesh.title": "Mesh von „{name}“",
|
||||
"mesh.hint": "Spirula Studio macht aus den Splats eine Oberfläche – für Blender und andere 3D-Programme oder für den 3D-Druck. Sie steht aufrecht (so, wie Blender & Co. jedes Format erwarten) mit dem Boden auf Höhe 0; was deutlich außerhalb des Raums liegt, bleibt weg. In Metern.",
|
||||
"mesh.new": "Neues Mesh", "mesh.have": "Mesh", "mesh.make": "Mesh erstellen", "mesh.pick": "Mindestens ein Format wählen",
|
||||
"mesh.started": "Erstelle das Mesh …", "mesh.delete": "Mesh löschen",
|
||||
"mesh.confirm": "Das Mesh von „{name}“ in den Papierkorb verschieben?",
|
||||
"mesh.f.glb": "GLB (empfohlen)", "mesh.f.glb.text": "Mit Farben oder Textur, eine Datei – Blender, Windows-3D-Viewer, Web",
|
||||
"mesh.f.stl": "STL", "mesh.f.stl.text": "Ohne Farben – Slicer für den 3D-Druck",
|
||||
"mesh.f.obj": "OBJ", "mesh.f.obj.text": "Mit Textur (wenn möglich), sonst ohne Farben – fast jedes 3D-Programm",
|
||||
"mesh.f.ply": "PLY", "mesh.f.ply.text": "Farben pro Ecke – MeshLab, CloudCompare",
|
||||
"mesh.texture": "Mit Textur aus den Trainingsbildern (schärfere Farben, dauert etwas länger)",
|
||||
"mesh.texture.none": "Keine Textur möglich: Die Trainingsbilder wurden aufgeräumt – Farben pro Ecke aus den Splats",
|
||||
"mesh.time": "Dauert ein paar Minuten und braucht etwa 4 GB Arbeitsspeicher; ein neues Mesh ersetzt das alte.",
|
||||
"mesh.download.title": "Diese Datei herunterladen (auch von anderen Geräten im Heimnetz)", "mesh.blender": "In Blender öffnen",
|
||||
"mesh.blender.starting": "Blender startet …", "err.no_blender": "Blender ist nicht installiert",
|
||||
"job.sub.mesh": "Mesh · seit {time}", "res.ok.mesh": "Fertig – das Mesh von „{name}“ liegt unter {path}.", "err.no_mesh": "Es gibt kein Mesh",
|
||||
"ver.clean": "Bereinigen", "ver.clean.off": "aus",
|
||||
"ver.clean.hint": "Experimentell. Die Szene selbst bleibt, wie sie ist; nur diese Fassung wird bereinigt – am besten neben einer ohne vergleichen.",
|
||||
"ver.clean.ceiling": "Decke", "ver.clean.ceiling.title": "Eine weiße Decke gibt der Rekonstruktion keinen Halt: Sie bleibt dünn, darunter hängt ein dunkler Schleier. Nimmt den Schleier heraus (je stärker, desto tiefer; Dunkles bis 50 cm an einer Wand bleibt) und was über der Decke liegt, und setzt eine geschlossene Decke in ihrer eigenen Farbe ein.",
|
||||
"ver.clean.floor": "Boden", "ver.clean.floor.title": "Füllt Löcher im Boden in der Farbe des Bodens drumherum (je stärker, desto mehr gilt als Loch) und nimmt heraus, was unter dem Boden liegt.",
|
||||
"ver.clean.haze": "Dunst", "ver.clean.haze.title": "Nimmt große, fast durchsichtige Wolken heraus, die im Raum schweben. Lange dünne Dinge (Gitter, Kabel, Drähte) sind kein Dunst und bleiben. Je stärker, desto kleinere und weniger durchsichtige Wolken gehen mit.",
|
||||
"ver.clean.outside": "Rand", "ver.clean.outside.title": "Nimmt heraus, was deutlich außerhalb des Raums liegt: hinter den Wänden, über der Decke, unter dem Boden – von 1 m Abstand bis 30 cm bei voller Stärke. Auch der Blick durchs Fenster.",
|
||||
"err.mixed_scale": "Die Szenen haben verschiedene Maßstäbe – einen Maßstab für die Gruppe setzen", "err.plan_failed": "Der Grundriss konnte nicht gezeichnet werden", "sc.replacing": "Wird neu gerechnet – bleibt, bis die neue fertig ist", "err.plan_busy": "Gerade werden andere Grundrisse gezeichnet, gleich noch einmal versuchen",
|
||||
"plan.measure": "📏 Messen", "plan.measure.title": "Abstände im Grundriss messen",
|
||||
"plan.measure.hint": "Klicken setzt Punkte · Rechtsklick nimmt den letzten zurück · waagerechte Abstände, etwa ±5 cm genau",
|
||||
|
||||
+493
-94
@@ -166,10 +166,28 @@ dialog::backdrop { background: rgba(0,0,0,.55); }
|
||||
.gmeta .warn { color: var(--warn); }
|
||||
.group .acts { display: flex; gap: 6px; margin-top: 8px; flex-wrap: wrap; }
|
||||
.group .ginner { margin-top: 12px; }
|
||||
.group .group { background: var(--panel); grid-column: 1 / -1; margin-bottom: 0; }
|
||||
.group .group .gthumb { width: 96px; height: 96px; font-size: 34px; }
|
||||
.suggest { border: 1px dashed var(--accent); border-radius: 12px; padding: 12px 14px; margin-bottom: 12px; font-size: 13.5px; }
|
||||
.suggest .row { margin-top: 8px; }
|
||||
dialog.wide { max-width: 560px; }
|
||||
.vgrid { display: grid; grid-template-columns: auto 1fr; gap: 8px 14px; align-items: center; font-size: 13.5px; }
|
||||
.vlist .vrow { display: flex; flex-wrap: wrap; gap: 6px 12px; align-items: center; justify-content: space-between; padding: 8px 0; border-bottom: 1px solid var(--line); }
|
||||
.vlist .vwhat { display: flex; flex-direction: column; gap: 2px; font-size: 13px; min-width: 0; }
|
||||
.vlist .vacts { display: flex; flex-wrap: wrap; gap: 6px; align-items: center; }
|
||||
.vinline { grid-column: 1 / -1; margin-top: 8px; padding: 8px 12px; border: 1px solid var(--line); border-radius: 10px; }
|
||||
.vinline .vhead { display: flex; justify-content: space-between; align-items: center; gap: 10px; font-size: 13px; }
|
||||
.scene .acts.rows { flex-direction: column; align-items: flex-start; gap: 6px; }
|
||||
.acts .arow { display: flex; gap: 6px; flex-wrap: wrap; }
|
||||
.acts .sep { width: 1px; align-self: stretch; margin: 2px 3px; background: var(--line); }
|
||||
.acts button.icon { min-width: 34px; }
|
||||
.toggles { display: flex; gap: 6px; margin-top: 6px; flex-wrap: wrap; }
|
||||
.toggles button.link { background: none; border-color: transparent; color: var(--muted, #9aa3b2); padding-left: 2px; padding-right: 8px; }
|
||||
.toggles button.link:hover { color: inherit; border-color: var(--line); }
|
||||
.vsizes { display: grid; grid-template-columns: repeat(auto-fill, minmax(150px, 1fr)); gap: 6px; }
|
||||
.vpreview { font-size: 13px; margin: 14px 0 0; min-height: 1.4em; }
|
||||
.cleanup .slide { display: grid; grid-template-columns: 7.5em 1fr 4.5em; gap: 10px; align-items: center; margin: 2px 0; }
|
||||
.cleanup .slide output { text-align: right; color: var(--muted, #9aa3b2); font-variant-numeric: tabular-nums; }
|
||||
.vgrid label.chk { display: inline-flex; gap: 5px; align-items: center; padding: 4px 9px; border: 1px solid var(--line); border-radius: 8px; }
|
||||
dialog select { background: var(--panel2); color: var(--text); border: 1px solid var(--line); border-radius: 8px; padding: 7px 10px; font: inherit; }
|
||||
dialog h3 { font-size: 13.5px; margin: 16px 0 8px; }
|
||||
@@ -205,6 +223,13 @@ dialog.plan { max-width: min(1200px, 94vw); width: 94vw; }
|
||||
.pick label span { color: var(--faint); font-size: 12px; margin-left: auto; }
|
||||
.pick input { accent-color: var(--accent); }
|
||||
#lanPill { cursor: pointer; } #lanPill:hover { color: var(--text); }
|
||||
.meshfiles { margin-top: 10px; }
|
||||
.meshfiles a.btnlink .faint { margin-left: 6px; }
|
||||
.foot { text-align: center; font-size: 12.5px; color: var(--muted, #9aa3b2); padding: 18px 16px 28px; }
|
||||
.foot a { color: inherit; }
|
||||
.update { border-color: color-mix(in srgb, var(--accent, #7c9cff) 45%, var(--line)); padding-top: 12px; padding-bottom: 12px; }
|
||||
.update code { background: var(--bg); padding: 1px 6px; border-radius: 6px; font-size: 13px; }
|
||||
a.btnlink { display: inline-flex; align-items: center; padding: 4px 10px; border: 1px solid var(--line); border-radius: 8px; color: inherit; text-decoration: none; font-size: 13px; }
|
||||
.setup { border-color: color-mix(in srgb, var(--warn) 45%, var(--line)); }
|
||||
.setup h2 { color: var(--warn); }
|
||||
.setup li { margin: 4px 0; font-size: 14px; }
|
||||
@@ -226,6 +251,14 @@ select.lang { font: inherit; font-size: 12.5px; color: var(--muted); background:
|
||||
<main>
|
||||
<div class="card offline-note hidden" id="offline" role="alert"><b data-i18n="offline.title"></b> <span class="muted" data-i18n="offline.text"></span></div>
|
||||
<!-- missing prerequisites -->
|
||||
<section class="card update hidden" id="updateCard">
|
||||
<div class="row" style="justify-content:space-between;gap:10px">
|
||||
<span id="updateText"></span>
|
||||
<span class="row" style="gap:6px"><a class="small btnlink" id="updateLink" target="_blank" rel="noopener" data-i18n="update.notes"></a>
|
||||
<button class="small" id="updateLater" data-i18n="update.later"></button></span>
|
||||
</div>
|
||||
<p class="faint" style="font-size:13px;margin:6px 0 0" id="updateHow"></p>
|
||||
</section>
|
||||
<section class="card setup hidden" id="setupCard">
|
||||
<h2 data-i18n="setup.title"></h2>
|
||||
<ul id="setupList"></ul>
|
||||
@@ -238,6 +271,7 @@ select.lang { font: inherit; font-size: 12.5px; color: var(--muted); background:
|
||||
<span class="title" id="jobName"></span>
|
||||
<span class="muted" id="jobSub"></span>
|
||||
<span class="spacer" style="flex:1"></span>
|
||||
<label class="chk" id="standbyBox" data-i18n-title="job.standby.title"><input type="checkbox" id="standbyChk"> <span id="standbyText" data-i18n="job.standby"></span></label>
|
||||
<button class="danger small" id="cancelBtn" data-i18n="job.cancel"></button>
|
||||
<button class="small hidden" id="dismissBtn" data-i18n="job.dismiss"></button>
|
||||
</div>
|
||||
@@ -253,6 +287,7 @@ select.lang { font: inherit; font-size: 12.5px; color: var(--muted); background:
|
||||
<defs><linearGradient id="g" x1="0" x2="0" y1="0" y2="1"><stop offset="0" stop-color="#7c9cff"/><stop offset="1" stop-color="#7c9cff" stop-opacity="0"/></linearGradient></defs></svg>
|
||||
</div>
|
||||
<div id="result" class="result hidden"></div>
|
||||
<div id="resultExtra" class="hidden"></div>
|
||||
<details style="margin-top:12px"><summary class="muted" style="cursor:pointer;font-size:13.5px" data-i18n="job.log"></summary><pre class="log" id="log"></pre></details>
|
||||
</section>
|
||||
|
||||
@@ -316,6 +351,16 @@ select.lang { font: inherit; font-size: 12.5px; color: var(--muted); background:
|
||||
<div><b data-i18n="t.pc"></b><span data-i18n="t.pc.sub"></span></div></label>
|
||||
</div>
|
||||
<div id="targetWarn" class="msg warn hidden" data-i18n="t.offline"></div>
|
||||
<div id="splitBox" class="hidden" style="margin-top:16px">
|
||||
<div class="field" style="margin-bottom:6px" data-i18n="split"></div>
|
||||
<div class="target">
|
||||
<label class="opt" id="optSplit"><input type="radio" name="split" value="parts">
|
||||
<div><b id="splitTitle"></b> <input type="number" id="splitN" min="2" max="10" step="1" style="width:58px;padding:3px 6px;margin:0 4px"><em id="splitRec" class="faint" style="font-size:12.5px;font-style:normal"></em>
|
||||
<span id="splitPro"></span><span id="splitCon"></span></div></label>
|
||||
<label class="opt" id="optWhole"><input type="radio" name="split" value="whole">
|
||||
<div><b data-i18n="split.whole"></b><span id="wholePro"></span><span id="wholeCon"></span></div></label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="startrow">
|
||||
@@ -328,7 +373,7 @@ select.lang { font: inherit; font-size: 12.5px; color: var(--muted); background:
|
||||
<section class="card">
|
||||
<div class="row" style="justify-content:space-between;margin-bottom:14px">
|
||||
<h2 data-i18n="scenes.title" style="margin:0"></h2>
|
||||
<div class="row"><button class="small" id="groupNewBtn" data-i18n="grp.new" data-i18n-title="grp.new.tip"></button></div>
|
||||
<div class="row"><button class="small pc-only" id="importBtn" data-i18n="imp.button" data-i18n-title="imp.button.title"></button><button class="small" id="groupNewBtn" data-i18n="grp.new" data-i18n-title="grp.new.tip"></button></div>
|
||||
</div>
|
||||
<div class="tabs" id="sceneTabs">
|
||||
<button class="tab active" data-stab="pc" data-i18n="stab.pc"></button>
|
||||
@@ -368,6 +413,9 @@ select.lang { font: inherit; font-size: 12.5px; color: var(--muted); background:
|
||||
<dialog id="groupDlg">
|
||||
<h2 style="margin-top:0" id="groupTitle"></h2>
|
||||
<label class="field"><span data-i18n="grp.name"></span><input id="groupName" type="text" maxlength="80" style="width:100%" autocomplete="off"></label>
|
||||
<label class="chk" style="display:flex;gap:8px;align-items:flex-start;margin:12px 0 0;font-size:14px">
|
||||
<input type="checkbox" id="groupRoom" style="margin-top:3px"><span><b data-i18n="grp.room"></b><br>
|
||||
<span class="faint" style="font-size:12.5px" data-i18n="grp.room.hint"></span></span></label>
|
||||
<p class="muted" style="font-size:13px;margin:12px 0 6px" data-i18n="grp.pick"></p>
|
||||
<div id="groupPick" class="pick"></div>
|
||||
<div class="row" style="justify-content:flex-end;margin-top:16px">
|
||||
@@ -378,7 +426,7 @@ select.lang { font: inherit; font-size: 12.5px; color: var(--muted); background:
|
||||
|
||||
<dialog id="combineDlg" class="wide">
|
||||
<h2 style="margin-top:0" id="cmbTitle"></h2>
|
||||
<p class="muted" style="font-size:13px;margin-top:0" data-i18n="cmb.hint"></p>
|
||||
<p class="muted" style="font-size:13px;margin-top:0" id="cmbHint"></p>
|
||||
<h3 data-i18n="cmb.align"></h3>
|
||||
<div class="opts" id="cmbAlign"></div>
|
||||
<h3 data-i18n="cmb.part"></h3>
|
||||
@@ -397,21 +445,53 @@ select.lang { font: inherit; font-size: 12.5px; color: var(--muted); background:
|
||||
</div>
|
||||
</dialog>
|
||||
|
||||
<dialog id="importDlg" class="wide">
|
||||
<h2 style="margin-top:0" data-i18n="imp.title"></h2>
|
||||
<p class="muted" style="font-size:13px;margin-top:0" data-i18n="imp.hint"></p>
|
||||
<div class="row" style="gap:8px"><button class="small" id="impPick" data-i18n="imp.pick"></button><span id="impFile" class="muted" style="overflow-wrap:anywhere"></span></div>
|
||||
<label class="row" style="gap:8px;margin-top:12px"><span data-i18n="imp.name"></span><input id="impName" type="text" style="flex:1"></label>
|
||||
<h3 data-i18n="imp.up"></h3>
|
||||
<div class="opts" id="impUp"></div>
|
||||
<label class="row" style="gap:8px;margin-top:12px"><span data-i18n="imp.scale"></span><input id="impScale" type="number" min="0.0001" max="10000" step="any" value="1" style="width:110px"><span class="faint" style="font-size:12.5px" data-i18n="imp.scale.hint"></span></label>
|
||||
<div class="row" style="justify-content:flex-end;margin-top:16px">
|
||||
<button id="impClose" data-i18n="clean.close"></button>
|
||||
<button class="primary" id="impMake" data-i18n="imp.make" disabled></button>
|
||||
</div>
|
||||
</dialog>
|
||||
<dialog id="meshDlg" class="wide">
|
||||
<h2 style="margin-top:0" id="meshTitle"></h2>
|
||||
<p class="muted" style="font-size:13px;margin-top:0" data-i18n="mesh.hint"></p>
|
||||
<div id="meshHave" class="vlist"></div>
|
||||
<h3 data-i18n="mesh.new"></h3>
|
||||
<div id="meshFormats" class="opts"></div>
|
||||
<label class="chk" id="meshTexBox" style="margin-top:10px"><input type="checkbox" id="meshTex"> <span id="meshTexText"></span></label>
|
||||
<p class="faint" style="font-size:12px;margin:10px 0 0" data-i18n="mesh.time"></p>
|
||||
<div class="row" style="justify-content:flex-end;margin-top:16px">
|
||||
<button id="meshClose" data-i18n="clean.close"></button>
|
||||
<button class="primary" id="meshMake" data-i18n="mesh.make"></button>
|
||||
</div>
|
||||
</dialog>
|
||||
<dialog id="verDlg" class="wide">
|
||||
<h2 style="margin-top:0" id="verTitle"></h2>
|
||||
<p class="muted" style="font-size:13px;margin-top:0" data-i18n="ver.hint"></p>
|
||||
<div id="verList" class="unfin"></div>
|
||||
<div id="verList" class="vlist"></div>
|
||||
<h3 data-i18n="ver.new"></h3>
|
||||
<div class="vgrid">
|
||||
<b data-i18n="ver.frame"></b><div class="row" id="verFrame"></div>
|
||||
<b data-i18n="ver.pc"></b><div class="row" id="verPc"></div>
|
||||
<b data-i18n="ver.custom"></b><label class="row" style="gap:6px"><input id="verCustom" type="number" min="0.1" max="50" step="0.05" style="width:90px"> <span data-i18n="ver.million"></span></label>
|
||||
<b data-i18n="ver.for"></b>
|
||||
<div class="row" id="verFor">
|
||||
<label class="chk"><input type="radio" name="verFor" value="frame" checked> <span data-i18n="ver.for.frame"></span></label>
|
||||
<label class="chk"><input type="radio" name="verFor" value="pc"> <span data-i18n="ver.for.pc"></span></label>
|
||||
</div>
|
||||
<b id="verSizeHead" data-i18n="ver.size.head"></b><div id="verSizes" class="vsizes"></div>
|
||||
<b class="hidden" id="verScaleHead" data-i18n="ver.scales"></b><div class="row hidden" id="verScales"></div>
|
||||
<b data-i18n="ver.clean"></b>
|
||||
<div><div id="verClean" class="cleanup"></div>
|
||||
<label class="chk hidden" id="verPlainBox" style="margin-top:6px"><input type="checkbox" id="verPlain"> <span data-i18n="ver.plain"></span></label></div>
|
||||
</div>
|
||||
<p class="faint" style="font-size:12px;margin:12px 0 0" data-i18n="ver.measured"></p>
|
||||
<div class="row" style="justify-content:flex-end;margin-top:16px">
|
||||
<p id="verPreview" class="vpreview"></p>
|
||||
<div class="row" style="justify-content:flex-end;margin-top:12px">
|
||||
<button id="verClose" data-i18n="clean.close"></button>
|
||||
<button class="primary" id="verMake" data-i18n="ver.make"></button>
|
||||
<button class="primary" id="verMake"></button>
|
||||
</div>
|
||||
</dialog>
|
||||
|
||||
@@ -472,6 +552,9 @@ select.lang { font: inherit; font-size: 12.5px; color: var(--muted); background:
|
||||
</dialog>
|
||||
<div class="toast" id="toast"></div>
|
||||
|
||||
<footer class="foot"><span id="footVersion"></span> · <a href="https://github.com/thunderheronight/splat-workshop" target="_blank" rel="noopener">GitHub</a>
|
||||
· <a href="https://github.com/thunderheronight/splat-workshop/releases" target="_blank" rel="noopener" data-i18n="foot.releases"></a>
|
||||
· <a href="#" id="footCheck" data-i18n="foot.check"></a></footer>
|
||||
<script src="/i18n.js"></script>
|
||||
<script>
|
||||
const $ = s => document.querySelector(s);
|
||||
@@ -525,6 +608,7 @@ function renderPing() {
|
||||
pill.classList.remove("hidden");
|
||||
pill.onclick = () => navigator.clipboard?.writeText(r.lan_url).then(() => toast(tr("copied")), () => toast(r.lan_url));
|
||||
}
|
||||
renderUpdate();
|
||||
if (r.problems && r.problems.length) {
|
||||
$("#setupCard").classList.remove("hidden");
|
||||
$("#setupList").innerHTML = r.problems.map(p => `<li>${esc(trErr(p))}</li>`).join("");
|
||||
@@ -532,6 +616,20 @@ function renderPing() {
|
||||
}
|
||||
}
|
||||
|
||||
// A newer release on GitHub (the server asks once a day, see check_updates in the config)
|
||||
function renderUpdate() {
|
||||
const u = (S.ping || {}).update;
|
||||
let later = "";
|
||||
try { later = localStorage.getItem("updateLater") || ""; } catch {}
|
||||
const show = !!u && later !== u.latest && !document.body.classList.contains("remote");
|
||||
$("#updateCard").classList.toggle("hidden", !show);
|
||||
if (!show) return;
|
||||
$("#updateText").innerHTML = tr("update.text", {latest: `<b>${esc(u.latest)}</b>`, current: esc(u.current)});
|
||||
$("#updateLink").href = u.url;
|
||||
$("#updateHow").innerHTML = tr("update.how", {cmd: "<code>git pull</code>"});
|
||||
$("#updateLater").onclick = () => { try { localStorage.setItem("updateLater", u.latest); } catch {} renderUpdate(); };
|
||||
}
|
||||
|
||||
/* ---------- recordings ---------- */
|
||||
async function loadRecs(refresh) {
|
||||
if (refresh) $("#recGrid").innerHTML = `<div class="empty">${tr("loading")}</div>`;
|
||||
@@ -713,7 +811,11 @@ async function deleteRecording(f) {
|
||||
const other = where === "frame" ? !!(f.local || loc) : !!(S.recs.frame || []).find(x => x.name === orig);
|
||||
const name = f.label || fmtDate(f.date) || f.name;
|
||||
if (!confirm(tr(`rdel.confirm.${where}${other ? "" : ".only"}`, {name, size: mb(f.size)}))) return;
|
||||
const r = await api("/api/recording/delete", {name: f.name, where});
|
||||
let r = await api("/api/recording/delete", {name: f.name, where});
|
||||
if (!r.ok && r.error && r.error.code === "err.recording_has_parts") { // the original of cut parts
|
||||
if (!confirm(trErr(r.error) + "\n\n" + tr("rdel.parts.confirm"))) return;
|
||||
r = await api("/api/recording/delete", {name: f.name, where, force: true});
|
||||
}
|
||||
if (!r.ok) { toast(trErr(r.error)); return; }
|
||||
toast(tr("rdel.done." + where, {name}));
|
||||
S.sel = null; S.probe = null; $("#checkRes").className = "hidden";
|
||||
@@ -803,19 +905,55 @@ function settings() {
|
||||
maxg: v("maxg") ? +v("maxg") : pre.maxg, iter: v("iter") ? +v("iter") : pre.iter, pre,
|
||||
};
|
||||
}
|
||||
/* ---------- a long recording in parts: each part gets up to 500 image pairs (the pipeline's limit) ---------- */
|
||||
const PAIR_RATE = {high: 5, max: 8}, PAIRS_MAX = 500;
|
||||
function splitInfo() {
|
||||
const d = S.probe && S.probe.ok ? S.probe.duration || 0 : 0, rate = PAIR_RATE[S.quality];
|
||||
if (!S.sel || !d || !rate || $("#frames").value.trim() || d * rate <= PAIRS_MAX) return null;
|
||||
const suggested = clamp(Math.ceil(d * rate / PAIRS_MAX), 2, 10);
|
||||
return {d, rate, suggested, max: Math.max(2, Math.min(10, Math.floor(d / 20)))};
|
||||
}
|
||||
function renderSplit() {
|
||||
const info = splitInfo();
|
||||
$("#splitBox").classList.toggle("hidden", !info);
|
||||
if (!info) { S.split = null; return; }
|
||||
const key = S.sel.name + "|" + S.quality;
|
||||
if (!S.split || S.split.key !== key) S.split = {key, parts: true, n: Math.min(info.suggested, info.max)};
|
||||
const n = S.split.n, part = info.d / n, perPart = Math.min(PAIRS_MAX, Math.round(part * info.rate));
|
||||
const rateParts = num(Math.min(info.rate, PAIRS_MAX / part), 1), rateWhole = num(PAIRS_MAX / info.d, 1);
|
||||
$("#splitN").value = n; $("#splitN").max = info.max;
|
||||
$("#splitTitle").textContent = tr("split.parts", {rec: ""}).trim();
|
||||
$("#splitPro").textContent = "+ " + tr("split.parts.pro", {rate: rateParts, whole: rateWhole, pairs: perPart, len: mmss(Math.round(part))});
|
||||
$("#splitRec").textContent = n === info.suggested ? tr("ver.recommended") : "";
|
||||
$("#splitCon").textContent = "- " + tr("split.parts.con", {n});
|
||||
$("#wholePro").textContent = "+ " + tr("split.whole.pro");
|
||||
$("#wholeCon").textContent = "- " + tr("split.whole.con", {rate: rateWhole, full: info.rate});
|
||||
$("#optSplit").classList.toggle("active", S.split.parts); $("#optWhole").classList.toggle("active", !S.split.parts);
|
||||
document.querySelector(`input[name=split][value=${S.split.parts ? "parts" : "whole"}]`).checked = true;
|
||||
}
|
||||
document.querySelectorAll("input[name=split]").forEach(r => r.onchange = () => { S.split.parts = r.value === "parts"; updateStart(); });
|
||||
$("#splitN").oninput = () => {
|
||||
const info = splitInfo(), n = parseInt($("#splitN").value, 10);
|
||||
if (info && n >= 2 && n <= info.max) { S.split.n = n; S.split.parts = true; updateStart(); }
|
||||
};
|
||||
$("#splitN").onclick = e => e.preventDefault(); // inside the label: typing, not choosing
|
||||
function updateStart() {
|
||||
renderSplit();
|
||||
const s = settings();
|
||||
for (const k of ["frames", "scale", "maxg", "iter"]) $("#" + k).placeholder = num(s.pre[k], k === "scale" || k === "maxg" ? 1 : 0);
|
||||
// rough time estimate (measured on an RTX 4070 SUPER: 30k steps, 2 M splats, full resolution ≈ 30 min;
|
||||
// preparation ≈ 2.5 s per image pair)
|
||||
const res = s.scale >= 1 ? 1 : s.scale >= 0.5 ? 0.33 + (s.scale - 0.5) * 1.34 : 0.2;
|
||||
const train = s.iter / 1000 * res * Math.pow(s.maxg / 2, 0.8);
|
||||
const total = Math.round(train + s.frames * 2.5 / 60 + 1);
|
||||
const parts = S.split && S.split.parts ? S.split.n : 1;
|
||||
const frames = parts > 1 ? Math.min(PAIRS_MAX, Math.round(S.probe.duration / parts * PAIR_RATE[S.quality])) : s.frames;
|
||||
const total = Math.round((train + frames * 2.5 / 60 + 1) * parts);
|
||||
const busy = S.job && S.job.running;
|
||||
const ready = S.sel && (!S.probe || S.probe.ok) && $("#name").value.trim();
|
||||
$("#startBtn").disabled = !ready || busy || !!(S.sel && queued(S.sel.name));
|
||||
$("#estimate").innerHTML = busy ? tr("est.busy") : !S.sel ? tr("est.none") :
|
||||
tr("est", {frames: s.frames, maxg: num(s.maxg, 1), iter: s.iter / 1000, mins: total});
|
||||
parts > 1 ? tr("est.parts", {n: parts, frames, maxg: num(s.maxg, 1), iter: s.iter / 1000, mins: total})
|
||||
: tr("est", {frames: s.frames, maxg: num(s.maxg, 1), iter: s.iter / 1000, mins: total});
|
||||
}
|
||||
document.querySelectorAll("#quality button").forEach(b => b.onclick = () => {
|
||||
S.quality = b.dataset.q; document.querySelectorAll("#quality button").forEach(x => x.classList.toggle("active", x === b)); updateStart();
|
||||
@@ -849,6 +987,12 @@ async function start(existing) {
|
||||
const v = id => $("#" + id).value.trim();
|
||||
const body = {path: S.sel.path, name: $("#name").value.trim(), quality: S.quality, upload: target() === "frame", existing,
|
||||
frames: v("frames") || null, scale: v("scale") || null, maxg: v("maxg") ? Math.round(+v("maxg") * 1e6) : null, iter: v("iter") || null};
|
||||
if (S.split && S.split.parts && !existing) { // in parts, then one room
|
||||
const r = await api("/api/parts", {...body, parts: S.split.n});
|
||||
if (!r.ok) { toast(trErr(r.error)); return; }
|
||||
S.dismissed = null; toast(tr("started.parts", {n: S.split.n})); poll(); window.scrollTo({top: 0, behavior: "smooth"});
|
||||
return;
|
||||
}
|
||||
const r = await api("/api/start", body);
|
||||
if (r.status === 409) {
|
||||
$("#existsText").textContent = tr(r.no_resume ? "exists.noresume." + r.no_resume : "exists.text", {name: body.name});
|
||||
@@ -867,18 +1011,29 @@ $("#cancelBtn").onclick = async () => {
|
||||
const r = await api("/api/cancel", {}); if (!r.ok) toast(trErr(r.error));
|
||||
};
|
||||
$("#dismissBtn").onclick = () => { S.dismissed = S.job?.out; renderJob(); };
|
||||
$("#standbyChk").onchange = async e => { S.standby = await api("/api/standby", {on: e.target.checked}); renderJob(); };
|
||||
function renderStandby() {
|
||||
const sb = S.standby || {}, j = S.job;
|
||||
$("#standbyChk").checked = !!sb.on;
|
||||
$("#standbyBox").classList.toggle("hidden", !(j && j.running) && !sb.on);
|
||||
$("#standbyText").textContent = sb.on && sb.at ? tr("job.standby.in", {s: Math.max(0, Math.round(sb.at - Date.now() / 1000))}) : tr("job.standby");
|
||||
}
|
||||
|
||||
/* ---------- current conversion ---------- */
|
||||
function renderJob() {
|
||||
const j = S.job, card = $("#jobCard");
|
||||
if (!j || (!j.running && S.dismissed === j.out)) { card.classList.add("hidden"); return; }
|
||||
card.classList.remove("hidden");
|
||||
renderStandby();
|
||||
$("#jobName").textContent = j.name;
|
||||
const qk = QUALITY_ALIAS[j.quality] || j.quality, combine = j.kind === "combine";
|
||||
const target = tr(j.upload ? "job.toFrame" : "job.pcOnly"), time = mins(Date.now() / 1000 - j.started);
|
||||
const versions = j.kind === "versions";
|
||||
$("#jobSub").textContent = versions ? tr("job.sub.versions", {n: (j.steps || []).length, time})
|
||||
: combine ? tr("job.sub.combine", {n: j.rooms, align: ALIGN_LETTER[j.quality] || "?", target, time})
|
||||
const versions = j.kind === "versions" || j.kind === "mesh" || j.kind === "import";
|
||||
$("#jobSub").textContent = j.kind === "mesh" ? tr("job.sub.mesh", {time}) : j.kind === "import" ? tr("job.sub.import", {time})
|
||||
: versions ? tr((j.steps || []).length === 1 ? "job.sub.versions.1" : "job.sub.versions", {n: (j.steps || []).length, time})
|
||||
: combine ? tr(j.rooms === 1 && j.recordings > 1 ? "job.sub.combine.room" : "job.sub.combine",
|
||||
{n: j.rooms === 1 && j.recordings > 1 ? j.recordings : j.rooms, align: ALIGN_LETTER[j.quality] || "?", target, time})
|
||||
: j.chain ? tr("job.sub.part", {i: j.chain.i + 1, n: j.chain.n, room: j.chain.room, q: tr("q." + qk), time})
|
||||
: tr("job.sub", {rec: j.recording, q: tr("q." + qk), target, time});
|
||||
$("#cancelBtn").classList.toggle("hidden", !j.running);
|
||||
$("#dismissBtn").classList.toggle("hidden", j.running);
|
||||
@@ -919,10 +1074,17 @@ function renderJob() {
|
||||
if (!j.running) {
|
||||
if (j.result === "ok") { res.className = "result ok";
|
||||
res.textContent = j.upload ? tr("res.ok.frame", {name: j.name, folder: i.folder ? " (" + i.folder + ")" : ""})
|
||||
: tr("res.ok.local", {name: j.name, path: "runs/" + j.slug}); }
|
||||
: tr(j.kind === "mesh" ? "res.ok.mesh" : "res.ok.local", {name: j.name, path: "runs/" + j.slug + (j.kind === "mesh" ? "/mesh" : "")}); }
|
||||
else if (j.result === "cancelled") { res.className = "result warn"; res.textContent = tr("res.cancelled"); }
|
||||
else if (j.phase === 4) { res.className = "result warn"; res.textContent = tr("res.upload_failed"); }
|
||||
else { res.className = "result bad"; res.textContent = tr("res.failed"); }
|
||||
else { res.className = "result bad"; res.textContent = i.hint ? tr(i.hint) : tr("res.failed"); }
|
||||
}
|
||||
// after a mesh: its files to download, Blender, the folder
|
||||
const extra = $("#resultExtra"), meshDone = !j.running && j.result === "ok" && j.kind === "mesh";
|
||||
extra.classList.toggle("hidden", !meshDone);
|
||||
if (meshDone && extra.dataset.for !== j.out) {
|
||||
extra.dataset.for = j.out;
|
||||
api("/api/mesh?slug=" + encodeURIComponent(j.slug)).then(m => { extra.innerHTML = meshFiles(j.slug, m); bindMeshFiles(extra, j.slug); });
|
||||
}
|
||||
const log = $("#log"), atBottom = log.scrollTop + log.clientHeight >= log.scrollHeight - 20;
|
||||
log.textContent = j.tail || ""; if (atBottom) log.scrollTop = log.scrollHeight;
|
||||
@@ -931,7 +1093,7 @@ function renderJob() {
|
||||
/* ---------- finished scenes ---------- */
|
||||
function frameState(s) {
|
||||
const u = s.upload;
|
||||
if (u && u.running) return `<div class="fstate">${tr("sc.uploading")}</div>`;
|
||||
if (u && u.running) return `<div class="fstate">${u.total ? tr("sc.uploading.pct", {pct: u.pct, done: mb(u.done), total: mb(u.total)}) : tr("sc.uploading")}</div>`;
|
||||
if (u && u.error) return `<div class="fstate err" title="${esc(u.error)}">${tr("sc.uploadFailed")}</div>`;
|
||||
if (s.on_frame === true) return `<div class="fstate yes">${tr("sc.onFrame")}</div>`;
|
||||
if (s.on_frame === false) return `<div class="fstate no">${tr("sc.notOnFrame")}</div>`;
|
||||
@@ -952,8 +1114,14 @@ function sceneCard(s) {
|
||||
${s.disk ? `<span class="faint">${tr("sc.disk", {size: mb(s.disk.total)})}</span>` : ""}
|
||||
${scaleLine(s)}
|
||||
${s.replacing ? `<div class="fstate faint">${tr("sc.replacing")}</div>` : frameState(s)}
|
||||
<div class="acts${s.replacing ? " hidden" : ""}">${uploadBtn(s)}${s.ply ? `<button class="small" data-plan="${esc(s.slug)}">${tr("sc.plan")}</button>` : ""}<button class="small pc-only" data-open="${esc(s.slug)}">${tr("sc.folder")}</button>${s.ply ? `<button class="small pc-only" data-spirula="${esc(s.slug)}" title="${tr("sc.spirula.title")}">${tr("sc.spirula")}</button>` : ""}<button class="small" data-rename="${esc(s.slug)}">${tr("ren.button")}</button><button class="small" data-scale="${esc(s.slug)}" title="${tr("scale.button.title")}">📏${s.scale !== 1 ? " " + ratioText(s.scale) : ""}</button><button class="small" data-versions="${esc(s.slug)}" title="${tr("ver.button.title")}">${tr("ver.button", {n: s.versions || 0})}</button><button class="small" data-clean="${esc(s.slug)}" title="${tr("sc.clean.title")}" aria-label="${tr("sc.clean.title")}">${tr("sc.clean")}</button><button class="small" data-delete="${esc(s.slug)}" title="${tr("sc.delete.title")}" aria-label="${tr("sc.delete.title")}">${tr("sc.delete")}</button></div>
|
||||
</div></div>`;
|
||||
<div class="acts rows${s.replacing ? " hidden" : ""}">
|
||||
${S.frameConfigured ? `<div class="arow">${uploadBtn(s)}</div>` : ""}
|
||||
<div class="arow">${s.ply ? `<button class="small pc-only" data-spirula="${esc(s.slug)}" title="${tr("sc.spirula.title")}">${tr("sc.spirula")}</button>` : ""}${s.ply ? `<button class="small" data-mesh="${esc(s.slug)}" title="${tr("mesh.button.title")}">${tr(s.mesh ? "mesh.button.has" : "mesh.button")}</button>` : ""}${s.ply ? `<button class="small" data-plan="${esc(s.slug)}">${tr("sc.plan")}</button>` : ""}<button class="small pc-only" data-open="${esc(s.slug)}">${tr("sc.folder")}</button></div>
|
||||
<div class="arow"><button class="small icon" data-rename="${esc(s.slug)}" title="${tr("ren.button")}" aria-label="${tr("ren.button")}">✎</button><button class="small icon" data-scale="${esc(s.slug)}" title="${tr("scale.button.title")}">📏${s.scale !== 1 ? " " + ratioText(s.scale) : ""}</button><button class="small icon" data-clean="${esc(s.slug)}" title="${tr("sc.clean.title")}" aria-label="${tr("sc.clean.title")}">${tr("sc.clean")}</button><button class="small icon" data-delete="${esc(s.slug)}" title="${tr("sc.delete.title")}" aria-label="${tr("sc.delete.title")}">${tr("sc.delete")}</button></div></div>
|
||||
<div class="toggles${s.replacing ? " hidden" : ""}">${versionsToggle(s.slug, s.versions)}</div>
|
||||
</div></div>
|
||||
${s.versions && versionsOpen(s.slug) ? `<div class="vinline"><div class="vhead"><b>${tr("ver.of", {name: esc(s.name)})}</b><button class="small" data-versions="${esc(s.slug)}">${tr("ver.new.button")}</button></div>
|
||||
<div class="vlist" data-vlist="${esc(s.slug)}"></div></div>` : ""}`;
|
||||
}
|
||||
const ALIGN_LETTER = {frame: "A", images: "B", shift: "C", rigid: "D"};
|
||||
function groupOpen(slug, set) {
|
||||
@@ -963,9 +1131,14 @@ function groupOpen(slug, set) {
|
||||
open = open.filter(x => x !== slug); if (set) open.push(slug);
|
||||
try { localStorage.setItem("openGroups", JSON.stringify(open)); } catch {}
|
||||
}
|
||||
function groupBlock(g, bySlug) {
|
||||
const rooms = g.members.map(m => bySlug[m]).filter(Boolean), r = g.result, open = groupOpen(g.slug);
|
||||
const disk = rooms.reduce((a, s) => a + (s.disk ? s.disk.total : 0), 0) + (r && r.disk ? r.disk.total : 0);
|
||||
function groupBlock(g, bySlug, byGroup) {
|
||||
const scenes = (g.scenes || g.members).map(m => bySlug[m]).filter(Boolean), r = g.result, open = groupOpen(g.slug);
|
||||
const inner = g.members.map(m => byGroup[m]).filter(Boolean); // rooms inside a home
|
||||
const own = g.members.map(m => bySlug[m]).filter(Boolean);
|
||||
const disk = scenes.reduce((a, s) => a + (s.disk ? s.disk.total : 0), 0) + (r && r.disk ? r.disk.total : 0)
|
||||
+ inner.reduce((a, x) => a + (x.result && x.result.disk ? x.result.disk.total : 0), 0);
|
||||
const count = g.room ? tr("grp.room.recordings", {n: scenes.length})
|
||||
: inner.length ? tr("grp.home.count", {rooms: g.rooms, n: scenes.length}) : tr("grp.rooms", {n: scenes.length});
|
||||
let tour = `<span>${tr("grp.none")}</span>`;
|
||||
if (r) {
|
||||
const frameN = Math.min(r.frame_splats || r.splats || 0, r.splats || 0), seams = Object.values(r.seams || {}).map(x => x.cm).sort((a, b) => a - b);
|
||||
@@ -979,35 +1152,50 @@ function groupBlock(g, bySlug) {
|
||||
}
|
||||
const thumb = r && r.preview ? `style="background-image:url('/api/preview?slug=${encodeURIComponent(g.slug)}&t=${r.mtime}')"` : "";
|
||||
const busy = g.busy ? `<span>${tr("grp.busy")}</span>` : "";
|
||||
return `<div class="group">
|
||||
const icon = g.room ? "🚪" : "📁";
|
||||
return `<div class="group${g.room ? " room" : ""}">
|
||||
<div class="ghead">
|
||||
<div class="gthumb" ${thumb}>${r && r.preview ? "" : "📁"}</div>
|
||||
<div class="gmeta"><b>📁 ${esc(g.name)}</b>
|
||||
<span>${tr("grp.rooms", {n: rooms.length})} · ${tr("sc.disk", {size: mb(disk)})}</span>
|
||||
<div class="gthumb" ${thumb}>${r && r.preview ? "" : icon}</div>
|
||||
<div class="gmeta"><b>${icon} ${esc(g.name)}</b>
|
||||
<span>${count} · ${tr("sc.disk", {size: mb(disk)})}</span>
|
||||
${scaleLine(g)}
|
||||
${tour}${busy}
|
||||
<div class="acts">
|
||||
<button class="small" data-gtoggle="${esc(g.slug)}" aria-expanded="${open}">${tr(open ? "grp.hide" : "grp.show", {n: rooms.length})}</button>
|
||||
<button class="small${!r || r.stale ? " primary" : ""}" data-combine="${esc(g.slug)}" ${g.busy || rooms.length < 2 ? "disabled" : ""}>${tr(r ? "grp.recombine" : "grp.combine")}</button>
|
||||
${r ? uploadBtn({slug: g.slug, on_frame: r.on_frame, upload: r.upload}) : ""}
|
||||
${rooms.some(s => s.ply) ? `<button class="small" data-gplan="${esc(g.slug)}">${tr("sc.plan")}</button>` : ""}
|
||||
<button class="small${!r || r.stale ? " primary" : ""}" data-combine="${esc(g.slug)}" ${g.busy || scenes.length < 2 ? "disabled" : ""}>${tr(r ? "grp.recombine" : g.room ? "grp.room.combine" : "grp.combine")}</button>
|
||||
${r ? uploadBtn({slug: g.slug, on_frame: r.on_frame, upload: r.upload}) : ""}<i class="sep"></i>
|
||||
${r && r.ply ? `<button class="small pc-only" data-spirula="${esc(g.slug)}" title="${tr("sc.spirula.title")}">${tr("sc.spirula")}</button>` : ""}
|
||||
${r ? `<button class="small pc-only" data-open="${esc(g.slug)}">${tr("sc.folder")}</button>` : ""}
|
||||
<button class="small" data-gedit="${esc(g.slug)}">${tr("grp.edit")}</button>
|
||||
<button class="small" data-scale="${esc(g.slug)}" title="${tr("scale.button.title")}" ${g.busy ? "disabled" : ""}>📏${g.scale !== 1 ? " " + ratioText(g.scale) : ""}</button>
|
||||
${r && r.ply ? `<button class="small" data-versions="${esc(g.slug)}" title="${tr("ver.button.title")}">${tr("ver.button", {n: g.versions || 0})}</button>` : ""}
|
||||
<button class="small" data-clean="${esc(g.slug)}" title="${tr("grp.clean.title")}" aria-label="${tr("grp.clean.title")}" ${g.busy ? "disabled" : ""}>${tr("sc.clean")}</button>
|
||||
<button class="small" data-gdelete="${esc(g.slug)}" title="${tr("grp.delete.title")}" aria-label="${tr("grp.delete.title")}">${tr("sc.delete")}</button>
|
||||
${r && r.ply ? `<button class="small" data-mesh="${esc(g.slug)}" title="${tr("mesh.button.title")}">${tr(g.mesh ? "mesh.button.has" : "mesh.button")}</button>` : ""}
|
||||
${scenes.some(s => s.ply) ? `<button class="small" data-gplan="${esc(g.slug)}">${tr("sc.plan")}</button>` : ""}
|
||||
${r ? `<button class="small pc-only" data-open="${esc(g.slug)}">${tr("sc.folder")}</button>` : ""}<i class="sep"></i>
|
||||
<button class="small icon" data-gedit="${esc(g.slug)}" title="${tr("grp.edit")}" aria-label="${tr("grp.edit")}">✎</button>
|
||||
<button class="small icon" data-scale="${esc(g.slug)}" title="${tr("scale.button.title")}" ${g.busy ? "disabled" : ""}>📏${g.scale !== 1 ? " " + ratioText(g.scale) : ""}</button>
|
||||
<button class="small icon" data-clean="${esc(g.slug)}" title="${tr("grp.clean.title")}" aria-label="${tr("grp.clean.title")}" ${g.busy ? "disabled" : ""}>${tr("sc.clean")}</button>
|
||||
<button class="small icon" data-gdelete="${esc(g.slug)}" title="${tr("grp.delete.title")}" aria-label="${tr("grp.delete.title")}">${tr("sc.delete")}</button>
|
||||
</div>
|
||||
<div class="toggles">
|
||||
<button class="small link" data-gtoggle="${esc(g.slug)}" aria-expanded="${open}">${tr(open ? "grp.hide" : g.room ? "grp.show.recordings" : inner.length ? "grp.show.rooms" : "grp.show", {n: inner.length + own.length})}</button>
|
||||
${r && r.ply ? versionsToggle(g.slug, g.versions) : ""}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
${open ? `<div class="grid ginner">${rooms.map(sceneCard).join("")}</div>` : ""}
|
||||
${g.versions && versionsOpen(g.slug) ? `<div class="vinline"><div class="vhead"><b>${tr("ver.of", {name: esc(g.name)})}</b><button class="small" data-versions="${esc(g.slug)}">${tr("ver.new.button")}</button></div>
|
||||
<div class="vlist" data-vlist="${esc(g.slug)}"></div></div>` : ""}
|
||||
${open ? `<div class="grid ginner">${inner.map(x => groupBlock(x, bySlug, byGroup)).join("")}${own.map(sceneCard).join("")}</div>` : ""}
|
||||
</div>`;
|
||||
}
|
||||
async function loadScenes() {
|
||||
const seq = S.sceneSeq = (S.sceneSeq || 0) + 1;
|
||||
const [list, gr] = await Promise.all([api("/api/scenes"), api("/api/groups")]);
|
||||
const arr = Array.isArray(list) ? list : Object.values(list).filter(x => x && typeof x === "object" && x.slug);
|
||||
S.scenes = arr; S.groups = gr.groups || []; S.memGB = gr.mem_available_gb;
|
||||
if (seq !== S.sceneSeq) return; // a newer load is on its way: its answer counts
|
||||
S.scenes = Array.isArray(list) ? list : Object.values(list).filter(x => x && typeof x === "object" && x.slug);
|
||||
S.sceneData = gr;
|
||||
renderScenes();
|
||||
}
|
||||
// Draws the list from what was loaded last – opening or closing a group or the versions needs no new
|
||||
// load (the scene list can take seconds on a slow disk; clicks during it used to toggle back and forth)
|
||||
function renderScenes() {
|
||||
const gr = S.sceneData || {}, arr = S.scenes || [];
|
||||
S.groups = gr.groups || []; S.memGB = gr.mem_available_gb;
|
||||
const bySlug = Object.fromEntries(arr.map(s => [s.slug, s]));
|
||||
const inGroup = new Set(S.groups.flatMap(g => g.members));
|
||||
$("#groupNewBtn").classList.toggle("hidden", !arr.some(s => !inGroup.has(s.slug)));
|
||||
@@ -1022,19 +1210,23 @@ async function loadScenes() {
|
||||
$("#sugYes").onclick = () => openGroupDlg(null, {members: sug.members, name: tr("grp.suggest.name", {date: day})});
|
||||
$("#sugNo").onclick = async () => { await api("/api/group/dismiss", {key: sug.key}); loadScenes(); };
|
||||
}
|
||||
$("#groupList").innerHTML = S.groups.map(g => groupBlock(g, bySlug)).join("");
|
||||
const byGroup = Object.fromEntries(S.groups.map(g => [g.slug, g]));
|
||||
$("#groupList").innerHTML = S.groups.filter(g => !g.parent).map(g => groupBlock(g, bySlug, byGroup)).join("");
|
||||
const loose = arr.filter(s => !inGroup.has(s.slug));
|
||||
$("#sceneGrid").innerHTML = loose.length ? loose.map(sceneCard).join("")
|
||||
: S.groups.length ? "" : `<div class="empty" style="grid-column:1/-1">${tr("scenes.none")}</div>`;
|
||||
document.querySelectorAll("[data-gtoggle]").forEach(b => b.onclick = () => { groupOpen(b.dataset.gtoggle, !groupOpen(b.dataset.gtoggle)); loadScenes(); });
|
||||
document.querySelectorAll("[data-gtoggle]").forEach(b => b.onclick = () => { groupOpen(b.dataset.gtoggle, !groupOpen(b.dataset.gtoggle)); renderScenes(); });
|
||||
document.querySelectorAll("[data-vtoggle]").forEach(b => b.onclick = () => { versionsOpen(b.dataset.vtoggle, !versionsOpen(b.dataset.vtoggle)); renderScenes(); });
|
||||
fillVersionLists();
|
||||
document.querySelectorAll("[data-scale]").forEach(b => b.onclick = () => openScale(b.dataset.scale));
|
||||
document.querySelectorAll("[data-versions]").forEach(b => b.onclick = () => openVersions(b.dataset.versions));
|
||||
document.querySelectorAll("[data-mesh]").forEach(b => b.onclick = () => openMesh(b.dataset.mesh));
|
||||
document.querySelectorAll("[data-gedit]").forEach(b => b.onclick = () => openGroupDlg(S.groups.find(g => g.slug === b.dataset.gedit)));
|
||||
document.querySelectorAll("[data-gdelete]").forEach(b => b.onclick = () => deleteGroup(S.groups.find(g => g.slug === b.dataset.gdelete)));
|
||||
document.querySelectorAll("[data-combine]").forEach(b => b.onclick = () => openCombine(S.groups.find(g => g.slug === b.dataset.combine)));
|
||||
document.querySelectorAll("[data-gplan]").forEach(b => b.onclick = () => {
|
||||
const g = S.groups.find(x => x.slug === b.dataset.gplan);
|
||||
openPlan(g.members.filter(m => bySlug[m] && bySlug[m].ply), g.name, g.slug);
|
||||
openPlan((g.scenes || g.members).filter(m => bySlug[m] && bySlug[m].ply), g.name, g.slug);
|
||||
});
|
||||
document.querySelectorAll("[data-upload]").forEach(b => b.onclick = async () => {
|
||||
const r = await api("/api/upload", {slug: b.dataset.upload});
|
||||
@@ -1095,15 +1287,29 @@ function openGroupDlg(g, preset) {
|
||||
(S.groups || []).forEach(x => { if (!g || x.slug !== g.slug) x.members.forEach(m => owner[m] = x.name); });
|
||||
$("#groupTitle").textContent = tr(g ? "grp.edit.title" : "grp.new.title");
|
||||
$("#groupName").value = g ? g.name : (preset && preset.name) || "";
|
||||
// One group per scene: scenes of other groups are not offered at all
|
||||
const free = S.scenes.filter(sc => !owner[sc.slug]);
|
||||
$("#groupPick").innerHTML = free.length ? free.map(sc => `<label><input type="checkbox" value="${esc(sc.slug)}" ${members.has(sc.slug) ? "checked" : ""}>
|
||||
${esc(sc.name)}</label>`).join("") : `<p class="faint" style="font-size:13px;margin:0">${tr("grp.noFree")}</p>`;
|
||||
// A room (several recordings of one room) inside a home stays a room; a home with rooms can't become one
|
||||
$("#groupRoom").checked = !!(g ? g.room : preset && preset.room);
|
||||
$("#groupRoom").disabled = !!(g && (g.parent || (S.groups || []).some(x => x.room && g.members.includes(x.slug))));
|
||||
const pick = () => {
|
||||
const keep = new Set([...document.querySelectorAll("#groupPick input:checked")].map(i => i.value));
|
||||
if (keep.size) { members.clear(); keep.forEach(m => members.add(m)); }
|
||||
// One group per scene: scenes of other groups are not offered at all; a home may also hold free rooms
|
||||
const free = S.scenes.filter(sc => !owner[sc.slug]).map(sc => ({slug: sc.slug, name: sc.name, room: false}));
|
||||
const rooms = $("#groupRoom").checked ? [] : (S.groups || []).filter(x => x.room && !owner[x.slug] && (!g || x.slug !== g.slug))
|
||||
.map(x => ({slug: x.slug, name: x.name, room: true, n: x.scenes.length}));
|
||||
const all = [...rooms, ...free];
|
||||
$("#groupPick").innerHTML = all.length ? all.map(x => `<label><input type="checkbox" value="${esc(x.slug)}" ${members.has(x.slug) ? "checked" : ""}>
|
||||
${x.room ? "🚪 " : ""}${esc(x.name)}${x.room ? `<span>${tr("grp.room.recordings", {n: x.n})}</span>` : ""}</label>`).join("")
|
||||
: `<p class="faint" style="font-size:13px;margin:0">${tr("grp.noFree")}</p>`;
|
||||
};
|
||||
$("#groupPick").innerHTML = ""; pick();
|
||||
$("#groupRoom").onchange = pick;
|
||||
$("#groupDlg").showModal(); $("#groupName").select();
|
||||
$("#groupCancel").onclick = () => $("#groupDlg").close();
|
||||
$("#groupSave").onclick = async () => {
|
||||
const picked = [...document.querySelectorAll("#groupPick input:checked")].map(i => i.value);
|
||||
const r = await api("/api/group", {slug: g ? g.slug : "", name: $("#groupName").value.trim(), members: picked.join(",")});
|
||||
const r = await api("/api/group", {slug: g ? g.slug : "", name: $("#groupName").value.trim(), members: picked.join(","),
|
||||
room: $("#groupRoom").checked});
|
||||
if (!r.ok) { toast(trErr(r.error)); return; }
|
||||
$("#groupDlg").close(); groupOpen(r.slug, true); loadScenes();
|
||||
};
|
||||
@@ -1124,6 +1330,7 @@ function openCombine(g) {
|
||||
radios("#cmbAlign", "cmb.align", ["frame", "images", "shift", "rigid"], o.align || "images");
|
||||
radios("#cmbPart", "cmb.part", ["view", "nearest"], o.partition || "view");
|
||||
$("#cmbTitle").textContent = tr("cmb.title", {name: g.name});
|
||||
$("#cmbHint").textContent = tr(g.room ? "cmb.hint.room" : "cmb.hint");
|
||||
const last = o.frame_splats || 1000000, known = FRAME_SIZES.some(m => m * 1e6 === last);
|
||||
$("#cmbSize").innerHTML = FRAME_SIZES.map(m => `<option value="${m * 1e6}">${sizeText(m)}${m === FRAME_RECOMMENDED ? " " + tr("ver.recommended") : ""}</option>`).join("")
|
||||
+ `<option value="custom">${tr("ver.custom")}</option>`;
|
||||
@@ -1197,34 +1404,226 @@ async function loadFrameGallery(refresh) {
|
||||
});
|
||||
}
|
||||
|
||||
/* ---------- your own splats ---------- */
|
||||
$("#importBtn").onclick = () => {
|
||||
let file = null;
|
||||
$("#impFile").textContent = tr("imp.none"); $("#impName").value = ""; $("#impScale").value = "1"; $("#impMake").disabled = true;
|
||||
$("#impUp").innerHTML = ["y-down", "y-up", "z-up"].map((u, i) => `<label class="opt${i ? "" : " active"}">
|
||||
<input type="radio" name="impUp" value="${u}" ${i ? "" : "checked"}><div><b>${tr("imp.up." + u)}</b><span>${tr("imp.up." + u + ".text")}</span></div></label>`).join("");
|
||||
$("#impUp").querySelectorAll("input").forEach(i => i.onchange = () =>
|
||||
$("#impUp").querySelectorAll(".opt").forEach(l => l.classList.toggle("active", l.querySelector("input").checked)));
|
||||
$("#impPick").onclick = async () => {
|
||||
const r = await api("/api/pick", {kind: "splat"});
|
||||
if (!r.path) return;
|
||||
file = r.path;
|
||||
$("#impFile").textContent = file;
|
||||
if (!$("#impName").value) $("#impName").value = file.split("/").pop().replace(/(\.compressed)?\.[^.]+$/, "").replace(/[_-]+/g, " ");
|
||||
$("#impMake").disabled = false;
|
||||
};
|
||||
$("#impClose").onclick = () => $("#importDlg").close();
|
||||
$("#impMake").onclick = async () => {
|
||||
const r = await api("/api/import", {path: file, name: $("#impName").value.trim(),
|
||||
up: document.querySelector('input[name="impUp"]:checked').value, scale: $("#impScale").value || "1"});
|
||||
if (!r.ok) { toast(trErr(r.error)); return; }
|
||||
$("#importDlg").close(); toast(tr("imp.started")); await poll();
|
||||
$("#jobCard").scrollIntoView({behavior: "smooth", block: "start"});
|
||||
};
|
||||
$("#importDlg").showModal();
|
||||
};
|
||||
|
||||
/* ---------- meshes ---------- */
|
||||
const MESH_FORMATS = ["glb", "stl", "obj", "ply"];
|
||||
// A mesh's files to download (also from other devices at home), Blender and the folder (on this PC)
|
||||
function meshFiles(slug, m) {
|
||||
if (!m || !m.files || !m.files.length) return "";
|
||||
const link = f => `<a class="btnlink" href="/api/mesh/file?slug=${encodeURIComponent(slug)}&name=${encodeURIComponent(f.name)}" download="${esc(f.name)}" title="${tr("mesh.download.title")}">⬇ ${esc(f.name)} <span class="faint">${mb(f.size)}</span></a>`;
|
||||
return `<div class="meshfiles"><div class="row" style="gap:6px;flex-wrap:wrap">${m.files.map(link).join("")}</div>
|
||||
<div class="row" style="gap:6px;margin-top:8px">${m.blender ? `<button class="small pc-only" data-mblender>${tr("mesh.blender")}</button>` : ""}
|
||||
<button class="small pc-only" data-mfolder>${tr("sc.folder")}</button></div></div>`;
|
||||
}
|
||||
function bindMeshFiles(box, slug) {
|
||||
box.querySelectorAll("[data-mblender]").forEach(b => b.onclick = async () => {
|
||||
const r = await api("/api/open", {slug, what: "blender"});
|
||||
toast(r.ok === false ? trErr(r.error) : tr("mesh.blender.starting"));
|
||||
});
|
||||
box.querySelectorAll("[data-mfolder]").forEach(b => b.onclick = () => api("/api/open", {slug, what: "mesh"}));
|
||||
}
|
||||
async function openMesh(slug) {
|
||||
const g = (S.groups || []).find(x => x.slug === slug), x = g || S.scenes.find(y => y.slug === slug);
|
||||
if (!x) return;
|
||||
$("#meshTitle").textContent = tr("mesh.title", {name: x.name});
|
||||
const draw = async () => {
|
||||
const m = await api("/api/mesh?slug=" + encodeURIComponent(slug));
|
||||
$("#meshHave").innerHTML = m.made ? `<div class="vrow"><div class="vwhat">
|
||||
<b>${tr("mesh.have")}${m.made.stale ? " · " + tr("ver.stale") : ""}</b></div>
|
||||
<div class="vacts"><button class="small" id="meshDel" title="${tr("mesh.delete")}" aria-label="${tr("mesh.delete")}">${tr("sc.delete")}</button></div></div>
|
||||
${meshFiles(slug, m)}` : "";
|
||||
if (m.made) {
|
||||
bindMeshFiles($("#meshHave"), slug);
|
||||
$("#meshDel").onclick = async () => {
|
||||
if (!confirm(tr("mesh.confirm", {name: x.name}))) return;
|
||||
const r = await api("/api/mesh/delete", {slug});
|
||||
if (!r.ok) { toast(trErr(r.error)); return; }
|
||||
draw(); loadScenes();
|
||||
};
|
||||
}
|
||||
$("#meshTex").disabled = !m.texture_possible;
|
||||
$("#meshTex").classList.toggle("hidden", !m.texture_possible); // not possible: only the note
|
||||
$("#meshTex").checked = m.texture_possible;
|
||||
$("#meshTexText").textContent = tr(m.texture_possible ? "mesh.texture" : "mesh.texture.none");
|
||||
};
|
||||
const was = S.meshFormats || ["glb"];
|
||||
$("#meshFormats").innerHTML = MESH_FORMATS.map(f => `<label class="opt${was.includes(f) ? " active" : ""}">
|
||||
<input type="checkbox" value="${f}" ${was.includes(f) ? "checked" : ""}><div><b>${tr("mesh.f." + f)}</b><span>${tr("mesh.f." + f + ".text")}</span></div></label>`).join("");
|
||||
$("#meshFormats").querySelectorAll("input").forEach(i => i.onchange = () => i.closest(".opt").classList.toggle("active", i.checked));
|
||||
await draw();
|
||||
$("#meshDlg").showModal();
|
||||
$("#meshClose").onclick = () => $("#meshDlg").close();
|
||||
$("#meshMake").onclick = async () => {
|
||||
const formats = [...$("#meshFormats").querySelectorAll("input:checked")].map(i => i.value);
|
||||
if (!formats.length) { toast(tr("mesh.pick")); return; }
|
||||
S.meshFormats = formats;
|
||||
const r = await api("/api/mesh", {slug, formats: formats.join(","), texture: $("#meshTex").checked});
|
||||
if (!r.ok) { toast(trErr(r.error)); return; }
|
||||
$("#meshDlg").close(); toast(tr("mesh.started")); await poll();
|
||||
$("#jobCard").scrollIntoView({behavior: "smooth", block: "start"});
|
||||
};
|
||||
}
|
||||
|
||||
/* ---------- versions ---------- */
|
||||
const FRAME_SIZES = [0.75, 1, 1.5, 2], PC_SIZES = ["all", 3, 5, 8]; // million splats
|
||||
const FRAME_RECOMMENDED = 1; // measured on the Frame: as fast as 0.75 M nearly, clearly sharper; 1.5 M already a little unsteady
|
||||
// Frame sizes as measured on a Steam Frame (Gaussian XR, 10/2026): 1 M is nearly as fast as 0.75 M and clearly sharper
|
||||
const FRAME_SIZES = [[0.75, 36], [1, 35], [1.5, 29], [2, 24]], FRAME_RECOMMENDED = 1; // million splats, fps
|
||||
const CLEANUPS = ["ceiling", "floor", "haze", "outside"]; // scripts/clean.py
|
||||
function sizeText(m) { return m === "all" ? tr("ver.all") : tr("million", {n: num(m, Math.round(m * 100) % 10 ? 2 : m % 1 ? 1 : 0)}); }
|
||||
function versionKey(splats, scale, clean) { // as version_key() in server.py
|
||||
let key = splats === "all" ? "all" : `${+(splats / 1e6).toPrecision(6)}m`;
|
||||
if (scale !== 1) key += `-1x${scale}`;
|
||||
const parts = CLEANUPS.filter(k => clean[k]).map(k => k[0] + Math.round(clean[k] * 100));
|
||||
return parts.length ? key + "-" + parts.join("") : key;
|
||||
}
|
||||
function cleanText(clean) {
|
||||
return CLEANUPS.filter(k => clean && clean[k]).map(k => `${tr("ver.clean." + k)} ${Math.round(clean[k] * 100)} %`).join(" · ");
|
||||
}
|
||||
function versionRow(v) {
|
||||
const what = (v.purpose === "pc" ? tr("ver.all") : tr("million", {n: num(v.splats / 1e6, 2)})) + (v.scale !== 1 ? " · " + ratioText(v.scale) : "");
|
||||
const slow = v.purpose === "pc" && v.splats > 2.5e6;
|
||||
return `<div class="vrow">
|
||||
<div class="vwhat"><b>${v.purpose === "pc" ? "🖥️" : "🥽"} ${esc(what)}</b>
|
||||
<span class="muted">${cleanText(v.clean) || tr("ver.clean.none")}</span>
|
||||
<span class="faint">${tr("million", {n: num(v.splats / 1e6, 2)})} · ${mb(v.size)}${v.stale ? " · " + tr("ver.stale") : ""}</span></div>
|
||||
<div class="vacts">${v.on_frame === null && !(v.upload && (v.upload.running || v.upload.error)) ? "" : frameState({upload: v.upload, on_frame: v.on_frame})}
|
||||
${v.ply ? `<button class="small pc-only" data-vspirula="${esc(v.key)}" title="${tr("sc.spirula.title")}">${tr("sc.spirula")}</button>` : ""}
|
||||
${S.frameConfigured ? `<button class="small" data-vup="${esc(v.key)}" ${(v.upload && v.upload.running) || v.on_frame === null ? "disabled" : ""} ${slow ? `title="${tr("ver.slow", {n: num(v.splats / 1e6, 1)})}"` : ""}>${tr(v.on_frame ? "sc.reupload" : "sc.toFrame")}${slow ? " ⚠️" : ""}</button>` : ""}
|
||||
${v.on_frame ? `<button class="small" data-vunframe="${esc(v.key)}" title="${tr("ver.unframe.title")}">${tr("ver.unframe")}</button>` : ""}
|
||||
<button class="small" data-vtemplate="${esc(v.key)}" title="${tr("ver.template.title")}">${tr("ver.template")}</button>
|
||||
<button class="small" data-vdel="${esc(v.key)}" title="${tr("ver.delete")}" aria-label="${tr("ver.delete")}">${tr("sc.delete")}</button></div>
|
||||
</div>`;
|
||||
}
|
||||
function bindVersionRows(box, slug, list, redraw) {
|
||||
const find = key => list.find(x => x.key === key);
|
||||
box.querySelectorAll("[data-vspirula]").forEach(b => b.onclick = async () => {
|
||||
const res = await api("/api/open", {slug, version: b.dataset.vspirula, what: "spirula"});
|
||||
toast(res.ok === false ? trErr(res.error) : tr("sc.spirula.starting"));
|
||||
});
|
||||
box.querySelectorAll("[data-vup]").forEach(b => b.onclick = async () => {
|
||||
const res = await api("/api/upload", {slug, version: b.dataset.vup});
|
||||
if (!res.ok) { toast(trErr(res.error)); return; }
|
||||
toast(tr("sc.uploadStarted")); setTimeout(redraw, 1500);
|
||||
});
|
||||
box.querySelectorAll("[data-vunframe]").forEach(b => b.onclick = async () => {
|
||||
const v = find(b.dataset.vunframe);
|
||||
if (!confirm(tr("ver.unframe.confirm", {name: v.label}))) return;
|
||||
const res = await api("/api/frame/remove", {slug, version: v.key});
|
||||
if (!res.ok) { toast(trErr(res.error)); return; }
|
||||
toast(tr("ver.unframed", {name: v.label})); redraw();
|
||||
});
|
||||
box.querySelectorAll("[data-vtemplate]").forEach(b => b.onclick = async () => {
|
||||
if (!$("#verDlg").open) await openVersions(slug);
|
||||
useTemplate(find(b.dataset.vtemplate));
|
||||
});
|
||||
box.querySelectorAll("[data-vdel]").forEach(b => b.onclick = async () => {
|
||||
const v = find(b.dataset.vdel);
|
||||
if (!confirm(tr("ver.confirm", {name: v.label, size: mb(v.size)}))) return;
|
||||
const res = await api("/api/version/delete", {slug, version: v.key});
|
||||
if (!res.ok) { toast(trErr(res.error)); return; }
|
||||
redraw(); loadScenes();
|
||||
});
|
||||
}
|
||||
function verForm() { // what the form would make
|
||||
const pc = document.querySelector('input[name="verFor"]:checked').value === "pc";
|
||||
let size = "all";
|
||||
if (!pc) {
|
||||
const pick = document.querySelector('input[name="verSize"]:checked');
|
||||
size = pick.value === "custom" ? Math.round(parseFloat($("#verCustom").value) * 1e6) || 0 : Math.round(parseFloat(pick.value) * 1e6);
|
||||
}
|
||||
const sc = document.querySelector('input[name="verScale"]:checked');
|
||||
const clean = {};
|
||||
document.querySelectorAll("#verClean input").forEach(i => { if (+i.value) clean[i.dataset.clean] = i.value / 100; });
|
||||
const any = Object.keys(clean).length > 0;
|
||||
return {pc, size, scale: sc ? parseFloat(sc.value) : 1, clean, plain: any && $("#verPlain").checked, any};
|
||||
}
|
||||
function verPreview() {
|
||||
const f = verForm(), V = S.verList || [], made = [];
|
||||
$("#verPlainBox").classList.toggle("hidden", !f.any);
|
||||
$("#verSizes").classList.toggle("hidden", f.pc); $("#verSizeHead").classList.toggle("hidden", f.pc);
|
||||
$("#verSizes").querySelectorAll("label.opt").forEach(l => l.classList.toggle("active", l.querySelector("input").checked));
|
||||
if (!f.pc && !(f.size >= 10000)) { $("#verPreview").textContent = tr("ver.pick"); $("#verMake").disabled = true; return; }
|
||||
for (const cl of f.plain ? [f.clean, {}] : [f.clean]) {
|
||||
const key = versionKey(f.size, f.scale, cl), old = V.find(v => v.key === key);
|
||||
const text = (f.pc ? tr("ver.all") : sizeText(f.size / 1e6)) + (f.scale !== 1 ? " · " + ratioText(f.scale) : "") + " · " + (cleanText(cl) || tr("ver.clean.none"));
|
||||
made.push(old ? tr("ver.replaces", {what: text}) : text);
|
||||
}
|
||||
const same = !f.any && f.pc && S.verScene.hasAll; // all splats, not cleaned: the scene itself
|
||||
$("#verPreview").innerHTML = same ? esc(tr("ver.same.all"))
|
||||
: esc(tr(made.length > 1 ? "ver.makes.n" : "ver.makes.1", {n: made.length})) + made.map(x => "<br>• " + esc(x)).join("");
|
||||
$("#verMake").disabled = same;
|
||||
$("#verMake").textContent = tr(made.length > 1 ? "ver.make.n" : "ver.make.1", {n: made.length});
|
||||
}
|
||||
function useTemplate(v) {
|
||||
if (!v) return;
|
||||
document.querySelector(`input[name="verFor"][value="${v.purpose}"]`).checked = true;
|
||||
if (v.purpose === "frame") {
|
||||
const m = v.splats / 1e6, known = FRAME_SIZES.find(([x]) => Math.abs(x - m) < 0.01);
|
||||
document.querySelector(`input[name="verSize"][value="${known ? known[0] : "custom"}"]`).checked = true;
|
||||
if (!known) $("#verCustom").value = num(m, 2).replace(",", ".");
|
||||
}
|
||||
const sc = document.querySelector(`input[name="verScale"][value="${v.scale}"]`);
|
||||
if (sc) sc.checked = true;
|
||||
document.querySelectorAll("#verClean input").forEach(i => { i.value = Math.round((v.clean[i.dataset.clean] || 0) * 100); i.oninput(); });
|
||||
verPreview();
|
||||
toast(tr("ver.template.done"));
|
||||
}
|
||||
async function openVersions(slug) {
|
||||
const g = (S.groups || []).find(x => x.slug === slug), x = g || S.scenes.find(y => y.slug === slug);
|
||||
if (!x) return;
|
||||
const total = (g ? g.result && g.result.splats : x.gaussians) || 0, scale = x.scale || 1;
|
||||
S.verScene = {slug, hasAll: true};
|
||||
$("#verTitle").textContent = tr("ver.title", {name: x.name, n: tr("million", {n: num(total / 1e6, 2)})});
|
||||
const chk = (val, text, on) => `<label class="chk"><input type="checkbox" value="${val}"${on ? " checked" : ""}> ${text}</label>`;
|
||||
$("#verFrame").innerHTML = FRAME_SIZES.map(m => chk(m, sizeText(m) + (m === FRAME_RECOMMENDED ? " " + tr("ver.recommended") : ""), m === FRAME_RECOMMENDED)).join("");
|
||||
$("#verPc").innerHTML = PC_SIZES.filter(m => m === "all" || m * 1e6 < total).map(m => chk(m, sizeText(m))).join("");
|
||||
$("#verCustom").value = "";
|
||||
$("#verSizes").innerHTML = FRAME_SIZES.map(([m, fps]) => `<label class="opt${m === FRAME_RECOMMENDED ? " active" : ""}">
|
||||
<input type="radio" name="verSize" value="${m}" ${m === FRAME_RECOMMENDED ? "checked" : ""}>
|
||||
<div><b>${sizeText(m)}${m === FRAME_RECOMMENDED ? " " + tr("ver.recommended") : ""}</b><span>${tr("ver.fps." + String(m).replace(".", "_"), {fps})}</span></div></label>`).join("")
|
||||
+ `<label class="opt"><input type="radio" name="verSize" value="custom"><div><b>${tr("ver.custom")}</b>
|
||||
<span><input id="verCustom" type="number" min="0.1" max="50" step="0.05" style="width:80px"> ${tr("ver.million")}</span></div></label>`;
|
||||
$("#verClean").innerHTML = `<p class="faint" style="font-size:12px;margin:0 0 6px">${tr("ver.clean.hint")}</p>` + CLEANUPS.map(k => `
|
||||
<label class="slide" title="${esc(tr("ver.clean." + k + ".title"))}"><span>${tr("ver.clean." + k)}</span>
|
||||
<input type="range" min="0" max="100" step="10" value="0" data-clean="${k}"><output>${tr("ver.clean.off")}</output></label>`).join("");
|
||||
$("#verClean").querySelectorAll("input").forEach(i => i.oninput = () => {
|
||||
i.nextElementSibling.textContent = +i.value ? i.value + " %" : tr("ver.clean.off"); verPreview(); });
|
||||
$("#verPlain").checked = false;
|
||||
$("#verScaleHead").classList.toggle("hidden", scale === 1);
|
||||
$("#verScales").classList.toggle("hidden", scale === 1);
|
||||
$("#verScales").innerHTML = scale === 1 ? "" : `<label class="chk"><input type="checkbox" value="1" checked> ${tr("scale.original")}</label>`
|
||||
+ `<label class="chk"><input type="checkbox" value="${scale}"> ${tr("ver.walk", {ratio: ratioText(scale)})}</label>`;
|
||||
$("#verScales").innerHTML = scale === 1 ? "" : `<label class="chk"><input type="radio" name="verScale" value="1" checked> ${tr("scale.original")}</label>`
|
||||
+ `<label class="chk"><input type="radio" name="verScale" value="${scale}"> ${tr("ver.walk", {ratio: ratioText(scale)})}</label>`;
|
||||
$("#verDlg").querySelectorAll('input[type="radio"], #verPlain, #verCustom').forEach(i => { i.onchange = verPreview; i.oninput = verPreview; });
|
||||
$("#verCustom").onfocus = () => { document.querySelector('input[name="verSize"][value="custom"]').checked = true; verPreview(); };
|
||||
await drawVersions(slug);
|
||||
$("#verDlg").showModal();
|
||||
verPreview();
|
||||
if (!$("#verDlg").open) $("#verDlg").showModal();
|
||||
$("#verClose").onclick = () => $("#verDlg").close();
|
||||
$("#verMake").onclick = async () => {
|
||||
const sizes = [...document.querySelectorAll("#verFrame input:checked, #verPc input:checked")]
|
||||
.map(i => i.value === "all" ? "all" : String(Math.round(parseFloat(i.value) * 1e6)));
|
||||
const custom = parseFloat($("#verCustom").value);
|
||||
if (custom > 0) sizes.push(String(Math.round(custom * 1e6)));
|
||||
const scales = scale === 1 ? ["1"] : [...document.querySelectorAll("#verScales input:checked")].map(i => i.value);
|
||||
if (!sizes.length || !scales.length) { toast(tr("ver.pick")); return; }
|
||||
const r = await api("/api/versions", {slug, sizes: sizes.join(","), scales: scales.join(",")});
|
||||
const f = verForm();
|
||||
const clean = Object.entries(f.clean).map(([k, v]) => `${k}=${v}`).join(",");
|
||||
const r = await api("/api/versions", {slug, sizes: String(f.size), scales: String(f.scale), clean, also_plain: f.plain});
|
||||
if (!r.ok) { toast(trErr(r.error)); return; }
|
||||
$("#verDlg").close(); toast(tr("ver.started")); await poll();
|
||||
$("#jobCard").scrollIntoView({behavior: "smooth", block: "start"});
|
||||
@@ -1232,34 +1631,22 @@ async function openVersions(slug) {
|
||||
}
|
||||
async function drawVersions(slug) {
|
||||
const r = await api("/api/versions?slug=" + encodeURIComponent(slug));
|
||||
const list = r.versions || [];
|
||||
$("#verList").innerHTML = list.length ? list.map(v => `<div class="row">
|
||||
<b>${esc(v.label)}</b>
|
||||
<span class="muted" style="font-size:12.5px">${tr("million", {n: num(v.splats / 1e6, 2)})} · ${mb(v.size)}${v.stale ? " · " + tr("ver.stale") : ""}</span>
|
||||
<span class="sp"></span>${frameState({upload: v.upload, on_frame: v.on_frame})}
|
||||
${S.frameConfigured ? `<button class="small" data-vup="${esc(v.key)}" ${v.upload && v.upload.running ? "disabled" : ""}>${tr(v.on_frame ? "sc.reupload" : "sc.toFrame")}</button>` : ""}
|
||||
${v.on_frame ? `<button class="small" data-vunframe="${esc(v.key)}" title="${tr("ver.unframe.title")}">${tr("ver.unframe")}</button>` : ""}
|
||||
<button class="small" data-vdel="${esc(v.key)}" title="${tr("ver.delete")}" aria-label="${tr("ver.delete")}">${tr("sc.delete")}</button>
|
||||
</div>`).join("") : `<p class="faint" style="font-size:13px;margin:0">${tr("ver.none")}</p>`;
|
||||
$("#verList").querySelectorAll("[data-vup]").forEach(b => b.onclick = async () => {
|
||||
const res = await api("/api/upload", {slug, version: b.dataset.vup});
|
||||
if (!res.ok) { toast(trErr(res.error)); return; }
|
||||
toast(tr("sc.uploadStarted")); setTimeout(() => drawVersions(slug), 1500);
|
||||
});
|
||||
$("#verList").querySelectorAll("[data-vunframe]").forEach(b => b.onclick = async () => {
|
||||
const v = list.find(x => x.key === b.dataset.vunframe);
|
||||
if (!confirm(tr("ver.unframe.confirm", {name: v.label}))) return;
|
||||
const res = await api("/api/frame/remove", {slug, version: v.key});
|
||||
if (!res.ok) { toast(trErr(res.error)); return; }
|
||||
toast(tr("ver.unframed", {name: v.label})); drawVersions(slug);
|
||||
});
|
||||
$("#verList").querySelectorAll("[data-vdel]").forEach(b => b.onclick = async () => {
|
||||
const v = list.find(x => x.key === b.dataset.vdel);
|
||||
if (!confirm(tr("ver.confirm", {name: v.label, size: mb(v.size)}))) return;
|
||||
const res = await api("/api/version/delete", {slug, version: v.key});
|
||||
if (!res.ok) { toast(trErr(res.error)); return; }
|
||||
drawVersions(slug); loadScenes();
|
||||
});
|
||||
const list = S.verList = r.versions || [];
|
||||
$("#verList").innerHTML = list.length ? list.map(versionRow).join("") : `<p class="faint" style="font-size:13px;margin:0">${tr("ver.none")}</p>`;
|
||||
bindVersionRows($("#verList"), slug, list, () => drawVersions(slug).then(verPreview));
|
||||
}
|
||||
async function fillVersionLists() { // the opened lists under scenes and groups
|
||||
for (const box of document.querySelectorAll("[data-vlist]")) {
|
||||
const slug = box.dataset.vlist, r = await api("/api/versions?slug=" + encodeURIComponent(slug)), list = r.versions || [];
|
||||
box.innerHTML = list.map(versionRow).join("") || `<p class="faint" style="font-size:13px;margin:0">${tr("ver.none")}</p>`;
|
||||
bindVersionRows(box, slug, list, fillVersionLists);
|
||||
}
|
||||
}
|
||||
function versionsOpen(slug, set) { return groupOpen("ver:" + slug, set); }
|
||||
function versionsToggle(slug, n) {
|
||||
if (!n) return `<button class="small link" data-versions="${esc(slug)}" title="${tr("ver.button.title")}">${tr("ver.first")}</button>`;
|
||||
const open = versionsOpen(slug);
|
||||
return `<button class="small link" data-vtoggle="${esc(slug)}" aria-expanded="${open}" title="${tr("ver.button.title")}">${tr(open ? "ver.hide" : n === 1 ? "ver.show.1" : "ver.show", {n})}</button>`;
|
||||
}
|
||||
|
||||
/* ---------- scale (models) ---------- */
|
||||
@@ -1339,7 +1726,7 @@ function openClean(slug) {
|
||||
const g = (S.groups || []).find(x => x.slug === slug);
|
||||
let sc = S.scenes.find(x => x.slug === slug);
|
||||
if (g) {
|
||||
const rooms = g.members.map(m => S.scenes.find(x => x.slug === m)).filter(x => x && x.disk);
|
||||
const rooms = (g.scenes || g.members).map(m => S.scenes.find(x => x.slug === m)).filter(x => x && x.disk);
|
||||
const sum = k => rooms.reduce((a, x) => a + (x.disk[k] || 0), 0);
|
||||
sc = {name: g.name, disk: {temp: sum("temp"), images: sum("images"), total: sum("total")}, n: rooms.length};
|
||||
}
|
||||
@@ -1471,7 +1858,7 @@ async function poll() {
|
||||
document.body.classList.toggle("offline", offline);
|
||||
if (offline) return;
|
||||
const wasFetching = !!(S.dl && S.dl.busy), doneFiles = S.dl && S.dl.batch ? S.dl.batch.done_files : 0;
|
||||
S.job = r.job; S.dl = r.download;
|
||||
S.job = r.job; S.dl = r.download; S.standby = r.standby;
|
||||
renderDlBar();
|
||||
const nowFetching = !!(S.dl && S.dl.busy);
|
||||
if (wasFetching && (!nowFetching || (S.dl.batch && S.dl.batch.done_files !== doneFiles))) {
|
||||
@@ -1499,10 +1886,22 @@ api("/api/ping").then(r => {
|
||||
document.body.classList.toggle("remote", r.local === false);
|
||||
S.ping = r; S.frameConfigured = r.frame_configured;
|
||||
setupLang(r.language);
|
||||
$("#footVersion").textContent = tr("foot.version", {v: r.version}); // after the language is known
|
||||
loadRecs(); poll();
|
||||
});
|
||||
$("#footCheck").onclick = async e => {
|
||||
e.preventDefault();
|
||||
const r = await api("/api/update/check", {});
|
||||
if (r.update) { try { localStorage.removeItem("updateLater"); } catch {} S.ping.update = r.update; renderUpdate(); window.scrollTo({top: 0, behavior: "smooth"}); }
|
||||
toast(r.update ? tr("update.text.plain", {latest: r.update.latest}) : r.reached ? tr("update.none", {current: r.current}) : tr("update.offline"));
|
||||
};
|
||||
// the check for a newer version runs in the background: ask again a little later, then every few hours
|
||||
const repingForUpdate = () => api("/api/ping").then(r => { if (r && r.app) { S.ping = r; renderUpdate(); } });
|
||||
setTimeout(repingForUpdate, 15000);
|
||||
setInterval(repingForUpdate, 3 * 3600 * 1000);
|
||||
setInterval(poll, 2000);
|
||||
document.addEventListener("visibilitychange", () => { if (!document.hidden) poll(); });
|
||||
</script>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
Reference in new issue
Block a user