[Bf-blender-cvs] [a74a2882ed2] functions-experimental-refactor: bring back compare node

Jacques Lucke noreply at git.blender.org
Fri Nov 8 20:36:48 CET 2019


Commit: a74a2882ed2545dc9348e606b3cf2468d55f4b9b
Author: Jacques Lucke
Date:   Fri Nov 8 20:33:44 2019 +0100
Branches: functions-experimental-refactor
https://developer.blender.org/rBa74a2882ed2545dc9348e606b3cf2468d55f4b9b

bring back compare node

===================================================================

M	source/blender/functions/intern/vtree_multi_function_network/mappings_nodes.cc

===================================================================

diff --git a/source/blender/functions/intern/vtree_multi_function_network/mappings_nodes.cc b/source/blender/functions/intern/vtree_multi_function_network/mappings_nodes.cc
index 6ec71dbc268..8d431c42d22 100644
--- a/source/blender/functions/intern/vtree_multi_function_network/mappings_nodes.cc
+++ b/source/blender/functions/intern/vtree_multi_function_network/mappings_nodes.cc
@@ -435,6 +435,16 @@ static void INSERT_boolean_not(VTreeMFNetworkBuilder &builder, const VNode &vnod
   insert_single_input_math_function<bool, bool_not_func_cb>(builder, vnode);
 }
 
+static bool less_than_func_cb(float a, float b)
+{
+  return a < b;
+}
+
+static void INSERT_compare(VTreeMFNetworkBuilder &builder, const VNode &vnode)
+{
+  insert_two_inputs_math_function<float, float, bool, less_than_func_cb>(builder, vnode);
+}
+
 void add_vtree_node_mapping_info(VTreeMultiFunctionMappings &mappings)
 {
   mappings.vnode_inserters.add_new("fn_CombineColorNode", INSERT_combine_color);
@@ -451,6 +461,7 @@ void add_vtree_node_mapping_info(VTreeMultiFunctionMappings &mappings)
   mappings.vnode_inserters.add_new("fn_VertexInfoNode", INSERT_vertex_info);
   mappings.vnode_inserters.add_new("fn_FloatRangeNode", INSERT_float_range);
   mappings.vnode_inserters.add_new("fn_TimeInfoNode", INSERT_time_info);
+  mappings.vnode_inserters.add_new("fn_CompareNode", INSERT_compare);
 
   mappings.vnode_inserters.add_new("fn_AddFloatsNode", INSERT_add_floats);
   mappings.vnode_inserters.add_new("fn_MultiplyFloatsNode", INSERT_multiply_floats);



More information about the Bf-blender-cvs mailing list