Review fixes for #1414 (contribution gate):
- Java packs no longer get Horizon's shadow map: it was mirrored in y and
reversed in depth against the GL conventions the packs sample with, had
no distortion and only the camera's sections, so BSL drew no shadows
while the pass cost 0.65 ms (MakeUp, M4 Pro). shadowtex* stays a far
depth, as on main; the packs' own shadow programs are #1326.
- Invented uniforms removed (centerDepthSmooth fixed at 0.5,
ambientOcclusionLevel and shadowMapResolution as uniforms, constant
temp/rainfall/biome/held items); an unknown uniform stays zero as
before. wetness keeps its Iris smoothing. Unused directives removed.
- texture.<stage>.<sampler> is scoped to Iris's stages (final reads the
composite ones) instead of overriding the sampler in every pass;
texture.noise replaces noisetex. One noise generator and one RGBA
upload for both pack kinds.
- The G-buffer pass, the opaque-depth copy and the shadow pass run only
for a pack that reads them (naga's per-entry-point binding use, not a
text search): every pack paid all three before.
- Api 2's prelude additions go in their own file after api 1's, so api 1
packs keep the names they declare (aces_tonemap, material_at...).
- Stage kinds shadow, gbuffer, deferred and final ran as composite: only
composite is accepted; api 2 adds formats (validated), profiles,
option descriptions and a noise texture.
- Shader Pack Settings applies once when the page closes, as Iris's Done
(each click or slider step rebuilt the pack: 2.7 s per click, 12.7 s
for one drag with BSL). Labels follow Iris (.lang, else the name).
A pack whose options can't be read isn't read again every frame.
- Saved option values an option doesn't list are ignored, as OptiFine's
ShaderOption.setValue (a stale file broke BSL's compile).
- Import: the blocking file dialog (osascript/zenity/kdialog/PowerShell
on the event loop) is gone; a pack dropped on the Shader Packs page is
copied and picked, as Iris's onFilesDrop. Drops elsewhere do nothing,
an existing pack isn't overwritten, links aren't followed.
- Docs and the example say what the code does (SSAO, not GTAO).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Drop the Horizon menu style (options_horizon.rs, front.rs, the live title
backdrop and its post grade, the launcher's menu-style setting, CLI and MCP
tool). Every screen is vanilla's. Horizon's own settings hang off vanilla's
Options the way mods add theirs: Horizon Settings... and Mods... take the
Telemetry/Credits slots, and Horizon Settings opens Graphics, Advanced
Graphics, Shader Packs, Controller Settings, Extras and Mods, each a vanilla
options list with tooltips. Play with friends moves behind vanilla's Friends
buttons: the pause menu's opens Play with Friends (share, copy, stop), the
title screen's opens Join a Friend, and Direct Connection takes a full code.
Old files load as before: horizon.txt's menuStyle line and
horizon-graphics.txt's level line are ignored.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
🤖 Agent: merged after integration wave 1 on the desktop (main e730dc14 + #1108#1114#1131#1157#1158#1162 = ae482a72): fmt, clippy -D warnings, workspace tests (one port-race flake in horizon-server panel, passes on rerun), release build, tools/parity.py --changed origin/main 299/302 then the 3 rerun: save_roundtrip pass, world_reopen pass x2 (one early-count flake), dedicated_server = known flake also failing on main (fixed by #1183/#1184).
The Shader Pack setting cycled through what shaderpacks/ held, so with the
folder empty (or the packs in the launcher's version folder, as brabus_ had
them) it silently stayed Off. The row now opens a Shader Packs page: a
sidebar section in the Horizon menus, Video Settings > Shader Packs... in
the Classic ones. It shows the game home's shaderpacks/ path and an Open
Folder button (made if missing), says when there is no pack, and lists one
switch per pack. A pack that fails to load says why on its row. The list is
read again every second while the page shows.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Complementary Unbound drew clouds and light shafts inside terrain and a
second sun because the full-screen passes got wrong inputs:
- eyeBrightness was a constant (0, 240), so packs saw open sky
underground. It is now the block and sky light of the camera entity's
eye block (CommonUniforms.getEyeBrightness), and eyeBrightnessSmooth
follows it with the pack's eyeBrightnessHalflife (SmoothedFloat).
- Custom uniforms (uniform.* / variable.* in shaders.properties) were all
0: Complementary's eyeBrightnessM, isEyeInCave, starter, framemod8 and
the rest. horizon-shaderpack's uniforms.rs parses and evaluates them
each frame like Iris (stareval priorities, IrisFunctions, SmoothFloat).
- sunPosition, moonPosition, shadowLightPosition, sunAngle and
shadowAngle now follow CelestialUniforms: the sky's sun and moon angles
turned by Y -90, the pack's sunPathRotation about Z, then the angle. The
old sun vector pointed north-south instead of east-west.
- While a Java pack runs, sunPathRotation tilts Horizon's sun, moon and
stars as Iris tilts vanilla's, and clouds = off | fast | fancy, sun and
moon = false apply. Complementary and Sildur's set clouds = off; the
vanilla clouds Horizon drew anyway wrote depth the packs' light shafts
and fog took for terrain.
Fixes#944
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
A folder holding shaders/, or a .zip, in shaderpacks/ now loads from the
Shader Packs screen: every planned begin, prepare, deferred, composite
and final pass is translated and drawn each frame over Horizon's world,
with Iris's formats, clears and buffer flips.
The targets keep OpenGL's layout (the translator flips gl_Position and
remaps its depth), the world enters as OpenGL depth, and the pack gets
OpenGL matrices. Textures share four samplers by kind (Metal allows 16
per stage), and isnan/isinf test bits (Metal's fast math folds x != x).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The begin, prepare, deferred, composite and final passes of a program
folder: what each writes (the later of DRAWBUFFERS and RENDERTARGETS),
which side of every ping-ponged colour target it reads (Iris's
BufferFlipper, with flip.* overrides), mipmapped targets, scale.*, and
the targets' formats, clearing and sizes from the consts of every pass
in Iris's order. The preprocessor now keeps the directive comments of
active code, as Iris's does, so a DRAWBUFFERS in an #if'd out branch
doesn't count.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Java .properties parsing, the two reads Iris makes (the raw file for
screens, sliders and profiles; the preprocessed one, with enabled options
and the environment's macros defined, for everything else), option
screens, profiles and the current one, program.*.enabled through a port
of Iris's BooleanParser, image formats for shadowcomp's writeonly
images, and blend overrides.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The legaliser of docs/shader-packs.md step 1, on a syntax tree (glsl-lang)
instead of the spike's tokens: attribute/varying to located in/out with
matrix and array varyings split, loose uniforms in one std140 block that
extends across a pass, combined samplers split into texture + sampler
bindings (through function parameters, respecting locals that hide them),
compatibility built-ins and Iris's core-profile names declared, legacy
texture and shadow calls, hoisted global initialisers, sized unsized
arrays, isnan/isinf/modf helpers, and dead code after a jump dropped (the
spike's 'naga constructor bug' in BSL was code after discard). naga then
parses, validates and writes WGSL. The programs of one pass share a Link
so locations, bindings and the uniform layout agree.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
A new crate for the OptiFine/Iris translation (docs/shader-packs.md, order
step 1, first half): open a pack folder or zip (shaders/ found as Iris finds
it), list its programs per dimension folder, build the #include graph,
discover options per include component (OptionAnnotatedSource rules: boolean
defines referenced by #ifdef, value defines and configurable consts with a
[...] list, conflicting defaults dropped), write the player's values into
the lines, and expand Iris's standard macros with pp-rs, keeping line
numbers so errors name file:line.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>