[Bf-blender-cvs] [ce59ef0ea99] functions: pass MFMask directly
Jacques Lucke
noreply at git.blender.org
Wed Nov 13 14:23:32 CET 2019
Commit: ce59ef0ea99b5e93249f4910ba651c13c211612e
Author: Jacques Lucke
Date: Wed Nov 13 11:29:31 2019 +0100
Branches: functions
https://developer.blender.org/rBce59ef0ea99b5e93249f4910ba651c13c211612e
pass MFMask directly
===================================================================
M source/blender/functions/FN_multi_function.h
M source/blender/functions/intern/multi_functions/lists.cc
M source/blender/functions/intern/multi_functions/lists.h
M source/blender/functions/intern/multi_functions/mixed.cc
M source/blender/functions/intern/multi_functions/mixed.h
M source/blender/functions/intern/multi_functions/network.cc
M source/blender/functions/intern/multi_functions/network.h
===================================================================
diff --git a/source/blender/functions/FN_multi_function.h b/source/blender/functions/FN_multi_function.h
index 071ba5b8038..9eee03448ad 100644
--- a/source/blender/functions/FN_multi_function.h
+++ b/source/blender/functions/FN_multi_function.h
@@ -298,7 +298,7 @@ class MultiFunction {
virtual ~MultiFunction()
{
}
- virtual void call(const MFMask &mask, MFParams ¶ms, MFContext &context) const = 0;
+ virtual void call(MFMask mask, MFParams ¶ms, MFContext &context) const = 0;
IndexRange param_indices() const
{
diff --git a/source/blender/functions/intern/multi_functions/lists.cc b/source/blender/functions/intern/multi_functions/lists.cc
index 20a3f7db4e9..d57e67f9139 100644
--- a/source/blender/functions/intern/multi_functions/lists.cc
+++ b/source/blender/functions/intern/multi_functions/lists.cc
@@ -37,7 +37,7 @@ MF_PackList::MF_PackList(const CPPType &base_type, ArrayRef<bool> input_list_sta
this->set_signature(signature);
}
-void MF_PackList::call(const MFMask &mask, MFParams ¶ms, MFContext &UNUSED(context)) const
+void MF_PackList::call(MFMask mask, MFParams ¶ms, MFContext &UNUSED(context)) const
{
GenericVectorArray *vector_array;
bool is_mutating_first_list;
@@ -86,9 +86,7 @@ MF_GetListElement::MF_GetListElement(const CPPType &base_type) : m_base_type(bas
this->set_signature(signature);
}
-void MF_GetListElement::call(const MFMask &mask,
- MFParams ¶ms,
- MFContext &UNUSED(context)) const
+void MF_GetListElement::call(MFMask mask, MFParams ¶ms, MFContext &UNUSED(context)) const
{
GenericVirtualListListRef lists = params.readonly_vector_input(0, "List");
VirtualListRef<int> indices = params.readonly_single_input<int>(1, "Index");
@@ -117,7 +115,7 @@ MF_ListLength::MF_ListLength(const CPPType &base_type) : m_base_type(base_type)
this->set_signature(signature);
}
-void MF_ListLength::call(const MFMask &mask, MFParams ¶ms, MFContext &UNUSED(context)) const
+void MF_ListLength::call(MFMask mask, MFParams ¶ms, MFContext &UNUSED(context)) const
{
GenericVirtualListListRef lists = params.readonly_vector_input(0, "List");
MutableArrayRef<int> lengths = params.uninitialized_single_output<int>(1, "Length");
diff --git a/source/blender/functions/intern/multi_functions/lists.h b/source/blender/functions/intern/multi_functions/lists.h
index 355df433c42..5a9d2bc9e53 100644
--- a/source/blender/functions/intern/multi_functions/lists.h
+++ b/source/blender/functions/intern/multi_functions/lists.h
@@ -10,7 +10,7 @@ class MF_GetListElement final : public MultiFunction {
public:
MF_GetListElement(const CPPType &base_type);
- void call(const MFMask &mask, MFParams ¶ms, MFContext &context) const override;
+ void call(MFMask mask, MFParams ¶ms, MFContext &context) const override;
};
class MF_ListLength final : public MultiFunction {
@@ -19,7 +19,7 @@ class MF_ListLength final : public MultiFunction {
public:
MF_ListLength(const CPPType &base_type);
- void call(const MFMask &mask, MFParams ¶ms, MFContext &context) const override;
+ void call(MFMask mask, MFParams ¶ms, MFContext &context) const override;
};
class MF_PackList final : public MultiFunction {
@@ -29,7 +29,7 @@ class MF_PackList final : public MultiFunction {
public:
MF_PackList(const CPPType &base_type, ArrayRef<bool> input_list_status);
- void call(const MFMask &mask, MFParams ¶ms, MFContext &context) const override;
+ void call(MFMask mask, MFParams ¶ms, MFContext &context) const override;
private:
bool input_is_list(uint index) const;
@@ -44,7 +44,7 @@ template<typename T> class MF_EmptyList : public MultiFunction {
this->set_signature(signature);
}
- void call(const MFMask &UNUSED(mask),
+ void call(MFMask UNUSED(mask),
MFParams &UNUSED(params),
MFContext &UNUSED(context)) const override
{
@@ -62,7 +62,7 @@ template<typename FromT, typename ToT> class MF_ConvertList : public MultiFuncti
this->set_signature(signature);
}
- void call(const MFMask &mask, MFParams ¶ms, MFContext &UNUSED(context)) const override
+ void call(MFMask mask, MFParams ¶ms, MFContext &UNUSED(context)) const override
{
VirtualListListRef<FromT> inputs = params.readonly_vector_input<FromT>(0, "Inputs");
GenericVectorArray::MutableTypedRef<ToT> outputs = params.vector_output<ToT>(1, "Outputs");
@@ -89,7 +89,7 @@ template<typename T> class MF_SingleElementList : public MultiFunction {
this->set_signature(signature);
}
- void call(const MFMask &mask, MFParams ¶ms, MFContext &UNUSED(context)) const override
+ void call(MFMask mask, MFParams ¶ms, MFContext &UNUSED(context)) const override
{
VirtualListRef<T> inputs = params.readonly_single_input<T>(0, "Input");
GenericVectorArray::MutableTypedRef<T> outputs = params.vector_output<T>(1, "Outputs");
diff --git a/source/blender/functions/intern/multi_functions/mixed.cc b/source/blender/functions/intern/multi_functions/mixed.cc
index b3ea925ff32..2a8052491f8 100644
--- a/source/blender/functions/intern/multi_functions/mixed.cc
+++ b/source/blender/functions/intern/multi_functions/mixed.cc
@@ -31,7 +31,7 @@ MF_AddFloats::MF_AddFloats()
this->set_signature(signature);
}
-void MF_AddFloats::call(const MFMask &mask, MFParams ¶ms, MFContext &UNUSED(context)) const
+void MF_AddFloats::call(MFMask mask, MFParams ¶ms, MFContext &UNUSED(context)) const
{
auto a = params.readonly_single_input<float>(0, "A");
auto b = params.readonly_single_input<float>(1, "B");
@@ -51,7 +51,7 @@ MF_AddFloat3s::MF_AddFloat3s()
this->set_signature(signature);
}
-void MF_AddFloat3s::call(const MFMask &mask, MFParams ¶ms, MFContext &UNUSED(context)) const
+void MF_AddFloat3s::call(MFMask mask, MFParams ¶ms, MFContext &UNUSED(context)) const
{
auto a = params.readonly_single_input<float3>(0, "A");
auto b = params.readonly_single_input<float3>(1, "B");
@@ -73,7 +73,7 @@ MF_CombineColor::MF_CombineColor()
this->set_signature(signature);
}
-void MF_CombineColor::call(const MFMask &mask, MFParams ¶ms, MFContext &UNUSED(context)) const
+void MF_CombineColor::call(MFMask mask, MFParams ¶ms, MFContext &UNUSED(context)) const
{
VirtualListRef<float> r = params.readonly_single_input<float>(0, "R");
VirtualListRef<float> g = params.readonly_single_input<float>(1, "G");
@@ -97,7 +97,7 @@ MF_SeparateColor::MF_SeparateColor()
this->set_signature(signature);
}
-void MF_SeparateColor::call(const MFMask &mask, MFParams ¶ms, MFContext &UNUSED(context)) const
+void MF_SeparateColor::call(MFMask mask, MFParams ¶ms, MFContext &UNUSED(context)) const
{
auto color = params.readonly_single_input<rgba_f>(0, "Color");
auto r = params.uninitialized_single_output<float>(1, "R");
@@ -124,7 +124,7 @@ MF_CombineVector::MF_CombineVector()
this->set_signature(signature);
}
-void MF_CombineVector::call(const MFMask &mask, MFParams ¶ms, MFContext &UNUSED(context)) const
+void MF_CombineVector::call(MFMask mask, MFParams ¶ms, MFContext &UNUSED(context)) const
{
VirtualListRef<float> x = params.readonly_single_input<float>(0, "X");
VirtualListRef<float> y = params.readonly_single_input<float>(1, "Y");
@@ -146,9 +146,7 @@ MF_SeparateVector::MF_SeparateVector()
this->set_signature(signature);
}
-void MF_SeparateVector::call(const MFMask &mask,
- MFParams ¶ms,
- MFContext &UNUSED(context)) const
+void MF_SeparateVector::call(MFMask mask, MFParams ¶ms, MFContext &UNUSED(context)) const
{
auto vector = params.readonly_single_input<float3>(0, "Vector");
auto x = params.uninitialized_single_output<float>(1, "X");
@@ -172,9 +170,7 @@ MF_VectorDistance::MF_VectorDistance()
this->set_signature(signature);
}
-void MF_VectorDistance::call(const MFMask &mask,
- MFParams ¶ms,
- MFContext &UNUSED(context)) const
+void MF_VectorDistance::call(MFMask mask, MFParams ¶ms, MFContext &UNUSED(context)) const
{
auto a = params.readonly_single_input<float3>(0, "A");
auto b = params.readonly_single_input<float3>(1, "B");
@@ -193,7 +189,7 @@ MF_FloatArraySum::MF_FloatArraySum()
this->set_signature(signature);
}
-void MF_FloatArraySum::call(const MFMask &mask, MFParams ¶ms, MFContext &UNUSED(context)) const
+void MF_FloatArraySum::call(MFMask mask, MFParams ¶ms, MFContext &UNUSED(context)) const
{
auto arrays = params.readonly_vector_input<float>(0, "Array");
MutableArrayRef<float> sums = params.uninitialized_single_output<float>(1, "Sum");
@@ -218,7 +214,7 @@ MF_FloatRange::MF_FloatRange()
this->set_signature(signature);
}
-void MF_FloatRange::call(const MFMask &mask, MFParams ¶ms, MFContext &UNUSED(context)) const
+void MF_FloatRange::call(MFMask mask, MFParams ¶ms, MFContext &UNUSED(context)) const
{
VirtualListRef<int> amounts = params.readonly_single_input<int>(0, "Amount");
VirtualListRef<float> starts = params.readonly_single_input<float>(1, "Start");
@@ -245,7 +241,7 @@ MF_ObjectVertexPositions::MF_ObjectVertexPositions()
this->set_signature(signature);
}
-void MF_ObjectVertexPositions::call(const MFMask &mask,
+void MF_ObjectVertexPositions::call(MFMask mask,
MFParams ¶ms,
MFContext &UNUSED(context)) const
{
@@ -277,9 +273,7 @@ MF_ObjectWorldLocation::MF_ObjectWorldLocation()
this->set_signature(signature);
}
-void MF_ObjectWorldLocation::call(const MFMask &mask,
- MFParams ¶ms,
- MFContext &UNUSED(context)) const
+void MF_ObjectWorldLocation::call(MFMask mask, MFParams ¶ms, MFContext &UNUSED(context)) const
{
auto objects = params.readonly_single_input<Object *>(0, "Object");
auto locations = params.uninitialized_single_output<float3>(1, "Location");
@@ -304,7 +298,7 @@ MF_SwitchSingle::MF_SwitchSingle(const CPPType &type) : m_type(type)
this->set_signature(signature);
}
-void MF_SwitchS
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list