Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-20 00:13:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

implement signal related methods in csharp_script so signals can be used with emit

Browse source
This commit is contained in:
Paul Joannon 2018-01-18 23:27:43 +01:00
parent efd52cd172
commit cfbd7fd21e
No known key found for this signature in database
GPG key ID: 93604DC6128B663C
4 changed files with 89 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

68
modules/mono/csharp_script.cpp
View file

@ -1566,13 +1566,13 @@ bool CSharpScript::_update_signals() {
while (top && top != native) {
const Vector<GDMonoClass *> &delegates = top->get_all_delegates();
for (int i = delegates.size() - 1; i >= 0; i--) {
for (int i = delegates.size() - 1; i >= 0; --i) {
Vector<Argument> parameters;
GDMonoClass *delegate = delegates[i];
if (delegate->has_attribute(CACHED_CLASS(SignalAttribute))) {
StringName name = delegate->get_name();
_signals[name] = Vector<StringName>(); // TODO Retrieve arguments
if (_get_signal(top, delegate, parameters)) {
_signals[delegate->get_name()] = parameters;
}
}
@ -1585,6 +1585,41 @@ bool CSharpScript::_update_signals() {
return false;
}
bool CSharpScript::_get_signal(GDMonoClass *p_class, GDMonoClass *p_delegate, Vector<Argument> &params) {
if (p_delegate->has_attribute(CACHED_CLASS(SignalAttribute))) {
MonoType *raw_type = GDMonoClass::get_raw_type(p_delegate);
if (mono_type_get_type(raw_type) == MONO_TYPE_CLASS) {
// Arguments are accessibles as arguments of .Invoke method
GDMonoMethod *invoke = p_delegate->get_method("Invoke", -1);
Vector<StringName> names;
Vector<ManagedType> types;
invoke->get_parameter_names(names);
invoke->get_parameter_types(types);
if (names.size() == types.size()) {
for (int i = 0; i < names.size(); ++i) {
Argument arg;
arg.name = names[i];
arg.type = GDMonoMarshal::managed_to_variant_type(types[i]);
if (arg.type == Variant::NIL) {
ERR_PRINTS("Unknown type of signal parameter: " + arg.name + " in " + p_class->get_full_name());
return false;
}
params.push_back(arg);
}
return true;
}
}
}
return false;
}
#ifdef TOOLS_ENABLED
bool CSharpScript::_get_member_export(GDMonoClass *p_class, GDMonoClassMember *p_member, PropertyInfo &r_prop_info, bool &r_exported) {
@ -1913,6 +1948,8 @@ ScriptInstance *CSharpScript::instance_create(Object *p_this) {
#endif
}
update_signals();
if (native) {
String native_name = native->get_name();
if (!ClassDB::is_parent_class(p_this->get_class_name(), native_name)) {
@ -2076,6 +2113,27 @@ void CSharpScript::update_exports() {
#endif
}
bool CSharpScript::has_script_signal(const StringName &p_signal) const {
if (_signals.has(p_signal))
return true;
return false;
}
void CSharpScript::get_script_signal_list(List<MethodInfo> *r_signals) const {
for (const Map<StringName, Vector<Argument> >::Element *E = _signals.front(); E; E = E->next()) {
MethodInfo mi;
mi.name = E->key();
for (int i = 0; i < E->get().size(); i++) {
PropertyInfo arg;
arg.name = E->get()[i].name;
mi.arguments.push_back(arg);
}
r_signals->push_back(mi);
}
}
void CSharpScript::update_signals() {
#ifdef TOOLS_ENABLED
_update_signals();