diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /intern/cycles/kernel/shaders/node_math.osl | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'intern/cycles/kernel/shaders/node_math.osl')
-rw-r--r-- | intern/cycles/kernel/shaders/node_math.osl | 162 |
1 files changed, 80 insertions, 82 deletions
diff --git a/intern/cycles/kernel/shaders/node_math.osl b/intern/cycles/kernel/shaders/node_math.osl index aa9f6e671c3..8830339e05f 100644 --- a/intern/cycles/kernel/shaders/node_math.osl +++ b/intern/cycles/kernel/shaders/node_math.osl @@ -18,107 +18,105 @@ float safe_divide(float a, float b) { - float result; + float result; - if (b == 0.0) - result = 0.0; - else - result = a / b; - - return result; + if (b == 0.0) + result = 0.0; + else + result = a / b; + + return result; } float safe_modulo(float a, float b) { - float result; + float result; + + if (b == 0.0) + result = 0.0; + else + result = fmod(a, b); - if (b == 0.0) - result = 0.0; - else - result = fmod(a, b); - - return result; + return result; } float safe_sqrt(float a) { - float result; + float result; - if (a > 0.0) - result = sqrt(a); - else - result = 0.0; + if (a > 0.0) + result = sqrt(a); + else + result = 0.0; - return result; + return result; } float safe_log(float a, float b) { - if (a < 0.0 || b < 0.0) - return 0.0; - - return log(a) / log(b); + if (a < 0.0 || b < 0.0) + return 0.0; + + return log(a) / log(b); } -shader node_math( - string type = "add", - int use_clamp = 0, - float Value1 = 0.0, - float Value2 = 0.0, - output float Value = 0.0) +shader node_math(string type = "add", + int use_clamp = 0, + float Value1 = 0.0, + float Value2 = 0.0, + output float Value = 0.0) { - /* OSL asin, acos, pow check for values that could give rise to nan */ + /* OSL asin, acos, pow check for values that could give rise to nan */ - if (type == "add") - Value = Value1 + Value2; - else if (type == "subtract") - Value = Value1 - Value2; - else if (type == "multiply") - Value = Value1 * Value2; - else if (type == "divide") - Value = safe_divide(Value1, Value2); - else if (type == "sine") - Value = sin(Value1); - else if (type == "cosine") - Value = cos(Value1); - else if (type == "tangent") - Value = tan(Value1); - else if (type == "arcsine") - Value = asin(Value1); - else if (type == "arccosine") - Value = acos(Value1); - else if (type == "arctangent") - Value = atan(Value1); - else if (type == "power") - Value = pow(Value1, Value2); - else if (type == "logarithm") - Value = safe_log(Value1, Value2); - else if (type == "minimum") - Value = min(Value1, Value2); - else if (type == "maximum") - Value = max(Value1, Value2); - else if (type == "round") - Value = floor(Value1 + 0.5); - else if (type == "less_than") - Value = Value1 < Value2; - else if (type == "greater_than") - Value = Value1 > Value2; - else if (type == "modulo") - Value = safe_modulo(Value1, Value2); - else if (type == "absolute") - Value = fabs(Value1); - else if (type == "arctan2") - Value = atan2(Value1, Value2); - else if (type == "floor") - Value = floor(Value1); - else if (type == "ceil") - Value = ceil(Value1); - else if (type == "fract") - Value = Value1 - floor(Value1); - else if (type == "sqrt") - Value = safe_sqrt(Value1); + if (type == "add") + Value = Value1 + Value2; + else if (type == "subtract") + Value = Value1 - Value2; + else if (type == "multiply") + Value = Value1 * Value2; + else if (type == "divide") + Value = safe_divide(Value1, Value2); + else if (type == "sine") + Value = sin(Value1); + else if (type == "cosine") + Value = cos(Value1); + else if (type == "tangent") + Value = tan(Value1); + else if (type == "arcsine") + Value = asin(Value1); + else if (type == "arccosine") + Value = acos(Value1); + else if (type == "arctangent") + Value = atan(Value1); + else if (type == "power") + Value = pow(Value1, Value2); + else if (type == "logarithm") + Value = safe_log(Value1, Value2); + else if (type == "minimum") + Value = min(Value1, Value2); + else if (type == "maximum") + Value = max(Value1, Value2); + else if (type == "round") + Value = floor(Value1 + 0.5); + else if (type == "less_than") + Value = Value1 < Value2; + else if (type == "greater_than") + Value = Value1 > Value2; + else if (type == "modulo") + Value = safe_modulo(Value1, Value2); + else if (type == "absolute") + Value = fabs(Value1); + else if (type == "arctan2") + Value = atan2(Value1, Value2); + else if (type == "floor") + Value = floor(Value1); + else if (type == "ceil") + Value = ceil(Value1); + else if (type == "fract") + Value = Value1 - floor(Value1); + else if (type == "sqrt") + Value = safe_sqrt(Value1); - if (use_clamp) - Value = clamp(Value, 0.0, 1.0); + if (use_clamp) + Value = clamp(Value, 0.0, 1.0); } - |