* 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>
212 lines
8.7 KiB
Rust
212 lines
8.7 KiB
Rust
//! Bounded optical data and original f64 dielectric transport oracles. Units are mm.
|
|
use solidcraft_geom::Vec3;
|
|
#[path = "subsurface.rs"]
|
|
pub mod subsurface;
|
|
use subsurface::Subsurface;
|
|
|
|
use crate::surface::{SurfaceError, unit_direction};
|
|
|
|
#[derive(Clone, Copy, Debug, PartialEq)]
|
|
pub struct Transmission {
|
|
absorption_per_mm: Vec3,
|
|
thin_wall_thickness_mm: Option<f64>,
|
|
shadow_transmission: bool,
|
|
subsurface: Option<Subsurface>,
|
|
}
|
|
|
|
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
|
pub enum TransmissionError {
|
|
Absorption,
|
|
Scattering,
|
|
Distance,
|
|
Thickness,
|
|
Angle,
|
|
Ior,
|
|
Direction,
|
|
}
|
|
impl std::fmt::Display for TransmissionError {
|
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
f.write_str(match self {
|
|
Self::Scattering => "subsurface scattering requires a closed medium, finite scattering 0..100/mm, HG anisotropy -0.95..0.95 and disabled straight shadow transmission",
|
|
Self::Absorption => "absorption_per_mm must be finite RGB coefficients in [0, 100] per mm",
|
|
Self::Distance => "geometric absorption distance must be finite and nonnegative",
|
|
Self::Thickness => "thin-sheet thickness must be finite and in [0, 10000] mm",
|
|
Self::Angle => "incident cosine must be finite and in [0, 1]",
|
|
Self::Ior => "medium IOR must be finite and in [1, 3]",
|
|
Self::Direction => "incident direction must face the finite nonzero interface normal",
|
|
})
|
|
}
|
|
}
|
|
impl std::error::Error for TransmissionError {}
|
|
|
|
impl Transmission {
|
|
pub fn new(absorption_per_mm: Vec3, thin_wall_thickness_mm: Option<f64>) -> Result<Self, TransmissionError> {
|
|
if !absorption_per_mm.is_finite()
|
|
|| ![absorption_per_mm.x, absorption_per_mm.y, absorption_per_mm.z].into_iter().all(|v| (0.0..=100.0).contains(&v))
|
|
{
|
|
return Err(TransmissionError::Absorption);
|
|
}
|
|
if thin_wall_thickness_mm.is_some_and(|v| !v.is_finite() || !(0.0..=10000.0).contains(&v)) {
|
|
return Err(TransmissionError::Thickness);
|
|
}
|
|
Ok(Self { absorption_per_mm, thin_wall_thickness_mm, shadow_transmission: thin_wall_thickness_mm.is_some(), subsurface: None })
|
|
}
|
|
/// Thin sheets enable straight shadow transmission by default; solids opt in.
|
|
pub fn with_shadow_transmission(mut self, enabled: bool) -> Self {
|
|
self.shadow_transmission = enabled;
|
|
self
|
|
}
|
|
pub fn with_subsurface(mut self, subsurface: Subsurface) -> Result<Self, TransmissionError> {
|
|
subsurface.validate()?;
|
|
if self.thin_wall_thickness_mm.is_some() || (subsurface.active() && self.shadow_transmission) {
|
|
return Err(TransmissionError::Scattering);
|
|
}
|
|
self.subsurface = Some(subsurface);
|
|
Ok(self)
|
|
}
|
|
pub fn subsurface(self) -> Option<Subsurface> {
|
|
self.subsurface
|
|
}
|
|
pub fn shadow_transmission(self) -> bool {
|
|
self.shadow_transmission
|
|
}
|
|
pub fn thin_wall_thickness_mm(self) -> Option<f64> {
|
|
self.thin_wall_thickness_mm
|
|
}
|
|
pub fn extinction(self) -> Vec3 {
|
|
self.absorption_per_mm
|
|
}
|
|
pub fn attenuation(self, distance_mm: f64) -> Result<Vec3, TransmissionError> {
|
|
if !distance_mm.is_finite() || distance_mm < 0.0 {
|
|
return Err(TransmissionError::Distance);
|
|
}
|
|
let s = self.extinction();
|
|
Ok(Vec3::new((-s.x * distance_mm).exp(), (-s.y * distance_mm).exp(), (-s.z * distance_mm).exp()))
|
|
}
|
|
}
|
|
|
|
#[derive(Clone, Copy, Debug, PartialEq)]
|
|
pub struct Fresnel {
|
|
pub s: f64,
|
|
pub p: f64,
|
|
/// None at total internal reflection.
|
|
pub transmitted_cosine: Option<f64>,
|
|
}
|
|
impl Fresnel {
|
|
pub fn reflectance(self) -> f64 {
|
|
(self.s + self.p) * 0.5
|
|
}
|
|
}
|
|
|
|
/// Exact unpolarized power reflectance at a lossless dielectric interface.
|
|
pub fn fresnel(cosine: f64, incident_ior: f64, transmitted_ior: f64) -> Result<Fresnel, TransmissionError> {
|
|
if !cosine.is_finite() || !(0.0..=1.0).contains(&cosine) {
|
|
return Err(TransmissionError::Angle);
|
|
}
|
|
if [incident_ior, transmitted_ior].into_iter().any(|v| !v.is_finite() || !(1.0..=3.0).contains(&v)) {
|
|
return Err(TransmissionError::Ior);
|
|
}
|
|
if incident_ior == transmitted_ior {
|
|
return Ok(Fresnel { s: 0.0, p: 0.0, transmitted_cosine: Some(cosine) });
|
|
}
|
|
let eta = incident_ior / transmitted_ior;
|
|
let sin2 = eta * eta * (1.0 - cosine * cosine).max(0.0);
|
|
if sin2 >= 1.0 {
|
|
return Ok(Fresnel { s: 1.0, p: 1.0, transmitted_cosine: None });
|
|
}
|
|
let ct = (1.0 - sin2).sqrt();
|
|
let rs = (incident_ior * cosine - transmitted_ior * ct) / (incident_ior * cosine + transmitted_ior * ct);
|
|
let rp = (transmitted_ior * cosine - incident_ior * ct) / (transmitted_ior * cosine + incident_ior * ct);
|
|
Ok(Fresnel { s: rs * rs, p: rp * rp, transmitted_cosine: Some(ct) })
|
|
}
|
|
|
|
/// Incident direction points toward the surface; normal points into the incident medium.
|
|
pub fn refract(incident: Vec3, normal: Vec3, incident_ior: f64, transmitted_ior: f64) -> Result<Option<Vec3>, TransmissionError> {
|
|
let direction_error = |_: SurfaceError| TransmissionError::Direction;
|
|
let d = unit_direction(incident).map_err(direction_error)?;
|
|
let n = unit_direction(normal).map_err(direction_error)?;
|
|
let cosine = -d.dot(n);
|
|
if cosine < 0.0 {
|
|
return Err(TransmissionError::Direction);
|
|
}
|
|
let f = fresnel(cosine.min(1.0), incident_ior, transmitted_ior)?;
|
|
Ok(f.transmitted_cosine.map(|ct| {
|
|
let eta = incident_ior / transmitted_ior;
|
|
d * eta + n * (eta * cosine - ct)
|
|
}))
|
|
}
|
|
|
|
/// Incoherent parallel slab, including all repeated internal reflections. The two
|
|
/// external media have the same IOR. Returns linear RGB (reflectance, transmittance).
|
|
pub fn slab(
|
|
transmission: Transmission,
|
|
thickness_mm: f64,
|
|
cosine: f64,
|
|
outside_ior: f64,
|
|
inside_ior: f64,
|
|
) -> Result<(Vec3, Vec3), TransmissionError> {
|
|
if !thickness_mm.is_finite() || !(0.0..=10000.0).contains(&thickness_mm) {
|
|
return Err(TransmissionError::Thickness);
|
|
}
|
|
let f = fresnel(cosine, outside_ior, inside_ior)?;
|
|
let Some(ct) = f.transmitted_cosine.filter(|v| *v > 0.0) else {
|
|
return Ok((Vec3::new(1.0, 1.0, 1.0), Vec3::ZERO));
|
|
};
|
|
let a = transmission.attenuation(thickness_mm / ct)?;
|
|
let channel = |r: f64, a: f64| {
|
|
let denominator = 1.0 - r * r * a * a;
|
|
if denominator <= 0.0 {
|
|
return (1.0, 0.0);
|
|
}
|
|
(r + (1.0 - r).powi(2) * r * a * a / denominator, (1.0 - r).powi(2) * a / denominator)
|
|
};
|
|
// A parallel slab preserves polarization. Sum each geometric series before
|
|
// averaging s/p, rather than repeatedly applying the unpolarized mean.
|
|
let average = |a: f64| {
|
|
let (rs, ts) = channel(f.s, a);
|
|
let (rp, tp) = channel(f.p, a);
|
|
((rs + rp) * 0.5, (ts + tp) * 0.5)
|
|
};
|
|
let (rx, tx) = average(a.x);
|
|
let (ry, ty) = average(a.y);
|
|
let (rz, tz) = average(a.z);
|
|
Ok((Vec3::new(rx, ry, rz), Vec3::new(tx, ty, tz)))
|
|
}
|
|
|
|
/// Explicit straight-through solid shadow approximation. Both interface losses
|
|
/// use reciprocal external-angle Fresnel; `distance_mm` is the actual geometric
|
|
/// entry/exit interval. This omits refraction and repeated internal reflections.
|
|
pub fn solid_shadow(transmission: Transmission, distance_mm: f64, entry_cosine: f64, exit_cosine: f64, ior: f64) -> Result<Vec3, TransmissionError> {
|
|
let entry = fresnel(entry_cosine, 1.0, ior)?.reflectance();
|
|
let exit = fresnel(exit_cosine, 1.0, ior)?.reflectance();
|
|
Ok(transmission.attenuation(distance_mm)? * ((1.0 - entry) * (1.0 - exit)))
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod shadow_tests {
|
|
use super::*;
|
|
#[test]
|
|
fn defaults_and_reciprocal_solid_shadow_match_analytic_beer() {
|
|
let sigma = Vec3::new(-0.5_f64.ln(), -0.8_f64.ln(), 0.0);
|
|
let solid = Transmission::new(sigma, None).unwrap();
|
|
let sheet = Transmission::new(sigma, Some(1.0)).unwrap();
|
|
assert!(!solid.shadow_transmission());
|
|
assert!(sheet.shadow_transmission());
|
|
assert!(solid.with_shadow_transmission(true).shadow_transmission());
|
|
assert!(!sheet.with_shadow_transmission(false).shadow_transmission());
|
|
assert!((solid_shadow(solid, 1.0, 1.0, 1.0, 1.5).unwrap() - Vec3::new(0.5, 0.8, 1.0) * 0.96 * 0.96).len() < 1e-14);
|
|
assert_eq!(solid_shadow(solid, 1.0, 0.2, 0.8, 1.5).unwrap(), solid_shadow(solid, 1.0, 0.8, 0.2, 1.5).unwrap());
|
|
for ior in [1.0, 1.5, 3.0] {
|
|
for cosine in [0.0, 0.02, 0.5, 1.0] {
|
|
let shadow = solid_shadow(solid, 1.0, cosine, cosine, ior).unwrap();
|
|
assert!(shadow.is_finite() && shadow.x >= 0.0 && shadow.z <= 1.0);
|
|
}
|
|
}
|
|
assert!(solid_shadow(solid, f64::NAN, 1.0, 1.0, 1.5).is_err());
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
#[path = "dielectric_oracle_tests.rs"]
|
|
mod tests;
|