mirror of https://github.com/bherbruck/solidcraft.git synced 2026-11-03 02:25:55 +00:00

Files

T

selune 9e6e0b8df1 Render workspace: complete experimental ribbon, resources and effects integration (#5493 ) (#5494 )

* wip(render): reconcile completed material and image pipeline source with 0.20 (#5493)

Source-only integration reference for staged review, not a merge-ready aggregate.
Donor: 0xlillith/solidcraft@aea20b0115.
Upstream: 858e5995d6.

Retain original CPU/material contracts and explicit GPU donor provenance in
docs/render-materials-lab.md (#2067, #2191, #2780, #3306). Preserve released
format migrations and current navigation/startup/shell behavior. New saved
records use pending descriptors. The physical-card descriptor follows the
maintainer's material-engineering-cards naming request, with a legacy-lab
format-29 regression. Replace raw new panel hosts with shared containers.

Repository checks, complete workspace/all-target Clippy, and the independent
physical/resource authoring checks pass for this source. The fresh full local
CI invocation has reached test compilation and is not yet complete. Do not
transfer donor native output or prior test totals to this integration.

Generated review screenshots, video, package ZIP and machine logs remain at
the immutable personal evidence pin. Uncommitted geometric displacement is
backed up separately, not silently included. No kernel/vendor change, direct
main write, release or independent contributor-branch rewrite.

Co-authored-by: Christian Svensson <blue@cmd.nu>

* test(cli): pin the Compact camera-sample admission diagnostic (#5493)

The bounded request still refuses 1024x1024x64 samples before host initialization and writes no output. Update only the stale expected diagnostic to the existing Compact budget wording; production limits and code are unchanged. Exact-tree CLI regression suite: 14 passed, 0 failed. The full repository gate has been invoked separately and is not yet complete.

* Normalize UI container violation paths across platforms

Report repository-relative paths with forward slashes so diagnostics and the existing nested-package regression assertions agree on Windows and Unix. Keep the container detection rules unchanged.

Validation: official ui-containers gate and all seven focused xtask tests passed; rustfmt and diff checks passed. Only xtask/dependencies were compiled; no application build or heavy tests.
(cherry picked from commit 44b58d8e10)

* fix(render): preserve camera contracts and correct acceptance regressions (#5493)

Preserve Design view.apply semantics with a separate strict Render camera command. Retain existing translations when English-only aliases collide; add material-axis entries and camera-specific pitch labels. Compare complete validated engineering cards and retain job handles before cancellation.

Focused and native acceptance is pinned to tree f8a423b21f. Full CI has been invoked separately and is not claimed green. Landing follows the render integration policy in #5493.

* fix(render): resolve showcase licence and upstream resource hygiene (#5493)

Record SychPL's explicit MIT OR Apache-2.0 grant, retaining source/model bytes and the Ubuntu lettering notice. Remove 80 absent attribution rows, personal fork records, dead delivery attributes and three fork/resource-only workflows. Existing xtask assets now performs bounded offline hash checks and rejects orphan render attribution; no parallel draft CI or package installation. Original authoring reproduction remains explicit. Scoped xtask tests, assets, Clippy, formatting and prepared SELENE validation pass; no application or renderer-wide result is inferred.

* fix(render): align saved bounds and progressive sample resolution (#5493)

Address review r4364211669/r4364211677/r4364211681/r4364211691/r4364211695. Persisted light/frame domains respect the existing 1e9 document bound; related LED/rectangle/direction cases use the same bound. Workstation primary resolve shares the 4096 admission cap and film counters use checked conversions. Exact candidate: 485 CPU render tests, 21 render document tests and strict scoped Clippy pass, including positive boundary round trips and 2048/4096 end-to-end checkpoints. No released format/migration edits, relaxed test limits or full-stack acceptance claim.

* wip(render): isolate optional resources and harden sample handling (#5493)

Review work in progress: opt-in encoded render library with reproducible runtime catalog exports; native-only robust dependency through the workspace; checked bloom slices; per-sample point-light diagnostics; independent area-light spatial/film keys. Resource-module binaries in both configurations, generation, Cargo production feature graphs and attribution checks pass. Full engine/render regression and combined acceptance are pending: do not merge this donor as a constituent or treat scoped resource proof as runtime acceptance.

* fix(gpu): preserve donor allocations through the scope-safety repair (#5722)

Port the native-validated #5723 scope-cleanup correction into the experimental donor, retaining its adaptive, volume, aging, photographic and bloom allocations. Same reverse-drain helper and regression cases; the donor combination still needs its own compile/test gate and is not covered retroactively by render-base results.

* claim: #1369

* Reject unknown pending concepts after format folding (#1369)

* test(render): close bounded sampling and bloom review regressions (#5493)

Validate the optional-resource/lighting/dependency donor at its exact tree. Required Vulkan GPU 127/0/3; CPU renderer 487/0; engine Render 72/0; document render 21/0; lean library 7/0; strict scoped Clippy, assets/layers/lists/containers and lean-engine WASM pass. Preserve original failed controller/typing attempts. This is the draft donor/disposition source, not a replacement for constituent render PRs or final main acceptance.

* wip(render): preserve stable aging target validation candidate

Exact staged source from prior review work on donor 3b892eab5e. This is a recovery/review checkpoint, NOT accepted delivery. An actual command-path regression currently fails because the selected executor refuses ordered surface aging. No assertion, capability or admission limit is weakened. Native/UI/full combination acceptance remains pending. Saved/runtime split adds one pending descriptor and retains original file scope; no main/render branch is changed.

* test(render): preserve numeric setup intent at the admitted coordinate bound

Follow up jyviko review on #5494 without weakening the corrected saved-coordinate contract. The positive clicked fixture uses 1e9 instead of inadmissible 2e9; explicit out-of-range cases still refuse, and the full saved setup round-trips through JSON and the native container. Exact-source Render workspace 95/0 and strict all-target UI Clippy pass. This does not incorporate the separately failing stable-aging candidate or claim full current-render acceptance.

* test(render): use the real GPU executor for saved aging

Move successful native cold-reopen Check/Start coverage from the CPU-backed protocol fixture into the production GPU executor tests. Verify capture-index changes preserve the stable target and that enabling aging changes both PNG and raw EXR output. Retain explicit, allocation-free refusal coverage for executors without aging support. Production capabilities and admission checks are unchanged.

* fix(render): persist stable identities for targeted aging (#5493)

Separate saved RenderBodyTarget identities from captured mesh ordinals. Reject legacy ambiguous targets, resolve Check/Start after visibility changes and preserve native reopening, copies and undo. Unsupported executors still refuse; real AMD Vulkan regression completes saved aging after reordered capture.

Source tree 6b84c8ad passes document 23, engine Render 75, GPU effects 5 and Render UI 95 with no failures; scoped strict Clippy, WASM and repository gates pass. Fresh CLI/native reopen and clean/aged GPU exports pass with identical physical totals and inspected actual images. Whole current-render integration is separate.

* fix(render): reconcile combined CPU/GPU contracts on current upstream

Unify captured resources/status and CPU-vs-GPU request schemas after the real two-parent integration; remove obsolete duplicate Vulkan selector and retain combined platform-filter regression. Deduplicate only identical or superseded test definitions, retaining the stronger card metadata and reserved-executor assertions. No assertions, admission limits or feature refusals are weakened.

All targets of render dependencies, GPU, engine, UI, CLI and native app pass cargo check with raytrace-cpu and bundled-render-library at tree c70d00d1. Native executable tests and full current-source acceptance remain pending. This is a private integration rehearsal for subsequent constituent PRs, not an aggregate official render/main merge.

* test(render): retain one complete host lifetime regression set

Deduplicate byte-identical DropProbe/task-lifetime tests and retain the adapted environment/texture ownership regressions with every assertion and complete memory estimate. Keep the registered-geometry admission regression once; only struct field order differed. Replace a one-element diagnostic loop with its equivalent block, preserving all wrap/width assertions.

Test-only integration repair. Formatting and diff checks pass; refreshed executable validation is required. No production behavior, limits, assertions or ignores changed.

* fix(doc): recognize the proven format-29 card descriptor alias

Normalize only the historical format-29 physical-material-cards spelling, and only when material-engineering-cards is registered. Admission and migration de-duplication use the same identity. Unknown concepts, wrong versions and incapable readers still refuse before mutation. Six controlled-history Rust regressions and actual CLI migration/no-clobber acceptance pass. No version, released migration or CI changes. Refs #5793, #1369, #5493.

* test(render): preserve grounding refusal before explicit instance moves

Update the two Render binding fixtures for upstream first-occurrence grounding. Verify grounded movement refuses without changing document/history, then explicitly unground through the public command before the intended move. Retain every target, resource, copy and persistence assertion. Refs #5493.

---------

Co-authored-by: Christian Svensson <blue@cmd.nu>
Co-authored-by: Victor Santos Oliveira <56417388+Vittuu@users.noreply.github.com>
Co-authored-by: cfaulkingham <colin.faulkingham@gmail.com>

2026-10-24 14:21:59 +00:00

9.0 KiB

Raw Blame History

HDR environment sampling (#1693)

Source implementation and opt-in CPU direct-light consumer are prepared. No executed HDR-lit PNG, test, full gate or delivered HDRI feature is claimed. The existing default preview remains unchanged.

lighting::environment_sampling::EnvironmentPreparation borrows an existing DecodedHdr. It checks bounded 2:1 dimensions and original pixel allocation capacity, then validates at most 16,384 pixels per step. The caller supplies a fallible work/cancellation callback, charged for each inspection. Errors consume preparation; finish refuses incomplete validation. No decoder, cache, CDF, pixel clone, worker or pool is added. The existing owner and admission lease must outlive the borrowed view. retained_pixel_bytes reports capacity, not length; the host charges the owner for its retained lifetime. Captured image storage is released before PNG publication; retained capture metadata has its own Record lease.

Coordinates and estimator

Directions point away from the shading point. The map is Z-up: +Z is north, phi=atan2(y,x), u=wrap(phi/(2*pi)), v=acos(z)/pi. Nearest lookup uses half-open texel cells centred on ((x+.5)/width,(y+.5)/height). Longitude wraps, the south pole clamps to the last row, and an exact pole chooses longitude zero before rotation. Positive rotation turns the environment about +Z toward +Y; lookup subtracts that rotation. There is no extra orientation inherited from an external application's conventions.

The first proposal samples uniform z in (-1,1) and phi in (0,2*pi). Since dOmega=dphi*dz, its PDF is 1/(4*pi) per steradian everywhere. The PDF remains normalized for black maps, without a division by total image brightness. Constant maps preserve their radiance. This is not importance sampling; small bright sources can have high variance. Nearest lookup is intentionally not bilinear filtering or a claim of antialiasing. Floating-point boundary rounding can still produce a pole, whose lookup is defined.

direct_sample_linear_srgb returns an unoccluded BRDF*cos*Li/pdf estimate. The geometric normal excludes incident and view directions crossing the original surface; the shading normal affects the BRDF and cosine. The consumer owns visibility and averages exactly once over the requested environment sample count. The helper does not apply exposure, mapping, sRGB encoding or a sample-count division.

Colour policy

Decoded HDR is linear RGB in its SOURCE space. RGBE decoding has already divided by the file's exposure and colour correction; sampling never repeats either. Source-space lookup is explicitly named radiance_source_rgb.

The initial lighting adapter admits only explicit PRIMARIES values matching sRGB/D65: 0.64 0.33 0.30 0.60 0.15 0.06 0.3127 0.3290. It uses these linear channels directly, without applying the sRGB transfer curve. Missing primaries and all other primaries refuse illumination; default Radiance RGB is not silently relabeled sRGB. Supporting other primaries requires a separately validated gamut and white-point conversion. No clipping or invented conversion is used here.

CPU consumer source and remaining integration

The new branch starts from actual upstream history. The separately qualified RT2 source is not a commit parent or an executed validation result for this module. Integration must use its real prerequisite commit or an explicitly recorded source overlay before its own gates; no copied build outputs.

Capture the admitted existing HDR source and preserve its original encoded allocation. Include encoded/decoded retained capacities, request clones and state in the existing 384 MiB job and 512 MiB shared admission. Capture metadata keeps its Record-owned lease after frame eviction. Refuse unsupported primaries before publication.
Incremental preparation calls the SAME cumulative job work budget and cancel token. The implemented owned adapter moves EnvironmentInput through host work into one existing HdrDecodeTask. The image task owns its completed DecodedHdr and creates short-lived borrowed views, without a self-referential borrow or a second decoded copy. Decoding validates corrected texels incrementally; internal views check shape and capacity without rescanning every texel for each sample. Execution and visual acceptance remain pending.
At an opaque hit, each environment direct sample creates one positive-minimum secondary visibility ray from the shared geometric offset. Reuse the existing resumable traversal cursor, charging every sample and traversal unit. Add visible estimates in linear space and divide by environment sample count once.
Primary misses remain equal to the requested display background. The radiance_linear_srgb API is available for later secondary-miss transport; reflection continuation is not connected in this consumer. Combining environment next-event estimates and rough-specular paths that miss requires matched MIS or a documented partition of the two terms; until implemented, refuse that combination. Do not count the same environment specular energy twice.
Add environment illumination to existing direct lights without adding another ambient term. Exposure, Reinhard and sRGB transfer remain a single final step. Image/task/host cancellation must publish no partial successful frame.

Original analytic tests generate RGBE bytes at runtime: constant map and PDF, single bright cell solid angle, black map, axes/rotation/seam/poles, cancellation and shared-budget failure, decoder corrections, unsupported primaries, hostile options/directions and an independent white-conductor hemispherical integral. They have NOT RUN. No external assets, dependencies or persistence fields added.

Mathematical references only; no code or figures copied: PBRT, Infinite Area Lights for radiance and solid-angle estimators (its image mapping is different), and W3C CSS Color 4, sRGB for the sRGB/D65 primary coordinates and the distinction from encoded sRGB.

Opt-in request (not yet executed)

render.preflight / render.start accept an environment object alongside integrator:"raytrace", for example:

{"integrator":"raytrace","raytrace":{"lights":[]},"environment":{"path":"original-srgb.hdr","rotation_radians":0,"intensity":1,"samples":64}}

The input path uses the existing scoped, bounded VFS reader and HdrSource. The captured source is passed separately to CpuHost::submit_with_environment, never serialized or cloned into job status. A separate fixed-size EnvironmentInfo records the SHA-256 digest, numerical header, controls and explicit colour policy in preflight and status, without the source path or pixels. Encoded capacity, exact decoded storage, scanline storage and bounded state are added before the shared reservation; allocators that exceed admitted scanline/decoded capacities refuse. Direct-light visibility uses the existing positive-minimum ray and resumable cursor. Primary misses retain the exact requested background. Samples use deterministic z/phi stratum centres (one sample uses a fixed interior point); finite-count quadrature can be biased and is not a convergence or unbiased-rendering claim.

The standalone HDR checkpoint has no reflection continuation. This isolated combined source connects secondary environment misses and explicitly selected metallic rough reflectors or ideal mirrors; see the integration contract. Mixed/diffuse rough HDR combinations and unknown optics fields refuse. No MIS, transmission, texture, emissive geometry, GPU or saved HDR environment is advertised. Existing saved environment controls remain refused; runtime controls are explicit above.

Seven consumer source regressions complement the nine analytic/input regressions: an image-task PNG oracle and deterministic/background checks, decode/visibility cancellation and work exhaustion, native captured-source ownership, four-unit quanta, all traversal-to-shading transitions, engine rendering after source-file removal compared with unlit geometry, and capture-metadata lease release after PNG eviction. All 16 tests remain NOT RUN.

Consumer review repairs: environment cursor continuation charges traversal without an additional shading debit; each pixel quantum remains at most four shared work units. Both request resolvers require Hdri when a source is captured. Only the native feature-on raytrace descriptor advertises this narrow environment path. Preflight and job status retain fixed-size SHA-256 bytes, bounded header numbers, controls and explicit colour policy; neither the input path nor image bytes are retained there. Fixed metadata is charged to the Record-owned lease independently of the PNG, while captured image storage stays under the work lease. Preflight includes retained request metadata in its combined per-job estimate. A regression withdraws the actual HDR file and compares lit geometry against the same unlit job. All tests remain NOT RUN.

9.0 KiB Raw Blame History