blender
/
blender
137
416
Fork 599
Code Issues 6.3k Pull Requests 770 Projects 19 Wiki Activity

Cycles: new Microfacet-based Hair BSDF with elliptical cross-section support #105600

Merged
Weizhen Huang merged 114 commits from weizhen/blender:microfacet_hair into main 2023-08-18 12:46:20 +02:00
Conversation 12 Commits 114 Files Changed 25 -5
2 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 40e45dee57 - Show all commits

3
intern/cycles/kernel/closure/bsdf_hair_microfacet.h
View File

@ -606,7 +606,6 @@ ccl_device int bsdf_microfacet_hair_sample(const KernelGlobals kg,
const float roughness = bsdf->roughness;
*sampled_roughness = make_float2(roughness, roughness);
*eta = bsdf->eta;
*eval = zero_spectrum();
/* Treat as transparent material if intersection lies outside of the projected radius. */
if (fabsf(bsdf->h) > bsdf->extra->radius) {
weizhen marked this conversation as resolved Outdated
Lukas Stockner commented 2023-08-06 23:42:57 +02:00
Outdated
Review
Copy Link

Since both of these are already known in the setup function at shader evaluation time, we might want to implement the "default to transparent" logic there?

Since both of these are already known in the setup function at shader evaluation time, we might want to implement the "default to transparent" logic there?
@ -619,7 +618,6 @@ ccl_device int bsdf_microfacet_hair_sample(const KernelGlobals kg,
if (bsdf->extra->R <= 0.0f && bsdf->extra->TT <= 0.0f && bsdf->extra->TRT <= 0.0f) {
weizhen marked this conversation as resolved Outdated
Lukas Stockner commented 2023-08-07 01:11:00 +02:00
Outdated
Review
Copy Link

Same here.

Same here.
👍 1
/* Early out for inactive lobe. */
*pdf = 0.0f;
return LABEL_NONE;
}
@ -843,7 +841,6 @@ ccl_device Spectrum bsdf_microfacet_hair_eval(KernelGlobals kg,
/* Treat as transparent material if intersection lies outside of the projected radius. */
if (fabsf(bsdf->h) > bsdf->extra->radius) {
*pdf = 0.0f;
return zero_spectrum();
}

2
intern/cycles/kernel/closure/bsdf_util.h
View File

@ -7,8 +7,6 @@
#pragma once
#include "kernel/util/lookup_table.h"
CCL_NAMESPACE_BEGIN
/* Compute fresnel reflectance. Also return the dot product of the refracted ray and the normal as