[Bf-blender-cvs] [7c06e2e8d2d] functions: new ceil and floor float nodes

[Jacques Lucke]

Commit: 7c06e2e8d2d1ccc97281db4a5ae14cd9885bcade
Author: Jacques Lucke
Date:   Sun Feb 2 11:43:33 2020 +0100
Branches: functions
https://developer.blender.org/rB7c06e2e8d2d1ccc97281db4a5ae14cd9885bcade

new ceil and floor float nodes

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

M	release/scripts/startup/nodes/function_nodes/math.py
M	source/blender/functions/intern/node_tree_multi_function_network/mappings_nodes.cc

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

diff --git a/release/scripts/startup/nodes/function_nodes/math.py b/release/scripts/startup/nodes/function_nodes/math.py
index d1c9006625c..0ee40706542 100644
--- a/release/scripts/startup/nodes/function_nodes/math.py
+++ b/release/scripts/startup/nodes/function_nodes/math.py
@@ -67,6 +67,9 @@ AbsFloatNode = create_single_input_math_node("Float", "fn_AbsoluteFloatNode", "A
 SineFloatNode = create_single_input_math_node("Float", "fn_SineFloatNode", "Sine")
 CosineFloatNode = create_single_input_math_node("Float", "fn_CosineFloatNode", "Cosine")
 
+CeilFloatNode = create_single_input_math_node("Float", "fn_CeilFloatNode", "Ceil Float")
+FloorFloatNode = create_single_input_math_node("Float", "fn_FloorFloatNode", "Floor Float")
+
 AddVectorsNode = create_variadic_math_node("Vector", "fn_AddVectorsNode", "Add Vectors")
 SubtractVectorsNode = create_single_type_two_inputs_math_node("Vector", "fn_SubtractVectorsNode", "Subtract Vectors")
 MultiplyVectorsNode = create_variadic_math_node("Vector", "fn_MultiplyVectorsNode", "Multiply Vectors")
diff --git a/source/blender/functions/intern/node_tree_multi_function_network/mappings_nodes.cc b/source/blender/functions/intern/node_tree_multi_function_network/mappings_nodes.cc
index ddc5a257495..2595b04097a 100644
--- a/source/blender/functions/intern/node_tree_multi_function_network/mappings_nodes.cc
+++ b/source/blender/functions/intern/node_tree_multi_function_network/mappings_nodes.cc
@@ -280,6 +280,18 @@ static void INSERT_cosine_float(FNodeMFBuilder &builder)
       builder, [](float a) -> float { return std::cos(a); }, BLI_RAND_PER_LINE_UINT32);
 }
 
+static void INSERT_ceil_float(FNodeMFBuilder &builder)
+{
+  build_math_fn_1in_1out<float, float>(
+      builder, [](float a) -> float { return std::ceil(a); }, BLI_RAND_PER_LINE_UINT32);
+}
+
+static void INSERT_floor_float(FNodeMFBuilder &builder)
+{
+  build_math_fn_1in_1out<float, float>(
+      builder, [](float a) -> float { return std::floor(a); }, BLI_RAND_PER_LINE_UINT32);
+}
+
 static void INSERT_add_vectors(FNodeMFBuilder &builder)
 {
   build_variadic_math_fn(
@@ -575,6 +587,9 @@ void add_function_tree_node_mapping_info(FunctionTreeMFMappings &mappings)
   mappings.fnode_inserters.add_new("fn_SineFloatNode", INSERT_sine_float);
   mappings.fnode_inserters.add_new("fn_CosineFloatNode", INSERT_cosine_float);
 
+  mappings.fnode_inserters.add_new("fn_CeilFloatNode", INSERT_ceil_float);
+  mappings.fnode_inserters.add_new("fn_FloorFloatNode", INSERT_floor_float);
+
   mappings.fnode_inserters.add_new("fn_AddVectorsNode", INSERT_add_vectors);
   mappings.fnode_inserters.add_new("fn_SubtractVectorsNode", INSERT_subtract_vectors);
   mappings.fnode_inserters.add_new("fn_MultiplyVectorsNode", INSERT_multiply_vectors);