diff options
Diffstat (limited to 'modules/mono/csharp_script.cpp')
| -rw-r--r-- | modules/mono/csharp_script.cpp | 53 |
1 files changed, 31 insertions, 22 deletions
diff --git a/modules/mono/csharp_script.cpp b/modules/mono/csharp_script.cpp index 2971706c75..9e23a27093 100644 --- a/modules/mono/csharp_script.cpp +++ b/modules/mono/csharp_script.cpp @@ -68,8 +68,6 @@ #include <stdint.h> -#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 = {}; @@ -1656,7 +1654,8 @@ void CSharpInstance::get_property_list(List<PropertyInfo> *p_properties) const { } } - for (const PropertyInfo &prop : props) { + for (PropertyInfo &prop : props) { + validate_property(prop); p_properties->push_back(prop); } } @@ -1685,7 +1684,7 @@ bool CSharpInstance::property_can_revert(const StringName &p_name) const { Variant ret; Callable::CallError call_error; GDMonoCache::managed_callbacks.CSharpInstanceBridge_Call( - gchandle.get_intptr(), &CACHED_STRING_NAME(_property_can_revert), args, 1, &call_error, &ret); + gchandle.get_intptr(), &SNAME("_property_can_revert"), args, 1, &call_error, &ret); if (call_error.error != Callable::CallError::CALL_OK) { return false; @@ -1694,6 +1693,24 @@ bool CSharpInstance::property_can_revert(const StringName &p_name) const { return (bool)ret; } +void CSharpInstance::validate_property(PropertyInfo &p_property) const { + ERR_FAIL_COND(!script.is_valid()); + + Variant property_arg = (Dictionary)p_property; + const Variant *args[1] = { &property_arg }; + + Variant ret; + Callable::CallError call_error; + GDMonoCache::managed_callbacks.CSharpInstanceBridge_Call( + gchandle.get_intptr(), &SNAME("_validate_property"), args, 1, &call_error, &ret); + + if (call_error.error != Callable::CallError::CALL_OK) { + return; + } + + p_property = PropertyInfo::from_dict(property_arg); +} + bool CSharpInstance::property_get_revert(const StringName &p_name, Variant &r_ret) const { ERR_FAIL_COND_V(!script.is_valid(), false); @@ -1703,7 +1720,7 @@ bool CSharpInstance::property_get_revert(const StringName &p_name, Variant &r_re Variant ret; Callable::CallError call_error; GDMonoCache::managed_callbacks.CSharpInstanceBridge_Call( - gchandle.get_intptr(), &CACHED_STRING_NAME(_property_get_revert), args, 1, &call_error, &ret); + gchandle.get_intptr(), &SNAME("_property_get_revert"), args, 1, &call_error, &ret); if (call_error.error != Callable::CallError::CALL_OK) { return false; @@ -1959,7 +1976,7 @@ const Variant CSharpInstance::get_rpc_config() const { return script->get_rpc_config(); } -void CSharpInstance::notification(int p_notification) { +void CSharpInstance::notification(int p_notification, bool p_reversed) { if (p_notification == Object::NOTIFICATION_PREDELETE) { // When NOTIFICATION_PREDELETE is sent, we also take the chance to call Dispose(). // It's safe to call Dispose() multiple times and NOTIFICATION_PREDELETE is guaranteed @@ -1977,7 +1994,7 @@ void CSharpInstance::notification(int p_notification) { return; } - _call_notification(p_notification); + _call_notification(p_notification, p_reversed); GDMonoCache::managed_callbacks.CSharpInstanceBridge_CallDispose( gchandle.get_intptr(), /* okIfNull */ false); @@ -1985,19 +2002,17 @@ void CSharpInstance::notification(int p_notification) { return; } - _call_notification(p_notification); + _call_notification(p_notification, p_reversed); } -void CSharpInstance::_call_notification(int p_notification) { +void CSharpInstance::_call_notification(int p_notification, bool p_reversed) { Variant arg = p_notification; const Variant *args[1] = { &arg }; - StringName method_name = SNAME("_notification"); - - Callable::CallError call_error; Variant ret; + Callable::CallError call_error; GDMonoCache::managed_callbacks.CSharpInstanceBridge_Call( - gchandle.get_intptr(), &method_name, args, 1, &call_error, &ret); + gchandle.get_intptr(), &SNAME("_notification"), args, 1, &call_error, &ret); } String CSharpInstance::to_string(bool *r_valid) { @@ -2221,7 +2236,7 @@ bool CSharpScript::_update_exports(PlaceHolderScriptInstance *p_instance_to_upda } bool CSharpScript::_get(const StringName &p_name, Variant &r_ret) const { - if (p_name == CSharpLanguage::singleton->string_names._script_source) { + if (p_name == SNAME("script/source")) { r_ret = get_source_code(); return true; } @@ -2230,7 +2245,7 @@ bool CSharpScript::_get(const StringName &p_name, Variant &r_ret) const { } bool CSharpScript::_set(const StringName &p_name, const Variant &p_value) { - if (p_name == CSharpLanguage::singleton->string_names._script_source) { + if (p_name == SNAME("script/source")) { set_source_code(p_value); reload(); return true; @@ -2240,7 +2255,7 @@ bool CSharpScript::_set(const StringName &p_name, const Variant &p_value) { } void CSharpScript::_get_property_list(List<PropertyInfo> *p_properties) const { - p_properties->push_back(PropertyInfo(Variant::STRING, CSharpLanguage::singleton->string_names._script_source, PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL)); + p_properties->push_back(PropertyInfo(Variant::STRING, SNAME("script/source"), PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL)); } void CSharpScript::_bind_methods() { @@ -2887,9 +2902,3 @@ void ResourceFormatSaverCSharpScript::get_recognized_extensions(const Ref<Resour bool ResourceFormatSaverCSharpScript::recognize(const Ref<Resource> &p_resource) const { return Object::cast_to<CSharpScript>(p_resource.ptr()) != nullptr; } - -CSharpLanguage::StringNameCache::StringNameCache() { - _property_can_revert = StaticCString::create("_property_can_revert"); - _property_get_revert = StaticCString::create("_property_get_revert"); - _script_source = StaticCString::create("script/source"); -} |