godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #96780 from bruvzg/no_type_ed_settings 

[Resource Loader] Do not check property type for non registered properties.
This commit is contained in:
Rémi Verschelde 2024-09-10 10:37:11 +02:00
parent 444683bd09 3009073b39
commit 97ef3c8372
No known key found for this signature in database
GPG Key ID: C3336907360768E1
4 changed files with 64 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
core/io/resource_format_binary.cpp
View File

@ -845,27 +845,29 @@ Error ResourceLoaderBinary::load() {
} }
} }
if (value.get_type() == Variant::ARRAY) { if (ClassDB::has_property(res->get_class_name(), name)) {
Array set_array = value; if (value.get_type() == Variant::ARRAY) {
bool is_get_valid = false; Array set_array = value;
Variant get_value = res->get(name, &is_get_valid); bool is_get_valid = false;
if (is_get_valid && get_value.get_type() == Variant::ARRAY) { Variant get_value = res->get(name, &is_get_valid);
Array get_array = get_value; if (is_get_valid && get_value.get_type() == Variant::ARRAY) {
if (!set_array.is_same_typed(get_array)) { Array get_array = get_value;
value = Array(set_array, get_array.get_typed_builtin(), get_array.get_typed_class_name(), get_array.get_typed_script()); if (!set_array.is_same_typed(get_array)) {
value = Array(set_array, get_array.get_typed_builtin(), get_array.get_typed_class_name(), get_array.get_typed_script());
}
} }
} }
}
if (value.get_type() == Variant::DICTIONARY) { if (value.get_type() == Variant::DICTIONARY) {
Dictionary set_dict = value; Dictionary set_dict = value;
bool is_get_valid = false; bool is_get_valid = false;
Variant get_value = res->get(name, &is_get_valid); Variant get_value = res->get(name, &is_get_valid);
if (is_get_valid && get_value.get_type() == Variant::DICTIONARY) { if (is_get_valid && get_value.get_type() == Variant::DICTIONARY) {
Dictionary get_dict = get_value; Dictionary get_dict = get_value;
if (!set_dict.is_same_typed(get_dict)) { if (!set_dict.is_same_typed(get_dict)) {
value = Dictionary(set_dict, get_dict.get_typed_key_builtin(), get_dict.get_typed_key_class_name(), get_dict.get_typed_key_script(), value = Dictionary(set_dict, get_dict.get_typed_key_builtin(), get_dict.get_typed_key_class_name(), get_dict.get_typed_key_script(),
get_dict.get_typed_value_builtin(), get_dict.get_typed_value_class_name(), get_dict.get_typed_value_script()); get_dict.get_typed_value_builtin(), get_dict.get_typed_value_class_name(), get_dict.get_typed_value_script());
}
} }
} }
} }

3
doc/classes/ProjectSettings.xml
View File

@ -2947,6 +2947,9 @@
<member name="xr/openxr/enabled" type="bool" setter="" getter="" default="false"> <member name="xr/openxr/enabled" type="bool" setter="" getter="" default="false">
If [code]true[/code], Godot will setup and initialize OpenXR on startup. If [code]true[/code], Godot will setup and initialize OpenXR on startup.
</member> </member>
<member name="xr/openxr/enabled.editor" type="bool" setter="" getter="" default="false">
If [code]true[/code], Godot will setup and initialize OpenXR on editor startup.
</member>
<member name="xr/openxr/environment_blend_mode" type="int" setter="" getter="" default="&quot;0&quot;"> <member name="xr/openxr/environment_blend_mode" type="int" setter="" getter="" default="&quot;0&quot;">
Specify how OpenXR should blend in the environment. This is specific to certain AR and passthrough devices where camera images are blended in by the XR compositor. Specify how OpenXR should blend in the environment. This is specific to certain AR and passthrough devices where camera images are blended in by the XR compositor.
</member> </member>

1
main/main.cpp
View File

@ -2541,6 +2541,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
// XR project settings. // XR project settings.
GLOBAL_DEF_RST_BASIC("xr/openxr/enabled", false); GLOBAL_DEF_RST_BASIC("xr/openxr/enabled", false);
GLOBAL_DEF_RST_BASIC("xr/openxr/enabled.editor", false);
GLOBAL_DEF_BASIC(PropertyInfo(Variant::STRING, "xr/openxr/default_action_map", PROPERTY_HINT_FILE, "*.tres"), "res://openxr_action_map.tres"); GLOBAL_DEF_BASIC(PropertyInfo(Variant::STRING, "xr/openxr/default_action_map", PROPERTY_HINT_FILE, "*.tres"), "res://openxr_action_map.tres");
GLOBAL_DEF_BASIC(PropertyInfo(Variant::INT, "xr/openxr/form_factor", PROPERTY_HINT_ENUM, "Head Mounted,Handheld"), "0"); GLOBAL_DEF_BASIC(PropertyInfo(Variant::INT, "xr/openxr/form_factor", PROPERTY_HINT_ENUM, "Head Mounted,Handheld"), "0");
GLOBAL_DEF_BASIC(PropertyInfo(Variant::INT, "xr/openxr/view_configuration", PROPERTY_HINT_ENUM, "Mono,Stereo"), "1"); // "Mono,Stereo,Quad,Observer" GLOBAL_DEF_BASIC(PropertyInfo(Variant::INT, "xr/openxr/view_configuration", PROPERTY_HINT_ENUM, "Mono,Stereo"), "1"); // "Mono,Stereo,Quad,Observer"

