From 958d0d4236b1cfa600a7f36f6bdc51fdd0d98a97 Mon Sep 17 00:00:00 2001 From: Charlie Jolly Date: Sat, 7 Dec 2019 12:35:07 +0000 Subject: Shader Nodes: Add Interpolation modes to Map Range node Modes: Linear interpolation (default), stepped linear, smoothstep and smootherstep. This also includes an additional option for the **Clamp node** to switch between **Min Max** (default) and **Range** mode. This was needed to allow clamping when **To Max** is less than **To Min**. Reviewed By: JacquesLucke, brecht Differential Revision: https://developer.blender.org/D5827 --- intern/cycles/blender/blender_shader.cpp | 6 +++- intern/cycles/kernel/shaders/node_clamp.osl | 8 +++-- intern/cycles/kernel/shaders/node_map_range.osl | 33 ++++++++++++++++-- intern/cycles/kernel/svm/svm_clamp.h | 11 ++++-- intern/cycles/kernel/svm/svm_map_range.h | 38 +++++++++++++++++++-- intern/cycles/kernel/svm/svm_types.h | 12 +++++++ intern/cycles/render/nodes.cpp | 45 +++++++++++++++---------- intern/cycles/render/nodes.h | 5 +-- 8 files changed, 129 insertions(+), 29 deletions(-) (limited to 'intern/cycles') diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp index 22dbc3fba79..412e54ea29d 100644 --- a/intern/cycles/blender/blender_shader.cpp +++ b/intern/cycles/blender/blender_shader.cpp @@ -301,10 +301,14 @@ static ShaderNode *add_node(Scene *scene, BL::ShaderNodeMapRange b_map_range_node(b_node); MapRangeNode *map_range_node = new MapRangeNode(); map_range_node->clamp = b_map_range_node.clamp(); + map_range_node->type = (NodeMapRangeType)b_map_range_node.interpolation_type(); node = map_range_node; } else if (b_node.is_a(&RNA_ShaderNodeClamp)) { - node = new ClampNode(); + BL::ShaderNodeClamp b_clamp_node(b_node); + ClampNode *clamp_node = new ClampNode(); + clamp_node->type = (NodeClampType)b_clamp_node.clamp_type(); + node = clamp_node; } else if (b_node.is_a(&RNA_ShaderNodeMath)) { BL::ShaderNodeMath b_math_node(b_node); diff --git a/intern/cycles/kernel/shaders/node_clamp.osl b/intern/cycles/kernel/shaders/node_clamp.osl index 87dc1ccdb12..d689ba7f809 100644 --- a/intern/cycles/kernel/shaders/node_clamp.osl +++ b/intern/cycles/kernel/shaders/node_clamp.osl @@ -16,7 +16,11 @@ #include "stdosl.h" -shader node_clamp(float Value = 1.0, float Min = 0.0, float Max = 1.0, output float Result = 0.0) +shader node_clamp(string type = "minmax", + float Value = 1.0, + float Min = 0.0, + float Max = 1.0, + output float Result = 0.0) { - Result = clamp(Value, Min, Max); + Result = (type == "range" && (Min > Max)) ? clamp(Value, Max, Min) : clamp(Value, Min, Max); } diff --git a/intern/cycles/kernel/shaders/node_map_range.osl b/intern/cycles/kernel/shaders/node_map_range.osl index 8a28edf5f35..242ec4271ed 100644 --- a/intern/cycles/kernel/shaders/node_map_range.osl +++ b/intern/cycles/kernel/shaders/node_map_range.osl @@ -16,14 +16,43 @@ #include "stdosl.h" -shader node_map_range(float Value = 1.0, +float safe_divide(float a, float b) +{ + return (b != 0.0) ? a / b : 0.0; +} + +float smootherstep(float edge0, float edge1, float x) +{ + float t = clamp(safe_divide((x - edge0), (edge1 - edge0)), 0.0, 1.0); + return t * t * t * (t * (t * 6.0 - 15.0) + 10.0); +} + +shader node_map_range(string type = "linear", + float Value = 1.0, float FromMin = 0.0, float FromMax = 1.0, float ToMin = 0.0, float ToMax = 1.0, + float Steps = 4.0, output float Result = 0.0) { if (FromMax != FromMin) { - Result = ToMin + ((Value - FromMin) / (FromMax - FromMin)) * (ToMax - ToMin); + float Factor = Value; + if (type == "stepped") { + Factor = (Value - FromMin) / (FromMax - FromMin); + Factor = (Steps > 0) ? floor(Factor * (Steps + 1.0)) / Steps : 0.0; + } + else if (type == "smoothstep") { + Factor = (FromMin > FromMax) ? 1.0 - smoothstep(FromMax, FromMin, Value) : + smoothstep(FromMin, FromMax, Value); + } + else if (type == "smootherstep") { + Factor = (FromMin > FromMax) ? 1.0 - smootherstep(FromMax, FromMin, Value) : + smootherstep(FromMin, FromMax, Value); + } + else { + Factor = (Value - FromMin) / (FromMax - FromMin); + } + Result = ToMin + Factor * (ToMax - ToMin); } } diff --git a/intern/cycles/kernel/svm/svm_clamp.h b/intern/cycles/kernel/svm/svm_clamp.h index a45e70a3f15..a85fd82754e 100644 --- a/intern/cycles/kernel/svm/svm_clamp.h +++ b/intern/cycles/kernel/svm/svm_clamp.h @@ -26,8 +26,8 @@ ccl_device void svm_node_clamp(KernelGlobals *kg, uint result_stack_offset, int *offset) { - uint min_stack_offset, max_stack_offset; - svm_unpack_node_uchar2(parameters_stack_offsets, &min_stack_offset, &max_stack_offset); + uint min_stack_offset, max_stack_offset, type; + svm_unpack_node_uchar3(parameters_stack_offsets, &min_stack_offset, &max_stack_offset, &type); uint4 defaults = read_node(kg, offset); @@ -35,7 +35,12 @@ ccl_device void svm_node_clamp(KernelGlobals *kg, float min = stack_load_float_default(stack, min_stack_offset, defaults.x); float max = stack_load_float_default(stack, max_stack_offset, defaults.y); - stack_store_float(stack, result_stack_offset, clamp(value, min, max)); + if (type == NODE_CLAMP_RANGE && (min > max)) { + stack_store_float(stack, result_stack_offset, clamp(value, max, min)); + } + else { + stack_store_float(stack, result_stack_offset, clamp(value, min, max)); + } } CCL_NAMESPACE_END diff --git a/intern/cycles/kernel/svm/svm_map_range.h b/intern/cycles/kernel/svm/svm_map_range.h index f2a68adbe61..533a631c837 100644 --- a/intern/cycles/kernel/svm/svm_map_range.h +++ b/intern/cycles/kernel/svm/svm_map_range.h @@ -18,32 +18,66 @@ CCL_NAMESPACE_BEGIN /* Map Range Node */ +ccl_device_inline float smootherstep(float edge0, float edge1, float x) +{ + x = clamp(safe_divide((x - edge0), (edge1 - edge0)), 0.0f, 1.0f); + return x * x * x * (x * (x * 6.0f - 15.0f) + 10.0f); +} + ccl_device void svm_node_map_range(KernelGlobals *kg, ShaderData *sd, float *stack, uint value_stack_offset, uint parameters_stack_offsets, - uint result_stack_offset, + uint results_stack_offsets, int *offset) { uint from_min_stack_offset, from_max_stack_offset, to_min_stack_offset, to_max_stack_offset; + uint type_stack_offset, steps_stack_offset, result_stack_offset; svm_unpack_node_uchar4(parameters_stack_offsets, &from_min_stack_offset, &from_max_stack_offset, &to_min_stack_offset, &to_max_stack_offset); + svm_unpack_node_uchar3( + results_stack_offsets, &type_stack_offset, &steps_stack_offset, &result_stack_offset); uint4 defaults = read_node(kg, offset); + uint4 defaults2 = read_node(kg, offset); float value = stack_load_float(stack, value_stack_offset); float from_min = stack_load_float_default(stack, from_min_stack_offset, defaults.x); float from_max = stack_load_float_default(stack, from_max_stack_offset, defaults.y); float to_min = stack_load_float_default(stack, to_min_stack_offset, defaults.z); float to_max = stack_load_float_default(stack, to_max_stack_offset, defaults.w); + float steps = stack_load_float_default(stack, steps_stack_offset, defaults2.x); float result; + if (from_max != from_min) { - result = to_min + ((value - from_min) / (from_max - from_min)) * (to_max - to_min); + float factor = value; + switch (type_stack_offset) { + default: + case NODE_MAP_RANGE_LINEAR: + factor = (value - from_min) / (from_max - from_min); + break; + case NODE_MAP_RANGE_STEPPED: { + factor = (value - from_min) / (from_max - from_min); + factor = (steps > 0.0f) ? floorf(factor * (steps + 1.0f)) / steps : 0.0f; + break; + } + case NODE_MAP_RANGE_SMOOTHSTEP: { + factor = (from_min > from_max) ? 1.0f - smoothstep(from_max, from_min, factor) : + smoothstep(from_min, from_max, factor); + break; + } + case NODE_MAP_RANGE_SMOOTHERSTEP: { + factor = (from_min > from_max) ? 1.0f - smootherstep(from_max, from_min, factor) : + smootherstep(from_min, from_max, factor); + break; + } + } + result = to_min + factor * (to_max - to_min); } else { result = 0.0f; diff --git a/intern/cycles/kernel/svm/svm_types.h b/intern/cycles/kernel/svm/svm_types.h index 8e312a515d6..040e7c6a0f8 100644 --- a/intern/cycles/kernel/svm/svm_types.h +++ b/intern/cycles/kernel/svm/svm_types.h @@ -325,6 +325,18 @@ typedef enum NodeVectorMathType { NODE_VECTOR_MATH_MAXIMUM, } NodeVectorMathType; +typedef enum NodeClampType { + NODE_CLAMP_MINMAX, + NODE_CLAMP_RANGE, +} NodeClampType; + +typedef enum NodeMapRangeType { + NODE_MAP_RANGE_LINEAR, + NODE_MAP_RANGE_STEPPED, + NODE_MAP_RANGE_SMOOTHSTEP, + NODE_MAP_RANGE_SMOOTHERSTEP, +} NodeMapRangeType; + typedef enum NodeMappingType { NODE_MAPPING_TYPE_POINT, NODE_MAPPING_TYPE_TEXTURE, diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp index c6f1e8409eb..26f16d5ee80 100644 --- a/intern/cycles/render/nodes.cpp +++ b/intern/cycles/render/nodes.cpp @@ -5561,11 +5561,19 @@ NODE_DEFINE(MapRangeNode) { NodeType *type = NodeType::add("map_range", create, NodeType::SHADER); + static NodeEnum type_enum; + type_enum.insert("linear", NODE_MAP_RANGE_LINEAR); + type_enum.insert("stepped", NODE_MAP_RANGE_STEPPED); + type_enum.insert("smoothstep", NODE_MAP_RANGE_SMOOTHSTEP); + type_enum.insert("smootherstep", NODE_MAP_RANGE_SMOOTHERSTEP); + SOCKET_ENUM(type, "Type", type_enum, NODE_MAP_RANGE_LINEAR); + SOCKET_IN_FLOAT(value, "Value", 1.0f); SOCKET_IN_FLOAT(from_min, "From Min", 0.0f); SOCKET_IN_FLOAT(from_max, "From Max", 1.0f); SOCKET_IN_FLOAT(to_min, "To Min", 0.0f); SOCKET_IN_FLOAT(to_max, "To Max", 1.0f); + SOCKET_IN_FLOAT(steps, "Steps", 4.0f); SOCKET_OUT_FLOAT(result, "Result"); @@ -5582,6 +5590,7 @@ void MapRangeNode::expand(ShaderGraph *graph) ShaderOutput *result_out = output("Result"); if (!result_out->links.empty()) { ClampNode *clamp_node = new ClampNode(); + clamp_node->type = NODE_CLAMP_RANGE; graph->add(clamp_node); graph->relink(result_out, clamp_node->output("Result")); graph->connect(result_out, clamp_node->input("Value")); @@ -5601,20 +5610,6 @@ void MapRangeNode::expand(ShaderGraph *graph) } } -void MapRangeNode::constant_fold(const ConstantFolder &folder) -{ - if (folder.all_inputs_constant()) { - float result; - if (from_max != from_min) { - result = to_min + ((value - from_min) / (from_max - from_min)) * (to_max - to_min); - } - else { - result = 0.0f; - } - folder.make_constant(result); - } -} - void MapRangeNode::compile(SVMCompiler &compiler) { ShaderInput *value_in = input("Value"); @@ -5622,6 +5617,7 @@ void MapRangeNode::compile(SVMCompiler &compiler) ShaderInput *from_max_in = input("From Max"); ShaderInput *to_min_in = input("To Min"); ShaderInput *to_max_in = input("To Max"); + ShaderInput *steps_in = input("Steps"); ShaderOutput *result_out = output("Result"); int value_stack_offset = compiler.stack_assign(value_in); @@ -5629,6 +5625,7 @@ void MapRangeNode::compile(SVMCompiler &compiler) int from_max_stack_offset = compiler.stack_assign_if_linked(from_max_in); int to_min_stack_offset = compiler.stack_assign_if_linked(to_min_in); int to_max_stack_offset = compiler.stack_assign_if_linked(to_max_in); + int steps_stack_offset = compiler.stack_assign(steps_in); int result_stack_offset = compiler.stack_assign(result_out); compiler.add_node( @@ -5636,16 +5633,18 @@ void MapRangeNode::compile(SVMCompiler &compiler) value_stack_offset, compiler.encode_uchar4( from_min_stack_offset, from_max_stack_offset, to_min_stack_offset, to_max_stack_offset), - result_stack_offset); + compiler.encode_uchar4(type, steps_stack_offset, result_stack_offset)); compiler.add_node(__float_as_int(from_min), __float_as_int(from_max), __float_as_int(to_min), __float_as_int(to_max)); + compiler.add_node(__float_as_int(steps)); } void MapRangeNode::compile(OSLCompiler &compiler) { + compiler.parameter(this, "type"); compiler.add(this, "node_map_range"); } @@ -5655,6 +5654,11 @@ NODE_DEFINE(ClampNode) { NodeType *type = NodeType::add("clamp", create, NodeType::SHADER); + static NodeEnum type_enum; + type_enum.insert("minmax", NODE_CLAMP_MINMAX); + type_enum.insert("range", NODE_CLAMP_RANGE); + SOCKET_ENUM(type, "Type", type_enum, NODE_CLAMP_MINMAX); + SOCKET_IN_FLOAT(value, "Value", 1.0f); SOCKET_IN_FLOAT(min, "Min", 0.0f); SOCKET_IN_FLOAT(max, "Max", 1.0f); @@ -5671,7 +5675,12 @@ ClampNode::ClampNode() : ShaderNode(node_type) void ClampNode::constant_fold(const ConstantFolder &folder) { if (folder.all_inputs_constant()) { - folder.make_constant(clamp(value, min, max)); + if (type == NODE_CLAMP_RANGE && (min > max)) { + folder.make_constant(clamp(value, max, min)); + } + else { + folder.make_constant(clamp(value, min, max)); + } } } @@ -5689,13 +5698,14 @@ void ClampNode::compile(SVMCompiler &compiler) compiler.add_node(NODE_CLAMP, value_stack_offset, - compiler.encode_uchar4(min_stack_offset, max_stack_offset), + compiler.encode_uchar4(min_stack_offset, max_stack_offset, type), result_stack_offset); compiler.add_node(__float_as_int(min), __float_as_int(max)); } void ClampNode::compile(OSLCompiler &compiler) { + compiler.parameter(this, "type"); compiler.add(this, "node_clamp"); } @@ -5769,6 +5779,7 @@ void MathNode::expand(ShaderGraph *graph) ShaderOutput *result_out = output("Value"); if (!result_out->links.empty()) { ClampNode *clamp_node = new ClampNode(); + clamp_node->type = NODE_CLAMP_MINMAX; clamp_node->min = 0.0f; clamp_node->max = 1.0f; graph->add(clamp_node); diff --git a/intern/cycles/render/nodes.h b/intern/cycles/render/nodes.h index b8f1328f4b9..ae762f3db1c 100644 --- a/intern/cycles/render/nodes.h +++ b/intern/cycles/render/nodes.h @@ -1290,14 +1290,14 @@ class BlackbodyNode : public ShaderNode { class MapRangeNode : public ShaderNode { public: SHADER_NODE_CLASS(MapRangeNode) - void constant_fold(const ConstantFolder &folder); virtual int get_group() { return NODE_GROUP_LEVEL_3; } void expand(ShaderGraph *graph); - float value, from_min, from_max, to_min, to_max; + float value, from_min, from_max, to_min, to_max, steps; + NodeMapRangeType type; bool clamp; }; @@ -1310,6 +1310,7 @@ class ClampNode : public ShaderNode { return NODE_GROUP_LEVEL_3; } float value, min, max; + NodeClampType type; }; class MathNode : public ShaderNode { -- cgit v1.2.3