diff options
author | Thomas Dinges <blender@dingto.org> | 2013-05-20 18:38:47 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2013-05-20 18:38:47 +0400 |
commit | 38dc85f296a27a5641d296c8f41834db41dac18b (patch) | |
tree | b47567b3c6fd455a6a92b359fc92509ff33e85fb /intern/cycles/kernel/shaders/node_math.osl | |
parent | 0fb5c9117fdb9ad24184a2dad2ad1c8c66565aaa (diff) |
Math Node:
* Added a Modulo operation to the math node, available in Compositor, Shader and Texture Nodes.
Diffstat (limited to 'intern/cycles/kernel/shaders/node_math.osl')
-rw-r--r-- | intern/cycles/kernel/shaders/node_math.osl | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/intern/cycles/kernel/shaders/node_math.osl b/intern/cycles/kernel/shaders/node_math.osl index 2ec1a5f0a32..214ef931660 100644 --- a/intern/cycles/kernel/shaders/node_math.osl +++ b/intern/cycles/kernel/shaders/node_math.osl @@ -30,6 +30,18 @@ float safe_divide(float a, float b) return result; } +float safe_modulo(float a, float b) +{ + float result; + + if (b == 0.0) + result = 0.0; + else + result = fmod(a, b); + + return result; +} + float safe_log(float a, float b) { if (a < 0.0 || b < 0.0) @@ -81,6 +93,8 @@ shader node_math( Value = Value1 < Value2; else if (type == "Greater Than") Value = Value1 > Value2; + else if (type == "Modulo") + Value = safe_modulo(Value1, Value2); if (Clamp) Value = clamp(Value1, 0.0, 1.0); |