Skip to content

armgit / 67.js

Public Imported from GitHub
0

3D engine that AI agents drive

Fix anisotropic energy-comp coords, transparent bounce limits, and SPDX headers (#894)

Nguyen Xuan An03109aeea7d2
diff --git a/packages/render-native/src/cycles/abi.wgsl b/packages/render-native/src/cycles/abi.wgsl
index 0524b153..52253bae 100644
--- a/packages/render-native/src/cycles/abi.wgsl
+++ b/packages/render-native/src/cycles/abi.wgsl
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: 2011-2026 Blender Foundation
+// SPDX-License-Identifier: Apache-2.0
+
enable wgpu_ray_query;
// Cycles-parity native kernel ABI header (`FORMAT-v2.md`).
diff --git a/packages/render-native/src/cycles/bootstrap_main.wgsl b/packages/render-native/src/cycles/bootstrap_main.wgsl
index 1970c06b..1dcdf933 100644
--- a/packages/render-native/src/cycles/bootstrap_main.wgsl
+++ b/packages/render-native/src/cycles/bootstrap_main.wgsl
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: 2011-2026 Blender Foundation
+// SPDX-License-Identifier: Apache-2.0
+//
// Bootstrap entry points used only when `bootstrapKernel: true` is requested while `kernel-manifest.txt` has no
// compute entry point yet. Never listed in `kernel-manifest.txt`, so zero symbols collide with integrator or closure modules.
diff --git a/packages/render-native/src/cycles/bsdf_microfacet.wgsl b/packages/render-native/src/cycles/bsdf_microfacet.wgsl
index ea96f910..fe20ecd8 100644
--- a/packages/render-native/src/cycles/bsdf_microfacet.wgsl
+++ b/packages/render-native/src/cycles/bsdf_microfacet.wgsl
@@ -3681,45 +3681,20 @@ fn bsdf_mf_sample_vndf(local_wo: vec3<f32>, alpha_x: f32, alpha_y: f32, rand: ve
fn bsdf_mf_albedo_coords(
normal: vec3<f32>,
- tangent: vec3<f32>,
+ _tangent: vec3<f32>,
wo: vec3<f32>,
alpha_x: f32,
alpha_y: f32,
) -> vec2<f32> {
let cos_no = max(dot(wo, normal), 0.0);
- if (alpha_x == alpha_y) {
- return vec2<f32>(
- bsdf_mf_alpha_to_roughness_index(alpha_x, alpha_y),
- bsdf_mf_mu_to_y_index(cos_no),
- );
- }
- let frame = bsdf_mf_make_orthonormals_tangent(normal, tangent);
- let lx = dot(frame[0], wo);
- let ly = dot(frame[1], wo);
- let sin2 = lx * lx + ly * ly;
- let ax2 = alpha_x * alpha_x;
- let ay2 = alpha_y * alpha_y;
- let a_rms = sqrt(0.5 * (ax2 + ay2));
- let a_base = 0.82 * a_rms + 0.09 * (alpha_x + alpha_y);
- var a_perp = a_rms;
- var a_az = a_rms;
- if (sin2 > 1e-8) {
- let inv_sin2 = 1.0 / sin2;
- a_perp = sqrt((ax2 * ly * ly + ay2 * lx * lx) * inv_sin2);
- a_az = sqrt((ax2 * lx * lx + ay2 * ly * ly) * inv_sin2);
- }
- let a_eff = clamp(a_base + 0.22 * sin2 * (a_perp - a_rms), 1e-6, 1.0);
- let mu_eff = cos_no * inverseSqrt(max(cos_no * cos_no + sin2 * (a_az / a_eff), 1e-12));
- return vec2<f32>(sqrt(a_eff), bsdf_mf_mu_to_y_index(mu_eff));
+ return vec2<f32>(
+ bsdf_mf_alpha_to_roughness_index(alpha_x, alpha_y),
+ bsdf_mf_mu_to_y_index(cos_no),
+ );
}
fn bsdf_mf_albedo_avg_roughness(alpha_x: f32, alpha_y: f32) -> f32 {
- if (alpha_x == alpha_y) {
- return bsdf_mf_alpha_to_roughness_index(alpha_x, alpha_y);
- }
- let a_rms = sqrt(0.5 * (alpha_x * alpha_x + alpha_y * alpha_y));
- let a_base = clamp(0.82 * a_rms + 0.09 * (alpha_x + alpha_y), 1e-6, 1.0);
- return sqrt(a_base);
+ return bsdf_mf_alpha_to_roughness_index(alpha_x, alpha_y);
}
fn bsdf_mf_preserve_energy_glossy(
diff --git a/packages/render-native/src/cycles/integrator.wgsl b/packages/render-native/src/cycles/integrator.wgsl
index e7dbfcec..9d1026ce 100644
--- a/packages/render-native/src/cycles/integrator.wgsl
+++ b/packages/render-native/src/cycles/integrator.wgsl
@@ -734,6 +734,7 @@ fn main(@builtin(global_invocation_id) global_id: vec3<u32>) {
var prev_recv_lo = 0xFFFFFFFFu;
var prev_recv_hi = 0xFFFFFFFFu;
var terminate_on_hit = false;
+ var terminate_on_next_surface = false;
var bounce = 0u;
var diffuse_bounces = 0u;
@@ -793,7 +794,7 @@ fn main(@builtin(global_invocation_id) global_id: vec3<u32>) {
}
if (volume_scattered) {
- if (terminate_on_hit) {
+ if (terminate_on_hit || terminate_on_next_surface) {
break;
}
if (in_medium) {
@@ -908,12 +909,19 @@ fn main(@builtin(global_invocation_id) global_id: vec3<u32>) {
}
}
+ if (terminate_on_next_surface) {
+ break;
+ }
+
if (terminate_on_hit) {
if (closure.lobe_count > 0u && closure.lobes[0].lobe_type == LOBE_TRANSPARENT && closure.total_sample_weight > 0.0) {
- if (transparent_bounces < kernel_params.max_transparent_bounces) {
+ if (kernel_params.max_transparent_bounces > 0u && transparent_bounces < kernel_params.max_transparent_bounces) {
let trans_prob = clamp(closure.lobes[0].sample_weight / closure.total_sample_weight, 0.0, 1.0);
if (trans_prob > 0.0 && smp_next_1d(&rng) < trans_prob) {
transparent_bounces += 1u;
+ if (transparent_bounces >= kernel_params.max_transparent_bounces) {
+ terminate_on_next_surface = true;
+ }
throughput *= closure.lobes[0].weight / trans_prob;
ray_t_min = surface_hit.t + max(kernel_params.ray_epsilon, 1.0e-6);
self_instance = point.instance_index;
@@ -961,10 +969,13 @@ fn main(@builtin(global_invocation_id) global_id: vec3<u32>) {
}
if (bsdf_sample.sampled_lobe_type == LOBE_TRANSPARENT) {
- if (transparent_bounces >= kernel_params.max_transparent_bounces) {
+ if (kernel_params.max_transparent_bounces == 0u || transparent_bounces >= kernel_params.max_transparent_bounces) {
break;
}
transparent_bounces += 1u;
+ if (transparent_bounces >= kernel_params.max_transparent_bounces) {
+ terminate_on_next_surface = true;
+ }
throughput *= bsdf_sample.eval / bsdf_sample.pdf;
ray_t_min = surface_hit.t + max(kernel_params.ray_epsilon, 1.0e-6);
self_instance = point.instance_index;