76
scene/resources/resource_format_text.cpp
View File

@ -612,27 +612,29 @@ Error ResourceLoaderText::load() {
} }
} }
if (value.get_type() == Variant::ARRAY) { if (ClassDB::has_property(res->get_class_name(), assign)) {
Array set_array = value; if (value.get_type() == Variant::ARRAY) {
bool is_get_valid = false; Array set_array = value;
Variant get_value = res->get(assign, &is_get_valid); bool is_get_valid = false;
if (is_get_valid && get_value.get_type() == Variant::ARRAY) { Variant get_value = res->get(assign, &is_get_valid);
Array get_array = get_value; if (is_get_valid && get_value.get_type() == Variant::ARRAY) {
if (!set_array.is_same_typed(get_array)) { Array get_array = get_value;
value = Array(set_array, get_array.get_typed_builtin(), get_array.get_typed_class_name(), get_array.get_typed_script()); if (!set_array.is_same_typed(get_array)) {
value = Array(set_array, get_array.get_typed_builtin(), get_array.get_typed_class_name(), get_array.get_typed_script());
}
} }
} }
}
if (value.get_type() == Variant::DICTIONARY) { if (value.get_type() == Variant::DICTIONARY) {
Dictionary set_dict = value; Dictionary set_dict = value;
bool is_get_valid = false; bool is_get_valid = false;
Variant get_value = res->get(assign, &is_get_valid); Variant get_value = res->get(assign, &is_get_valid);
if (is_get_valid && get_value.get_type() == Variant::DICTIONARY) { if (is_get_valid && get_value.get_type() == Variant::DICTIONARY) {
Dictionary get_dict = get_value; Dictionary get_dict = get_value;
if (!set_dict.is_same_typed(get_dict)) { if (!set_dict.is_same_typed(get_dict)) {
value = Dictionary(set_dict, get_dict.get_typed_key_builtin(), get_dict.get_typed_key_class_name(), get_dict.get_typed_key_script(), value = Dictionary(set_dict, get_dict.get_typed_key_builtin(), get_dict.get_typed_key_class_name(), get_dict.get_typed_key_script(),
get_dict.get_typed_value_builtin(), get_dict.get_typed_value_class_name(), get_dict.get_typed_value_script()); get_dict.get_typed_value_builtin(), get_dict.get_typed_value_class_name(), get_dict.get_typed_value_script());
}
} }
} }
} }
@ -752,27 +754,29 @@ Error ResourceLoaderText::load() {
} }
} }
if (value.get_type() == Variant::ARRAY) { if (ClassDB::has_property(resource->get_class_name(), assign)) {
Array set_array = value; if (value.get_type() == Variant::ARRAY) {
bool is_get_valid = false; Array set_array = value;
Variant get_value = resource->get(assign, &is_get_valid); bool is_get_valid = false;
if (is_get_valid && get_value.get_type() == Variant::ARRAY) { Variant get_value = resource->get(assign, &is_get_valid);
Array get_array = get_value; if (is_get_valid && get_value.get_type() == Variant::ARRAY) {
if (!set_array.is_same_typed(get_array)) { Array get_array = get_value;
value = Array(set_array, get_array.get_typed_builtin(), get_array.get_typed_class_name(), get_array.get_typed_script()); if (!set_array.is_same_typed(get_array)) {
value = Array(set_array, get_array.get_typed_builtin(), get_array.get_typed_class_name(), get_array.get_typed_script());
}
} }
} }
}
if (value.get_type() == Variant::DICTIONARY) { if (value.get_type() == Variant::DICTIONARY) {
Dictionary set_dict = value; Dictionary set_dict = value;
bool is_get_valid = false; bool is_get_valid = false;
Variant get_value = resource->get(assign, &is_get_valid); Variant get_value = resource->get(assign, &is_get_valid);
if (is_get_valid && get_value.get_type() == Variant::DICTIONARY) { if (is_get_valid && get_value.get_type() == Variant::DICTIONARY) {
Dictionary get_dict = get_value; Dictionary get_dict = get_value;
if (!set_dict.is_same_typed(get_dict)) { if (!set_dict.is_same_typed(get_dict)) {
value = Dictionary(set_dict, get_dict.get_typed_key_builtin(), get_dict.get_typed_key_class_name(), get_dict.get_typed_key_script(), value = Dictionary(set_dict, get_dict.get_typed_key_builtin(), get_dict.get_typed_key_class_name(), get_dict.get_typed_key_script(),
get_dict.get_typed_value_builtin(), get_dict.get_typed_value_class_name(), get_dict.get_typed_value_script()); get_dict.get_typed_value_builtin(), get_dict.get_typed_value_class_name(), get_dict.get_typed_value_script());
}
} }
} }
} }