diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-12-11 18:39:37 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-12-11 18:39:37 +0400 |
commit | 43c04eefe32773b708d85ea0db95564e71f4870e (patch) | |
tree | adcbc13cd57ce4f48f7fc26e123e3ca11c71cb2c /intern/cycles/kernel/svm | |
parent | 7c81952179f0ff08cfdd8f571eb1c0f06e224070 (diff) |
Cycles: RGB and Vector Curves nodes now supported, with the limitation that the
range must be left to the default (0..1 and -1..1).
Diffstat (limited to 'intern/cycles/kernel/svm')
-rw-r--r-- | intern/cycles/kernel/svm/svm.h | 3 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/svm_ramp.h | 25 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/svm_types.h | 1 |
3 files changed, 26 insertions, 3 deletions
diff --git a/intern/cycles/kernel/svm/svm.h b/intern/cycles/kernel/svm/svm.h index 9c79886fdca..ec7978066c2 100644 --- a/intern/cycles/kernel/svm/svm.h +++ b/intern/cycles/kernel/svm/svm.h @@ -398,6 +398,9 @@ __device_noinline void svm_eval_nodes(KernelGlobals *kg, ShaderData *sd, ShaderT case NODE_RGB_CURVES: svm_node_rgb_curves(kg, sd, stack, node, &offset); break; + case NODE_VECTOR_CURVES: + svm_node_vector_curves(kg, sd, stack, node, &offset); + break; case NODE_LIGHT_FALLOFF: svm_node_light_falloff(sd, stack, node); break; diff --git a/intern/cycles/kernel/svm/svm_ramp.h b/intern/cycles/kernel/svm/svm_ramp.h index c64413cbe84..054137fe7a3 100644 --- a/intern/cycles/kernel/svm/svm_ramp.h +++ b/intern/cycles/kernel/svm/svm_ramp.h @@ -63,9 +63,9 @@ __device void svm_node_rgb_curves(KernelGlobals *kg, ShaderData *sd, float *stac float fac = stack_load_float(stack, fac_offset); float3 color = stack_load_float3(stack, color_offset); - float r = rgb_ramp_lookup(kg, *offset, rgb_ramp_lookup(kg, *offset, color.x).w).x; - float g = rgb_ramp_lookup(kg, *offset, rgb_ramp_lookup(kg, *offset, color.y).w).y; - float b = rgb_ramp_lookup(kg, *offset, rgb_ramp_lookup(kg, *offset, color.z).w).z; + float r = rgb_ramp_lookup(kg, *offset, color.x).x; + float g = rgb_ramp_lookup(kg, *offset, color.y).y; + float b = rgb_ramp_lookup(kg, *offset, color.z).z; color = (1.0f - fac)*color + fac*make_float3(r, g, b); stack_store_float3(stack, out_offset, color); @@ -73,6 +73,25 @@ __device void svm_node_rgb_curves(KernelGlobals *kg, ShaderData *sd, float *stac *offset += RAMP_TABLE_SIZE; } +__device void svm_node_vector_curves(KernelGlobals *kg, ShaderData *sd, float *stack, uint4 node, int *offset) +{ + uint fac_offset = node.y; + uint color_offset = node.z; + uint out_offset = node.w; + + float fac = stack_load_float(stack, fac_offset); + float3 color = stack_load_float3(stack, color_offset); + + float r = rgb_ramp_lookup(kg, *offset, (color.x + 1.0f)*0.5f).x; + float g = rgb_ramp_lookup(kg, *offset, (color.y + 1.0f)*0.5f).y; + float b = rgb_ramp_lookup(kg, *offset, (color.z + 1.0f)*0.5f).z; + + color = (1.0f - fac)*color + fac*make_float3(r*2.0f - 1.0f, g*2.0f - 1.0f, b*2.0f - 1.0f); + stack_store_float3(stack, out_offset, color); + + *offset += RAMP_TABLE_SIZE; +} + CCL_NAMESPACE_END #endif /* __SVM_RAMP_H__ */ diff --git a/intern/cycles/kernel/svm/svm_types.h b/intern/cycles/kernel/svm/svm_types.h index b41e34ab407..e7fe6dc0857 100644 --- a/intern/cycles/kernel/svm/svm_types.h +++ b/intern/cycles/kernel/svm/svm_types.h @@ -88,6 +88,7 @@ typedef enum NodeType { NODE_BRIGHTCONTRAST, NODE_RGB_RAMP, NODE_RGB_CURVES, + NODE_VECTOR_CURVES, NODE_MIN_MAX, NODE_LIGHT_FALLOFF, NODE_OBJECT_INFO, |