[Bf-blender-cvs] [36efb78551e] functions: improved naming

[Jacques Lucke]

Commit: 36efb78551eb148f0fdb5356fe048189f5bdb71a
Author: Jacques Lucke
Date:   Fri Feb 22 13:42:41 2019 +0100
Branches: functions
https://developer.blender.org/rB36efb78551eb148f0fdb5356fe048189f5bdb71a

improved naming

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

M	source/blender/blenkernel/intern/fcurve.c
M	source/blender/functions/FN_functions.h
M	source/blender/functions/c_wrapper.cpp
A	source/blender/functions/core/adapter.hpp
M	source/blender/modifiers/intern/MOD_displace.c
M	source/blender/modifiers/intern/MOD_functiondeform.c

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

diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c
index b598697ad1b..914d9d05335 100644
--- a/source/blender/blenkernel/intern/fcurve.c
+++ b/source/blender/blenkernel/intern/fcurve.c
@@ -1623,7 +1623,7 @@ static float dvar_eval_function(ChannelDriver *UNUSED(driver), DriverVar *dvar)
 
 	FnTuple fn_in = FN_tuple_for_input(fn);
 	FnTuple fn_out = FN_tuple_for_output(fn);
-	FnCallable callable = FN_function_get_callable(fn);
+	FnTupleCallBody callable = FN_function_get_callable(fn);
 
 	FN_function_call(callable, fn_in, fn_out);
 	float result = FN_tuple_get_float(fn_out, 0);
diff --git a/source/blender/functions/FN_functions.h b/source/blender/functions/FN_functions.h
index adf84de3de3..49424b231ba 100644
--- a/source/blender/functions/FN_functions.h
+++ b/source/blender/functions/FN_functions.h
@@ -13,10 +13,10 @@ void FN_initialize(void);
 typedef struct OpaqueFnFunction *FnFunction;
 typedef struct OpaqueFnType *FnType;
 typedef struct OpaqueFnTuple *FnTuple;
-typedef struct OpaqueFnCallable *FnCallable;
+typedef struct OpaqueFnTupleCallBody *FnTupleCallBody;
 
-FnCallable FN_function_get_callable(FnFunction fn);
-void FN_function_call(FnCallable call, FnTuple fn_in, FnTuple fn_out);
+FnTupleCallBody FN_function_get_callable(FnFunction fn);
+void FN_function_call(FnTupleCallBody call, FnTuple fn_in, FnTuple fn_out);
 void FN_function_free(FnFunction fn);
 
 bool FN_function_has_signature(FnFunction, FnType *inputs, FnType *outputs);
diff --git a/source/blender/functions/c_wrapper.cpp b/source/blender/functions/c_wrapper.cpp
index c34a324d8d4..2c91a94f325 100644
--- a/source/blender/functions/c_wrapper.cpp
+++ b/source/blender/functions/c_wrapper.cpp
@@ -16,7 +16,7 @@
 WRAPPERS(BLI::RefCounted<FN::Function> *, FnFunction);
 WRAPPERS(BLI::RefCounted<FN::Type> *, FnType);
 WRAPPERS(FN::Tuple *, FnTuple);
-WRAPPERS(const FN::TupleCallBody *, FnCallable);
+WRAPPERS(const FN::TupleCallBody *, FnTupleCallBody);
 
 
 void FN_initialize()
@@ -24,12 +24,12 @@ void FN_initialize()
 	FN::Nodes::initialize();
 }
 
-void FN_function_call(FnCallable fn_call, FnTuple fn_in, FnTuple fn_out)
+void FN_function_call(FnTupleCallBody fn_call, FnTuple fn_in, FnTuple fn_out)
 {
 	unwrap(fn_call)->call(*unwrap(fn_in), *unwrap(fn_out));
 }
 
-FnCallable FN_function_get_callable(FnFunction fn)
+FnTupleCallBody FN_function_get_callable(FnFunction fn)
 {
 	return wrap(unwrap(fn)->ptr()->body<FN::TupleCallBody>());
 }
diff --git a/source/blender/functions/core/adapter.hpp b/source/blender/functions/core/adapter.hpp
new file mode 100644
index 00000000000..306a8d3f11c
--- /dev/null
+++ b/source/blender/functions/core/adapter.hpp
@@ -0,0 +1,10 @@
+#include "cpu.hpp"
+
+namespace FN {
+
+	class FunctionCallAdapter {
+	public:
+
+	};
+
+} /* namespace FN */
\ No newline at end of file
diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c
index 855c43f5496..54f61ecd161 100644
--- a/source/blender/modifiers/intern/MOD_displace.c
+++ b/source/blender/modifiers/intern/MOD_displace.c
@@ -220,7 +220,7 @@ static void displaceModifier_do_task(
 		FnTuple fn_in = FN_tuple_for_input(data->calc_weight_func);
 		FnTuple fn_out = FN_tuple_for_output(data->calc_weight_func);
 		FN_tuple_set_float_vector_3(fn_in, 0, vertexCos[iter]);
-		FnCallable callable = FN_function_get_callable(data->calc_weight_func);
+		FnTupleCallBody callable = FN_function_get_callable(data->calc_weight_func);
 		FN_function_call(callable, fn_in, fn_out);
 		weight = FN_tuple_get_float(fn_out, 0);
 		FN_tuple_free(fn_in);
diff --git a/source/blender/modifiers/intern/MOD_functiondeform.c b/source/blender/modifiers/intern/MOD_functiondeform.c
index 816fd64bac9..2ae37f7af46 100644
--- a/source/blender/modifiers/intern/MOD_functiondeform.c
+++ b/source/blender/modifiers/intern/MOD_functiondeform.c
@@ -75,7 +75,7 @@ static void do_deformation(
 		return;
 	}
 
-	FnCallable fn_call = FN_function_get_callable(fn);
+	FnTupleCallBody fn_call = FN_function_get_callable(fn);
 	BLI_assert(fn_call);
 
 	FnTuple fn_in = FN_tuple_for_input(fn);