gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-09-16 00:27:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #71000 from reduz/callable-bind-from-array

Browse source 
Allow binding Callable arguments from an array
This commit is contained in:
Rémi Verschelde 2023-01-07 13:18:53 +01:00
parent 0ab91b3d79 d762a0395a
commit 41b74c675f
No known key found for this signature in database
GPG key ID: C3336907360768E1
4 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/variant/callable.cpp
View file

@ -102,6 +102,20 @@ Callable Callable::bindp(const Variant **p_arguments, int p_argcount) const {
}
return Callable(memnew(CallableCustomBind(*this, args)));
}
Callable Callable::bindv(const Array &p_arguments) {
if (p_arguments.is_empty()) {
return *this; // No point in creating a new callable if nothing is bound.
}
Vector<Variant> args;
args.resize(p_arguments.size());
for (int i = 0; i < p_arguments.size(); i++) {
args.write[i] = p_arguments[i];
}
return Callable(memnew(CallableCustomBind(*this, args)));
}
Callable Callable::unbind(int p_argcount) const {
return Callable(memnew(CallableCustomUnbind(*this, p_argcount)));
}

1
core/variant/callable.h
View file

@ -98,6 +98,7 @@ public:
template <typename... VarArgs>
Callable bind(VarArgs... p_args);
Callable bindv(const Array &p_arguments);
Callable bindp(const Variant **p_arguments, int p_argcount) const;
Callable unbind(int p_argcount) const;

1
core/variant/variant_call.cpp
View file

@ -2017,6 +2017,7 @@ static void _register_variant_builtin_methods() {
bind_method(Callable, get_object_id, sarray(), varray());
bind_method(Callable, get_method, sarray(), varray());
bind_method(Callable, hash, sarray(), varray());
bind_method(Callable, bindv, sarray("arguments"), varray());
bind_method(Callable, unbind, sarray("argcount"), varray());
bind_custom(Callable, call, _VariantCall::func_Callable_call, true, Variant);

7
doc/classes/Callable.xml
View file

@ -77,6 +77,13 @@
Returns a copy of this [Callable] with one or more arguments bound. When called, the bound arguments are passed [i]after[/i] the arguments supplied by [method call].
</description>
</method>
<method name="bindv">
<return type="Callable" />
<param index="0" name="arguments" type="Array" />
<description>
Returns a copy of this [Callable] with one or more arguments bound, reading them from an array. When called, the bound arguments are passed [i]after[/i] the arguments supplied by [method call].
</description>
</method>
<method name="call" qualifiers="vararg const">
<return type="Variant" />
<description>