mirror of
https://github.com/tangerineturtle1/NX2navi.git
synced 2026-11-18 06:59:57 -04:00
Bring the tone mapped HDR picture's settings back to the menu, with defaults that give the look it had while it was fixed.
The sixteen settings the fixed look took away are settings again: the tone mapper choice, gamma correction, mid grey, match tone slope, tone slope, hue clip emulation, exposure, highlights, shadows, contrast, saturation, highlight saturation, blowout, flare, hue correction and colour grading. They have their rows in the settings table with the defaults and ranges they had, their rows in the Screen tab under HDR output's three brightness rows (none of them with the game's own HDR), their texts in the four languages, and their lines in the example ini. The tonemap library has the luminance mapper and the grading of the observer-response mapper again, and the support buffer carries five vec4 for it. A player who changes nothing sees the picture as before. The observer-response mapper leaves each grading step out when its value is 1, and the slider values are divided, not multiplied by a rounded reciprocal, so 50 and 100 % arrive as exactly 1. Evaluated on the CPU in single precision, the shader with every default gave the same bits as the fixed one for 400,000 random scene colours, gains and whites, in HDR and for the SDR picture; the luminance mapper and the game's curve gave the same bits as before they were removed, and the observer-response mapper with its sliders moved stayed within 0.004 % of the pixel of its old result. Gamma correction now counts with every tone mapper, 2.2 by default, which is what gave the fixed look its true blacks; before the fixed look it ran with the luminance mapper only and the other two showed the dark tones far above black. Its off value brings that lighter picture back for a player who asks for it. The game's own HDR does not take the setting and stays at 2.2. Lines for these settings that an nx2navi.ini still holds from before the fixed look count again; the example ini and the release notes say so. Nothing of this was seen in the game. Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
This commit is contained in:
@@ -179,7 +179,7 @@ beside the game.
|
||||
FSR 3.1 on any card where `amd_fidelityfx_vk.dll` loads, FSR 4 on the Radeon cards AMD's FSR 4 libraries list it
|
||||
for), Frame generation (NVIDIA DLSS on RTX 40 and 50 cards, with
|
||||
a DLSS multiplier of 2x, or 3x and 4x on RTX 50 cards; FSR 3.1 on any card where it loads; it needs DLSS or FSR 3.1
|
||||
upscaling on; the frame limit counts the frames the game draws and the generated ones come on top), HDR (the game's picture tone mapped to your display, or Native, the game's own HDR, with peak, game and HUD brightness; turn HDR on in Windows first) and the
|
||||
upscaling on; the frame limit counts the frames the game draws and the generated ones come on top), HDR (the game's picture tone mapped to your display, or Native, the game's own HDR, with peak, game and HUD brightness, and under the tone mapped picture its tone mapper and grading rows; turn HDR on in Windows first) and the
|
||||
resolution. A setting that takes effect only when the game starts again says "after restart" once you change it,
|
||||
until you set it back, and the Restart button at the bottom then counts the settings waiting for it.
|
||||
- **Controls** in the menu has Button prompts: the game's own, or Xbox, PlayStation, Steam Deck or keyboard and mouse ones when
|
||||
|
||||
@@ -251,11 +251,14 @@ keeps per-core data without locks and relies on that, so the host models it (`ru
|
||||
target and copies that into the 8-bit sRGB window texture it presents. With `NX2NAVI_HDR=1` the tonemap shader gets
|
||||
the function of `shaders/hdr_tonemap.frag` spliced in where its SDR curve clamps each channel, so the float picture
|
||||
holds the HDR picture relative to the HUD's white (the function gets the values the curve takes, and the scene
|
||||
before the game's exposure gain with that gain, which it anchors mid grey on); 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, showing the picture as a display of gamma 2.2 would (the game is graded for one: decoded as
|
||||
its sRGB encode, the darkest tones would sit far above black). The look is fixed; the settings are the peak, game and
|
||||
HUD whites.
|
||||
before the game's exposure gain with that gain, which its default tone mapper anchors mid grey on); 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, showing the picture as a display of gamma 2.2 would (the
|
||||
game is graded for one: decoded as its sRGB encode, the darkest tones would sit far above black). The settings are
|
||||
the peak, game and HUD whites, the tone mapper (`NX2NAVI_HDR_TONEMAP`: the observer-response mapper, the game's own
|
||||
curve or the luminance mapper), what each tone mapper takes, the grading sliders and the gamma correction
|
||||
(`NX2NAVI_HDR_GAMMA`, with every tone mapper); they travel in five vec4 the support buffer gains, and at their
|
||||
defaults the shader leaves every grading step out.
|
||||
`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
|
||||
|
||||
@@ -35,6 +35,13 @@ cards).
|
||||
uploaded and decoded again each time, one of them 29 times in five seconds. On the same run that was 49,660 second
|
||||
uploads in three minutes, now 214, and the graphics card's upload work fell from 0.41 to 0.14 ms a frame
|
||||
(`tex_same_big = 0` brings the old behaviour back for a comparison).
|
||||
- **The tone mapped HDR picture has its settings back** in the Screen tab, under *HDR output* on its tone mapped
|
||||
choice (not *Native*) and the three brightness rows: *Tone mapper* and *Gamma correction*, then the rows of the tone
|
||||
mapper chosen, with *Exposure*, *Highlights*, *Shadows*, *Contrast* and *Saturation* among them. Each change shows
|
||||
at once. Left alone they give the picture HDR had from 0.9.0 to 0.10.1, true blacks included. *Gamma correction* now
|
||||
counts with every tone mapper; its *Off* shows the dark tones lighter. Lines for these settings that your
|
||||
nx2navi.ini still holds from before 0.9.0 (`hdr_tonemap`, `hdr_exposure`, `hdr_gamma` and the others
|
||||
`nx2navi.ini.example` lists) count again: remove them for the default look.
|
||||
|
||||
## Removed
|
||||
|
||||
|
||||
Reference in New Issue
Block a user