diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-08-18 18:15:57 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-08-18 18:15:57 +0400 |
| commit | d43682d51bbe70448b328980d29c3a08cf4d4a26 (patch) | |
| tree | f4e265a9280e67756d8cb284a392dc1ed084b96f /intern/cycles/kernel/shaders | |
| parent | a2541508ac9918ce614b87a88f25993788b3ce3b (diff) | |
Cycles: Subsurface Scattering
New features:
* Bump mapping now works with SSS
* Texture Blur factor for SSS, see the documentation for details:
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Shaders#Subsurface_Scattering
Work in progress for feedback:
Initial implementation of the "BSSRDF Importance Sampling" paper, which uses
a different importance sampling method. It gives better quality results in
many ways, with the availability of both Cubic and Gaussian falloff functions,
but also tends to be more noisy when using the progressive integrator and does
not give great results with some geometry. It works quite well for the
non-progressive integrator and is often less noisy there.
This code may still change a lot, so unless you're testing it may be best to
stick to the Compatible falloff function.
Skin test render and file that takes advantage of the gaussian falloff:
http://www.pasteall.org/pic/show.php?id=57661
http://www.pasteall.org/pic/show.php?id=57662
http://www.pasteall.org/blend/23501
Diffstat (limited to 'intern/cycles/kernel/shaders')
| -rw-r--r-- | intern/cycles/kernel/shaders/node_subsurface_scattering.osl | 10 | ||||
| -rw-r--r-- | intern/cycles/kernel/shaders/stdosl.h | 3 |
2 files changed, 9 insertions, 4 deletions
diff --git a/intern/cycles/kernel/shaders/node_subsurface_scattering.osl b/intern/cycles/kernel/shaders/node_subsurface_scattering.osl index 5c25c44ec8f..eb21a5f69bd 100644 --- a/intern/cycles/kernel/shaders/node_subsurface_scattering.osl +++ b/intern/cycles/kernel/shaders/node_subsurface_scattering.osl @@ -22,12 +22,14 @@ shader node_subsurface_scattering( color Color = 0.8, float Scale = 1.0, vector Radius = vector(0.1, 0.1, 0.1), - float IOR = 1.3, + float TextureBlur = 0.0, // XXX use + string Falloff = "Cubic", normal Normal = N, output closure color BSSRDF = 0) { - float eta = max(IOR, 1.0 + 1e-5); - - BSSRDF = Color * bssrdf_cubic(N, Scale * Radius); + if(Falloff == "Cubic") + BSSRDF = Color * bssrdf_cubic(N, Scale * Radius); + else if(Falloff == "Gaussian") + BSSRDF = Color * bssrdf_gaussian(N, Scale * Radius); } diff --git a/intern/cycles/kernel/shaders/stdosl.h b/intern/cycles/kernel/shaders/stdosl.h index 24c3e187783..7d1c2443ee7 100644 --- a/intern/cycles/kernel/shaders/stdosl.h +++ b/intern/cycles/kernel/shaders/stdosl.h @@ -463,7 +463,10 @@ closure color emission() BUILTIN; closure color background() BUILTIN; closure color holdout() BUILTIN; closure color ambient_occlusion() BUILTIN; + +// BSSRDF closure color bssrdf_cubic(normal N, vector radius) BUILTIN; +closure color bssrdf_gaussian(normal N, vector radius) BUILTIN; // Backwards compatibility |