mirror of
https://github.com/godotengine/godot
synced 2024-09-05 06:48:38 +00:00
Merge pull request #81629 from rune-scape/more-gdscript-deps
GDScript: Include lambda dependencies
This commit is contained in:
commit
986c8af29d
|
@ -1170,7 +1170,7 @@ GDScript *GDScript::get_root_script() {
|
|||
RBSet<GDScript *> GDScript::get_dependencies() {
|
||||
RBSet<GDScript *> dependencies;
|
||||
|
||||
_get_dependencies(dependencies, this);
|
||||
_collect_dependencies(dependencies, this);
|
||||
dependencies.erase(this);
|
||||
|
||||
return dependencies;
|
||||
|
@ -1276,52 +1276,55 @@ GDScript *GDScript::_get_gdscript_from_variant(const Variant &p_variant) {
|
|||
return Object::cast_to<GDScript>(obj);
|
||||
}
|
||||
|
||||
void GDScript::_get_dependencies(RBSet<GDScript *> &p_dependencies, const GDScript *p_except) {
|
||||
void GDScript::_collect_function_dependencies(GDScriptFunction *p_func, RBSet<GDScript *> &p_dependencies, const GDScript *p_except) {
|
||||
if (p_func == nullptr) {
|
||||
return;
|
||||
}
|
||||
for (GDScriptFunction *lambda : p_func->lambdas) {
|
||||
_collect_function_dependencies(lambda, p_dependencies, p_except);
|
||||
}
|
||||
for (const Variant &V : p_func->constants) {
|
||||
GDScript *scr = _get_gdscript_from_variant(V);
|
||||
if (scr != nullptr && scr != p_except) {
|
||||
scr->_collect_dependencies(p_dependencies, p_except);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void GDScript::_collect_dependencies(RBSet<GDScript *> &p_dependencies, const GDScript *p_except) {
|
||||
if (p_dependencies.has(this)) {
|
||||
return;
|
||||
}
|
||||
p_dependencies.insert(this);
|
||||
if (this != p_except) {
|
||||
p_dependencies.insert(this);
|
||||
}
|
||||
|
||||
for (const KeyValue<StringName, GDScriptFunction *> &E : member_functions) {
|
||||
if (E.value == nullptr) {
|
||||
continue;
|
||||
}
|
||||
for (const Variant &V : E.value->constants) {
|
||||
GDScript *scr = _get_gdscript_from_variant(V);
|
||||
if (scr != nullptr && scr != p_except) {
|
||||
scr->_get_dependencies(p_dependencies, p_except);
|
||||
}
|
||||
}
|
||||
_collect_function_dependencies(E.value, p_dependencies, p_except);
|
||||
}
|
||||
|
||||
if (implicit_initializer) {
|
||||
for (const Variant &V : implicit_initializer->constants) {
|
||||
GDScript *scr = _get_gdscript_from_variant(V);
|
||||
if (scr != nullptr && scr != p_except) {
|
||||
scr->_get_dependencies(p_dependencies, p_except);
|
||||
}
|
||||
}
|
||||
_collect_function_dependencies(implicit_initializer, p_dependencies, p_except);
|
||||
}
|
||||
|
||||
if (implicit_ready) {
|
||||
for (const Variant &V : implicit_ready->constants) {
|
||||
GDScript *scr = _get_gdscript_from_variant(V);
|
||||
if (scr != nullptr && scr != p_except) {
|
||||
scr->_get_dependencies(p_dependencies, p_except);
|
||||
}
|
||||
}
|
||||
_collect_function_dependencies(implicit_ready, p_dependencies, p_except);
|
||||
}
|
||||
|
||||
if (static_initializer) {
|
||||
_collect_function_dependencies(static_initializer, p_dependencies, p_except);
|
||||
}
|
||||
|
||||
for (KeyValue<StringName, Ref<GDScript>> &E : subclasses) {
|
||||
if (E.value != p_except) {
|
||||
E.value->_get_dependencies(p_dependencies, p_except);
|
||||
E.value->_collect_dependencies(p_dependencies, p_except);
|
||||
}
|
||||
}
|
||||
|
||||
for (const KeyValue<StringName, Variant> &E : constants) {
|
||||
GDScript *scr = _get_gdscript_from_variant(E.value);
|
||||
if (scr != nullptr && scr != p_except) {
|
||||
scr->_get_dependencies(p_dependencies, p_except);
|
||||
scr->_collect_dependencies(p_dependencies, p_except);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -213,7 +213,8 @@ private:
|
|||
void _get_script_signal_list(List<MethodInfo> *r_list, bool p_include_base) const;
|
||||
|
||||
GDScript *_get_gdscript_from_variant(const Variant &p_variant);
|
||||
void _get_dependencies(RBSet<GDScript *> &p_dependencies, const GDScript *p_except);
|
||||
void _collect_function_dependencies(GDScriptFunction *p_func, RBSet<GDScript *> &p_dependencies, const GDScript *p_except);
|
||||
void _collect_dependencies(RBSet<GDScript *> &p_dependencies, const GDScript *p_except);
|
||||
|
||||
protected:
|
||||
bool _get(const StringName &p_name, Variant &r_ret) const;
|
||||
|
|
Loading…
Reference in a new issue