diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-12-11 18:39:41 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-12-11 18:39:41 +0400 |
| commit | 8d4bd2cf3b08456dfdec39b9c88f744ce8f12c72 (patch) | |
| tree | 70066f60839fd8dc1cb66aceeb5f12df086feb34 /intern/cycles/kernel/svm | |
| parent | 43c04eefe32773b708d85ea0db95564e71f4870e (diff) | |
Cycles OSL: add diffuse_ramp closure in addition to phong_ramp.
Diffstat (limited to 'intern/cycles/kernel/svm')
| -rw-r--r-- | intern/cycles/kernel/svm/svm_bsdf.h | 11 | ||||
| -rw-r--r-- | intern/cycles/kernel/svm/svm_types.h | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/intern/cycles/kernel/svm/svm_bsdf.h b/intern/cycles/kernel/svm/svm_bsdf.h index 07927fe5691..a9524f3ed37 100644 --- a/intern/cycles/kernel/svm/svm_bsdf.h +++ b/intern/cycles/kernel/svm/svm_bsdf.h @@ -20,6 +20,7 @@ #include "../closure/bsdf_diffuse.h" #include "../closure/bsdf_oren_nayar.h" #include "../closure/bsdf_phong_ramp.h" +#include "../closure/bsdf_diffuse_ramp.h" #include "../closure/bsdf_microfacet.h" #include "../closure/bsdf_reflection.h" #include "../closure/bsdf_refraction.h" @@ -48,6 +49,10 @@ __device int svm_bsdf_sample(const ShaderData *sd, const ShaderClosure *sc, floa /*case CLOSURE_BSDF_PHONG_RAMP_ID: label = bsdf_phong_ramp_sample(sc, sd->Ng, sd->I, sd->dI.dx, sd->dI.dy, randu, randv, eval, omega_in, &domega_in->dx, &domega_in->dy, pdf); + break; + case CLOSURE_BSDF_DIFFUSE_RAMP_ID: + label = bsdf_diffuse_ramp_sample(sc, sd->Ng, sd->I, sd->dI.dx, sd->dI.dy, randu, randv, + eval, omega_in, &domega_in->dx, &domega_in->dy, pdf); break;*/ case CLOSURE_BSDF_TRANSLUCENT_ID: label = bsdf_translucent_sample(sc, sd->Ng, sd->I, sd->dI.dx, sd->dI.dy, randu, randv, @@ -117,6 +122,9 @@ __device float3 svm_bsdf_eval(const ShaderData *sd, const ShaderClosure *sc, con break; /*case CLOSURE_BSDF_PHONG_RAMP_ID: eval = bsdf_phong_ramp_eval_reflect(sc, sd->I, omega_in, pdf); + break; + case CLOSURE_BSDF_DIFFUSE_RAMP_ID: + eval = bsdf_diffuse_ramp_eval_reflect(sc, sd->I, omega_in, pdf); break;*/ case CLOSURE_BSDF_TRANSLUCENT_ID: eval = bsdf_translucent_eval_reflect(sc, sd->I, omega_in, pdf); @@ -223,6 +231,9 @@ __device void svm_bsdf_blur(ShaderClosure *sc, float roughness) break; /*case CLOSURE_BSDF_PHONG_RAMP_ID: bsdf_phong_ramp_blur(sc, roughness); + break; + case CLOSURE_BSDF_DIFFUSE_RAMP_ID: + bsdf_diffuse_ramp_blur(sc, roughness); break;*/ case CLOSURE_BSDF_TRANSLUCENT_ID: bsdf_translucent_blur(sc, roughness); diff --git a/intern/cycles/kernel/svm/svm_types.h b/intern/cycles/kernel/svm/svm_types.h index e7fe6dc0857..0830a700281 100644 --- a/intern/cycles/kernel/svm/svm_types.h +++ b/intern/cycles/kernel/svm/svm_types.h @@ -313,6 +313,7 @@ typedef enum ClosureType { CLOSURE_BSDF_DIFFUSE_ID, CLOSURE_BSDF_OREN_NAYAR_ID, + CLOSURE_BSDF_DIFFUSE_RAMP_ID, CLOSURE_BSDF_GLOSSY_ID, CLOSURE_BSDF_REFLECTION_ID, |