* 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 commit44b58d8e10) * 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 treef8a423b21f. 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 donor3b892eab5e. 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 tree6b84c8adpasses 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 treec70d00d1. 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>
4.3 KiB
Combined CPU direct lights
Source-only integration: compilation, tests, native PNG inspection, Clippy, wasm and full CI have NOT RUN on this revision. Historical component results do not qualify this combination.
The existing native render.preflight / render.start engine commands, also
available through persistent MCP, accept these transient raytrace fields:
| Source | Field | Maximum sources and retained slots |
|---|---|---|
| Directional | lights or an existing preset |
8 |
| Point or spot | punctual_lights |
8 |
| Rectangle, including lowered LED strips | area_lights |
4 |
The combined maximum is 20 sources. Omitting directionals keeps the existing
studio; lights: [] disables them. Presets and custom directional lists remain
mutually exclusive. All source positions and orientations are world-space;
distances and full rectangle edges are millimetres. Colours are linear sRGB.
Intensity is illustrative relative radiance, not watts, lumens, lux or measured
colour temperature. There is no source mesh or primary-visible emission.
A point has position_mm, color, intensity, reference_distance_mm and
minimum_distance_mm. An optional cone gives a spot's emitted_axis
(pointing from the source), inner_half_angle_radians and
outer_half_angle_radians. The existing inverse-square reference-distance
response and smooth cosine feather are retained.
A rectangle has center_mm, edge_u_mm, edge_v_mm, color and intensity.
The cross product of its full edges gives its emitting side. area_samples
is exactly 1, 4, 16 or 64, default 16, per whole rectangle per shading hit.
seed is an optional u32. Explicit area sampling controls require a nonempty
rectangle list. Each sample retains the existing
BRDF * Le * cos(surface) * cos(emitter) * area / (distance² * N) weight;
changing N does not multiply emitted power. Finite shadow rays end before the
sampled source; geometry beyond the source cannot occlude it.
An optional top-level led_strip has center_mm, length_mm, width_mm,
unit length_axis, unit width_axis, color and intensity. Top-level
led_samples is 1/4/16/64, default 16, and requires the recipe. One continuous
strip lowers to one existing rectangle before scene capture, without retaining
the recipe or adding a second renderer. A strip and other rectangles share N;
conflicting values refuse. Discrete pads, pitch, spectra and calibrated CCT
are unsupported.
At maximum N, one hit can attempt 8 directional + 8 punctual + 4*64 area samples, or 272 analytic direct-source attempts. This is not a work-debit or total-ray bound. Traversal, HDR preparation/sampling, primary AA, reflection attempts and bounces add work under the same cumulative 1,000,000,000 limit. The existing four-unit continuation quantum, cancellation, 384 MiB job limit, 512 MiB host pool and retained Record request lease remain.
All direct terms use the current captured hit and opaque/qualified planar
anisotropic BRDF, multiply by path throughput, and join the existing radiance
sum before its display transform. Delta mirrors skip these non-delta direct
terms. Each secondary hit resets area and punctual continuation state.
The existing HDR/reflection estimator partition and primary_samples 1/4/16
policy remain; this adds no glass, MIS, GI, denoiser or material persistence.
The ordinary CLI render wrapper still selects the raster path. Optional
desktop CPU/AA controls are described in CPU ray images;
they do not expose explicit light authoring. This integration adds no CLI
lighting flags or UI light editor. A persistent native MCP session with the
existing raytrace-cpu build and installed host is the command route for these
lights. Feature-off and unavailable hosts refuse before capture.
Written tests cover combined counts/capacities, recipe preservation and atomic refusals, N-independent area weights, mixed radiance, continuation partitioning, 272 attempts, cancellation/work exhaustion, preflight and Record lease lifetime. They remain NOT RUN. Combined anisotropic/reflection/HDR fixtures, CLI workflow parity, exact-build layout and presentation acceptance remain pending. No external assets, dependencies or license changes are introduced; the existing SolidCraft implementations and their contribution licenses are retained.