Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2013-05-23 21:45:20 +0400
committerThomas Dinges <blender@dingto.org>2013-05-23 21:45:20 +0400
commit99b325cebf41054f046d98a7dcf9aea74e165f56 (patch)
tree208b201551a5a3e79d59f7e4a2585ae866025ec1 /intern/cycles/kernel/svm/svm_closure.h
parent3b0cc9cfd74de9594b1388694ee13a94ba36b91b (diff)
Cycles / Toon BSDF:
* Added a toon bsdf node to Cycles. This was already available as OSL only closure, but is now available inside the SVM backed as well, for CPU and GPU rendering. * There are 2 variations available, diffuse and glossy toon, selectable via a menu inside the node. Documentation: http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Shaders#Toon Example render & blend file: http://www.pasteall.org/pic/show.php?id=51970 http://www.pasteall.org/blend/21579
Diffstat (limited to 'intern/cycles/kernel/svm/svm_closure.h')
-rw-r--r--intern/cycles/kernel/svm/svm_closure.h17
1 files changed, 17 insertions, 0 deletions
diff --git a/intern/cycles/kernel/svm/svm_closure.h b/intern/cycles/kernel/svm/svm_closure.h
index d97e165c66d..0621133a316 100644
--- a/intern/cycles/kernel/svm/svm_closure.h
+++ b/intern/cycles/kernel/svm/svm_closure.h
@@ -322,6 +322,23 @@ __device void svm_node_closure_bsdf(KernelGlobals *kg, ShaderData *sd, float *st
}
break;
}
+ case CLOSURE_BSDF_DIFFUSE_TOON_ID:
+ case CLOSURE_BSDF_GLOSSY_TOON_ID: {
+ ShaderClosure *sc = svm_node_closure_get_bsdf(sd, mix_weight);
+
+ if(sc) {
+ /* Normal, Size and Smooth */
+ sc->N = N;
+ sc->data0 = param1;
+ sc->data1 = param2;
+
+ if (type == CLOSURE_BSDF_DIFFUSE_TOON_ID)
+ sd->flag |= bsdf_diffuse_toon_setup(sc);
+ else
+ sd->flag |= bsdf_glossy_toon_setup(sc);
+ }
+ break;
+ }
#ifdef __SUBSURFACE__
case CLOSURE_BSSRDF_ID: {
ShaderClosure *sc = &sd->closure[sd->num_closure];