diff options
Diffstat (limited to 'modules/mono/csharp_script.cpp')
| -rw-r--r-- | modules/mono/csharp_script.cpp | 92 |
1 files changed, 86 insertions, 6 deletions
diff --git a/modules/mono/csharp_script.cpp b/modules/mono/csharp_script.cpp index a12cac5a99..05595e7e45 100644 --- a/modules/mono/csharp_script.cpp +++ b/modules/mono/csharp_script.cpp @@ -42,6 +42,7 @@ #ifdef TOOLS_ENABLED #include "core/os/keyboard.h" +#include "editor/editor_file_system.h" #include "editor/editor_internal_calls.h" #include "editor/editor_node.h" #include "editor/editor_settings.h" @@ -65,6 +66,10 @@ #define CACHED_STRING_NAME(m_var) (CSharpLanguage::get_singleton()->get_string_names().m_var) +// Types that will be skipped over (in favor of their base types) when setting up instance bindings. +// This must be a superset of `ignored_types` in bindings_generator.cpp. +const Vector<String> ignored_types = { "PhysicsServer2DExtension", "PhysicsServer3DExtension" }; + #ifdef TOOLS_ENABLED static bool _create_project_solution_if_needed() { CRASH_COND(CSharpLanguage::get_singleton()->get_godotsharp_editor() == nullptr); @@ -535,6 +540,48 @@ String CSharpLanguage::_get_indentation() const { return "\t"; } +bool CSharpLanguage::handles_global_class_type(const String &p_type) const { + return p_type == get_type(); +} + +String CSharpLanguage::get_global_class_name(const String &p_path, String *r_base_type, String *r_icon_path) const { + Ref<CSharpScript> scr = ResourceLoader::load(p_path, get_type()); + if (!scr.is_valid() || !scr->valid || !scr->global_class) { + // Invalid script or the script is not a global class. + return String(); + } + + String name = scr->class_name; + if (unlikely(name.is_empty())) { + return String(); + } + + if (r_icon_path) { + if (scr->icon_path.is_empty() || scr->icon_path.is_absolute_path()) { + *r_icon_path = scr->icon_path.simplify_path(); + } else if (scr->icon_path.is_relative_path()) { + *r_icon_path = p_path.get_base_dir().path_join(scr->icon_path).simplify_path(); + } + } + if (r_base_type) { + bool found_global_base_script = false; + const CSharpScript *top = scr->base_script.ptr(); + while (top != nullptr) { + if (top->global_class) { + *r_base_type = top->class_name; + found_global_base_script = true; + break; + } + + top = top->base_script.ptr(); + } + if (!found_global_base_script) { + *r_base_type = scr->get_instance_base_type(); + } + } + return name; +} + String CSharpLanguage::debug_get_error() const { return _debug_error; } @@ -1202,11 +1249,16 @@ bool CSharpLanguage::setup_csharp_script_binding(CSharpScriptBinding &r_script_b StringName type_name = p_object->get_class_name(); - // ¯\_(ツ)_/¯ const ClassDB::ClassInfo *classinfo = ClassDB::classes.getptr(type_name); - while (classinfo && !classinfo->exposed) { + + // This skipping of GDExtension classes, as well as whatever classes are in this list of ignored types, is a + // workaround to allow GDExtension classes to be used from C# so long as they're only used through base classes that + // are registered from the engine. This will likely need to be removed whenever proper support for GDExtension + // classes is added to C#. See #75955 for more details. + while (classinfo && (!classinfo->exposed || classinfo->gdextension || ignored_types.has(classinfo->name))) { classinfo = classinfo->inherits_ptr; } + ERR_FAIL_NULL_V(classinfo, false); type_name = classinfo->name; @@ -1533,7 +1585,10 @@ CSharpInstance *CSharpInstance::create_for_managed_type(Object *p_owner, CSharpS instance->_reference_owner_unsafe(); } - p_script->instances.insert(p_owner); + { + MutexLock lock(CSharpLanguage::get_singleton()->get_script_instances_mutex()); + p_script->instances.insert(p_owner); + } return instance; } @@ -2203,11 +2258,21 @@ void CSharpScript::reload_registered_script(Ref<CSharpScript> p_script) { update_script_class_info(p_script); p_script->_update_exports(); + +#if TOOLS_ENABLED + // If the EditorFileSystem singleton is available, update the file; + // otherwise, the file will be updated when the singleton becomes available. + EditorFileSystem *efs = EditorFileSystem::get_singleton(); + if (efs) { + efs->update_file(p_script->get_path()); + } +#endif } // Extract information about the script using the mono class. void CSharpScript::update_script_class_info(Ref<CSharpScript> p_script) { bool tool = false; + bool global_class = false; // TODO: Use GDExtension godot_dictionary Array methods_array; @@ -2217,11 +2282,17 @@ void CSharpScript::update_script_class_info(Ref<CSharpScript> p_script) { Dictionary signals_dict; signals_dict.~Dictionary(); + String class_name; + String icon_path; Ref<CSharpScript> base_script; GDMonoCache::managed_callbacks.ScriptManagerBridge_UpdateScriptClassInfo( - p_script.ptr(), &tool, &methods_array, &rpc_functions_dict, &signals_dict, &base_script); + p_script.ptr(), &class_name, &tool, &global_class, &icon_path, + &methods_array, &rpc_functions_dict, &signals_dict, &base_script); + p_script->class_name = class_name; p_script->tool = tool; + p_script->global_class = global_class; + p_script->icon_path = icon_path; p_script->rpc_config.clear(); p_script->rpc_config = rpc_functions_dict; @@ -2519,6 +2590,15 @@ Error CSharpScript::reload(bool p_keep_state) { update_script_class_info(this); _update_exports(); + +#if TOOLS_ENABLED + // If the EditorFileSystem singleton is available, update the file; + // otherwise, the file will be updated when the singleton becomes available. + EditorFileSystem *efs = EditorFileSystem::get_singleton(); + if (efs) { + efs->update_file(script_path); + } +#endif } return OK; @@ -2605,11 +2685,11 @@ bool CSharpScript::inherits_script(const Ref<Script> &p_script) const { } Ref<Script> CSharpScript::get_base_script() const { - return base_script; + return base_script.is_valid() && !base_script->get_path().is_empty() ? base_script : nullptr; } StringName CSharpScript::get_global_name() const { - return StringName(); + return global_class ? StringName(class_name) : StringName(); } void CSharpScript::get_script_property_list(List<PropertyInfo> *r_list) const { |