asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

C#: Connect only once for each signal of a script

Browse source 
Since the list of signals in `CSharpScript::event_signals` retrieved
from calling `ScriptManagerBridge.UpdateScriptClassInfo` already
includes the signals from base scripts there is no need to iterate the
hierarchy again on `CSharpInstance::connect_event_signals`.
This commit is contained in:
Raul Santos 2022-09-03 20:35:31 +02:00
parent 3faf9e18f1
commit 281ccc7e1b
No known key found for this signature in database
GPG key ID: B532473AE3A803E4
1 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
modules/mono/csharp_script.cpp
View file

@ -1754,20 +1754,16 @@ void CSharpInstance::mono_object_disposed_baseref(GCHandleIntPtr p_gchandle_to_f
} }
void CSharpInstance::connect_event_signals() { void CSharpInstance::connect_event_signals() {
CSharpScript *top = script.ptr(); // The script signals list includes the signals declared in base scripts.
while (top != nullptr) { for (CSharpScript::EventSignalInfo &signal : script->get_script_event_signals()) {
for (CSharpScript::EventSignalInfo &signal : top->get_script_event_signals()) { String signal_name = signal.name;
String signal_name = signal.name;
// TODO: Use pooling for ManagedCallable instances. // TODO: Use pooling for ManagedCallable instances.
EventSignalCallable *event_signal_callable = memnew(EventSignalCallable(owner, signal_name)); EventSignalCallable *event_signal_callable = memnew(EventSignalCallable(owner, signal_name));
Callable callable(event_signal_callable); Callable callable(event_signal_callable);
connected_event_signals.push_back(callable); connected_event_signals.push_back(callable);
owner->connect(signal_name, callable); owner->connect(signal_name, callable);
}
top = top->base_script.ptr();
} }
} }