mirror of
https://github.com/tangerineturtle1/NX2navi.git
synced 2026-11-18 06:59:57 -04:00
Merge GitHub main into the test line: the launcher's customisation, the settings and sound changes, and the warm stage-library cache.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -124,6 +124,11 @@ keeps per-core data without locks and relies on that, so the host models it (`ru
|
||||
holds the HDR picture relative to the HUD's white; the game's FSR 1 pass loses its output clamp; the present reads
|
||||
the float picture in place of the window texture and `shaders/hdr_encode.comp` writes PQ for an HDR10 swapchain.
|
||||
`NX2NAVI_HDR=native` reports an HDR10 display to the game, which then renders and presents its own PQ picture.
|
||||
The menu switches between off and `1` during a run: the splice, the HDR extensions and the settings in the support
|
||||
buffer are there from the start whatever is set (`vk_hdr_armed`), the spliced tonemap returns the game's SDR result
|
||||
while the swapchain is SDR, and a change of the setting makes the swapchain again in the other format
|
||||
(`gfx_present.c` `window_settings_live`). Only `native` waits for a restart, as the game asks about the display
|
||||
once. `NX2NAVI_HDR_LIVE=0` leaves the HDR path out of a run that starts with HDR off.
|
||||
- ASTC textures are uploaded as they are where the device samples ASTC, and decoded by a compute shader everywhere
|
||||
else (`vk_astc.c`); under 20 GiB of video memory the decoder encodes them to BC3.
|
||||
- Occlusion queries never block the CPU; a result that is not ready counts as visible.
|
||||
|
||||
@@ -127,7 +127,17 @@ of them.
|
||||
|
||||
Without this step the first launch compiles shaders and pipelines during play and stutters until the caches fill.
|
||||
The AMD driver keeps its pipeline cache per exe path and holds a limited amount: preparing another build folder can
|
||||
evict this one's. `nx2navi.exe --warm-shaders` rebuilds it from the shader cache.
|
||||
evict this one's. `nx2navi.exe --warm-shaders` rebuilds it from the shader cache. A driver update empties the
|
||||
driver's cache too, and a change to what a stage library is built with gives every library another entry in it.
|
||||
So an update that carries the prepared shaders over runs `--warm-shaders` (`tools/make_game.py`
|
||||
`warm_driver_cache`: seconds while the libraries are there, minutes when they are not), and the game itself checks
|
||||
at every start: it builds a sample of the prepared fragment libraries and, when their median time says the cache
|
||||
is cold, builds the whole prepared list into the driver's cache again on idle-priority threads while it runs
|
||||
(`runtime/vk_pipeline.c` `lw_start`, `NX2NAVI_LIB_WARM`; `shader-warm.txt` next to the caches says where that
|
||||
stands). With the cache cold every pipeline a draw first needs compiles in play: on an RX 7900 XT a library took
|
||||
93 ms (vertex) and 242 ms (fragment) on average against 0.3 and 0.6 ms from the cache, and a first walk through a
|
||||
village skipped 11,180 draws and made 94 draws wait 5.5 s in all, against 1,605 skipped (1,473 of them in the
|
||||
scene's first frames) and 60 ms of waits with the cache warm.
|
||||
When the driver's shader compiler crashes on a variant (NVIDIA 615.78.08 on an RTX 5080 does, issue #30),
|
||||
`prepare_shaders.py` runs the driver step again with `--warm-shaders`, up to three times, without the variants the
|
||||
driver was building at the crash. `shader-prepare-skip.txt` next to the exe lists them with the GPU and driver
|
||||
|
||||
@@ -78,7 +78,7 @@ The game's *Swap Jump Controls* option trades B and X (jump on B, put away on X)
|
||||
|
||||
The window opens on the monitor `NX2NAVI_MONITOR` (`monitor` in `nx2navi.ini`) names, and F11 fullscreen covers the monitor the window is on. `nx2navi.exe --list-monitors` prints each monitor's index, name (on Windows its device name too), desktop rectangle, primary flag and DPI without game files; `nx2navi.exe --monitor <value>` sets `NX2NAVI_MONITOR` for one run and wins over the file. The value is `auto` (default), `primary`, an index from the list (counting from 1), or part of a monitor name (on Windows also a device name such as `display3`; on Linux the name carries the connector, such as `dp-2`); when nothing matches, the log lists the monitors and the window is placed as with `auto`. On Wayland a window cannot place itself: only fullscreen (`fullscreen = 1`) opens on the chosen monitor, and a windowed window opens where the compositor puts it.
|
||||
|
||||
The Minus+Plus combo never reaches the game. In the menu the arrow keys, the D-pad or the left stick move, Enter or A selects, Q and E or L and R switch tabs, Esc or B goes back (Switch button names, as in the table above).
|
||||
The Minus+Plus combo never reaches the game. In the menu the arrow keys, the D-pad or the left stick move, Enter or A selects, Q and E or L and R switch tabs, Esc or B goes back (Switch button names, as in the table above). With the mouse, a click on a row selects it and a setting changes on the two framed arrows beside its value (held, an arrow repeats); a click anywhere else on the row changes nothing.
|
||||
|
||||
## Audio output
|
||||
|
||||
|
||||
@@ -33,6 +33,30 @@ Display: the launcher decodes it from the player's dump or built game into `data
|
||||
`runtime/menu_assets.c` does for the in-game menu) and uses the system's interface font until then. Every picture is
|
||||
drawn in code (`launcher/ui/art.py`); no texture, font or sound of the game is in the repository or the release.
|
||||
|
||||
Customize Launcher (on the home screen) makes the look the player's own:
|
||||
|
||||
- Color Scheme: Forest (the colours above), Volcano, Lake, Desert, Temple and Shadow. A scheme is the first one with
|
||||
its woods, accents, backdrop and glow turned to other hues (`art.THEMES`, `art.recolor`), so each keeps the same
|
||||
light and dark steps and the same readable text. The window is drawn again in the new colours at once. The names
|
||||
are plain words, not the game's.
|
||||
- Background: a picture of the player's own behind the panels instead of the scheme's backdrop (`launcher/ui/picture.py`:
|
||||
PNG, JPEG, WebP, BMP, GIF or TIFF, read with Pillow). It is cut to the window's shape around its middle and kept as
|
||||
`data/background.npy`, so the launcher needs the file no more; Background Dimming darkens it (0 to 80 %) for the
|
||||
text over it, the list panel and the description box turn a little see-through, and Remove Background brings the
|
||||
scheme's backdrop back.
|
||||
- Animations (on by default): the cursor glides from row to row, a new screen slides into place, sparks drift up
|
||||
over the backdrop and Navi bobs in the title band with a pulsing halo (`App.animate`). They move by the time that
|
||||
passed, stand still while the window is hidden or minimised, and Off stops them all.
|
||||
- Sounds (Low by default; Off, Medium or High): two of the game's own interface sounds, the decide and cancel sounds
|
||||
of its menus, when a row is chosen or a choice changes and when the player goes back. The launcher decodes them
|
||||
from the player's built game or dump into `data/cache/sounds` (`gamefiles.extract_sounds`:
|
||||
`Sound/Resource/Stream/SE_Sys_Do00.bwav` and `SE_Sys_Cancel00.bwav`, the files `runtime/menu_sound.c` plays in the
|
||||
in-game menu). No sound is in the repository, the release or the setup, and the launcher makes none of its own:
|
||||
it is silent until the player's game has been read. Moving the cursor makes no sound. They are played from memory
|
||||
(PlaySound on Windows; `pw-play`, `paplay` or `aplay` elsewhere).
|
||||
|
||||
The choices are `theme`, `background`, `background_dim`, `animations` and `sounds` in `data/launcher.json`.
|
||||
|
||||
Navi (`art.NAVI`, 22 x 21 pixels, drawn in whole pixels at every size) is also the icon of `NX2navi.exe`,
|
||||
`NX2navi-Setup.exe`, the window and its taskbar button (`art.navi_ico`, written into the release by
|
||||
`tools/make_launcher.py`). The window sets that icon on itself, and the setup's shortcuts carry the window's taskbar
|
||||
@@ -41,7 +65,8 @@ identity (`NX2navi.Launcher`), so the taskbar groups and pins it under NX2navi r
|
||||
Screens (`launcher/ui/app.py`): first run (dump, install folder, Desktop Shortcut, Check for Updates at Start,
|
||||
Update Channel, Begin Installation); the steps of an install, update or rebuild with their progress, the build log's
|
||||
last lines and Cancel, and after a failure Try Again and Copy Report; home (Play, Updates, Game Folder, Saves,
|
||||
Rebuild the Game, Settings); saves (Export Save, Add Log and Settings, Export To, Import a Save, Import a Save Folder,
|
||||
Rebuild the Game, Customize Launcher, Settings); customize (Color Scheme, Background, with a picture set Background
|
||||
Dimming and Remove Background, Animations, Sounds, Back); saves (Export Save, Add Log and Settings, Export To, Import a Save, Import a Save Folder,
|
||||
Open Saves Folder, Back); settings (update check, Install Updates Automatically, Hide Launcher While Playing, Keep
|
||||
Build Cache, Update Channel, the folders, Open Logs Folder, Uninstall, Back); uninstall (keep or remove the built game).
|
||||
A screen with more rows than the window holds draws them closer together (`fit_rows`).
|
||||
@@ -66,7 +91,9 @@ app/<version>/ launcher/, runtime/, recomp/, tools/, bin/nx2navi_xlate
|
||||
pydeps/ zbic, downloaded from PyPI on this PC
|
||||
toolchain/msys64/ucrt64 MSYS2's clang and libraries, downloaded from the MSYS2 repository on this PC
|
||||
toolchain/pkgs/ the downloaded package files
|
||||
data/launcher.json settings; data/logs/launcher.log (and crash.log); data/cache/fonts
|
||||
data/launcher.json settings; data/logs/launcher.log (and crash.log); data/cache/fonts and data/cache/sounds
|
||||
(the game's font and interface sounds, decoded from the player's game);
|
||||
data/background.npy (the player's background picture, fitted to the window)
|
||||
game/ the built game, unless another folder was chosen (its layout: README-BuildKit.md), with
|
||||
saves/ for saves to import and the backups imports make (below)
|
||||
```
|
||||
@@ -350,7 +377,9 @@ certificates made with the `openssl` command), the GitHub and URL feeds, staging
|
||||
pruning, unsafe archives, the background update (a release staged beside the running version without switching, the
|
||||
`staged.json` marker, a staged release installed after a restart, no install while the game runs, the install once
|
||||
it exited, nothing by itself with Install Updates Automatically off, a failed staging tried again after the next
|
||||
check), the font decoding on a system font wrapped like the game's, `make_game.py` on a synthetic
|
||||
check), the font decoding on a system font wrapped like the game's, the look (every colour scheme complete, the
|
||||
background picture cut to the window's shape and kept, the sound effects as WAVs and low by default), `make_game.py`
|
||||
on a synthetic
|
||||
`.nup` (events, skipped steps, `--rebuild` without the dump, step keys, the shaders key following the translator the
|
||||
build uses), the RomFS step beside the lift and compile
|
||||
and its failure stopping the build, the prompts step with a stand-in prompt tool (when it runs again, and that it
|
||||
|
||||
@@ -7,3 +7,23 @@ Draft notes for the release after 0.6.1. The version number is not decided yet.
|
||||
import a zip someone shared. Attach the bug report zip to a report from a place in the game, so it can be reached
|
||||
and checked quickly. An import copies your current save to the `saves` folder of the game folder first; in the game
|
||||
it takes effect at the next start.
|
||||
- Customize Launcher (on the launcher's home screen): six colour schemes, a background picture of your own with
|
||||
adjustable dimming, animations (a gliding cursor, sliding screens, drifting sparks) and sound effects: the game's
|
||||
own select and back sounds, read from your game, quiet (Low) unless you pick another loudness or turn them off.
|
||||
- Three more settings take effect without a restart: HDR between off and the tone mapper (only the game's native
|
||||
HDR still waits for one), the camera's stick sensitivity, and the speakers (stereo or 5.1).
|
||||
|
||||
## Fixed
|
||||
|
||||
- Ground, walls and characters that appeared and disappeared, black or unlit frames, and stalls of up to two seconds
|
||||
wherever something was shown for the first time (a new area, a cutscene). The graphics driver's cache had lost the
|
||||
shader libraries prepared at install, so every new pipeline compiled during play: after a driver update, or after
|
||||
an update of NX2navi that changes how the libraries are built (this one does on AMD RX 7000 and RX 9000 cards,
|
||||
where it also ends the 20 second start). The game now checks the driver's cache at every start and fills it again in the background by
|
||||
itself, an update fills it again before you play, draws wait a moment for a pipeline that only needs linking
|
||||
instead of being left out, and lighting passes are no longer left out at all.
|
||||
- Textures out of view for 11 seconds at 165 fps (30 seconds were meant) could show a blank stand-in for a few frames
|
||||
when they came back while memory was short. The wait is now two minutes of real time at any frame rate.
|
||||
- Settings menu, mouse: a setting changes only on the two framed arrows beside its value, and the arrows stay in one
|
||||
place. A click anywhere on a row used to step the setting, and the left arrow moved with the value's width, so
|
||||
clicking through the values landed on the row and stepped the wrong way. Holding the button on an arrow repeats.
|
||||
|
||||
Reference in New Issue
Block a user