[Bf-blender-cvs] [e42852a] master: Cycles: Cleanup and reference actual paper used for BSSRDF sampling
Sergey Sharybin
noreply at git.blender.org
Tue Feb 2 18:07:01 CET 2016
Commit: e42852a3395c9934488cecea64936f1c259eeb01
Author: Sergey Sharybin
Date: Tue Feb 2 18:06:03 2016 +0100
Branches: master
https://developer.blender.org/rBe42852a3395c9934488cecea64936f1c259eeb01
Cycles: Cleanup and reference actual paper used for BSSRDF sampling
===================================================================
M intern/cycles/kernel/closure/bssrdf.h
M intern/cycles/kernel/kernel_subsurface.h
===================================================================
diff --git a/intern/cycles/kernel/closure/bssrdf.h b/intern/cycles/kernel/closure/bssrdf.h
index f817dcd..b986ab6 100644
--- a/intern/cycles/kernel/closure/bssrdf.h
+++ b/intern/cycles/kernel/closure/bssrdf.h
@@ -83,8 +83,8 @@ ccl_device void bssrdf_gaussian_sample(ShaderClosure *sc, float xi, float *r, fl
const float r_squared = -2.0f*v*logf(1.0f - xi*area_truncated);
*r = sqrtf(r_squared);
- /* h^2 + r^2 = Rm^2 */
- *h = sqrtf(Rm*Rm - r_squared);
+ /* h^2 + r^2 = Rm^2 */
+ *h = sqrtf(Rm*Rm - r_squared);
}
/* Planar Cubic BSSRDF falloff
@@ -184,7 +184,7 @@ ccl_device void bssrdf_cubic_sample(ShaderClosure *sc, float xi, float *r, float
r_ = powf(r_, 1.0f + sharpness);
Rm *= (1.0f + sharpness);
}
-
+
r_ *= Rm;
*r = r_;
@@ -193,7 +193,7 @@ ccl_device void bssrdf_cubic_sample(ShaderClosure *sc, float xi, float *r, float
}
/* None BSSRDF falloff
- *
+ *
* Samples distributed over disk with no falloff, for reference. */
ccl_device float bssrdf_none_eval(ShaderClosure *sc, float r)
diff --git a/intern/cycles/kernel/kernel_subsurface.h b/intern/cycles/kernel/kernel_subsurface.h
index 3693851..9ea993a 100644
--- a/intern/cycles/kernel/kernel_subsurface.h
+++ b/intern/cycles/kernel/kernel_subsurface.h
@@ -16,7 +16,12 @@
CCL_NAMESPACE_BEGIN
-/* NEW BSSRDF: See "BSSRDF Importance Sampling", SIGGRAPH 2013 */
+/* New BSSRDF using disk based sampling.
+ *
+ * BSSRDF Importance Sampling, SIGGRAPH 2013
+ * http://library.imageworks.com/pdfs/imageworks-library-BSSRDF-sampling.pdf
+ *
+ */
/* TODO:
* - test using power heuristic for combing bssrdfs
More information about the Bf-blender-cvs
mailing list