godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Enhance bindings of deep resource duplication

Browse Source
This commit is contained in:
Pedro J. Estébanez
2025-06-20 17:55:15 +02:00
parent 52ecb5ab9e
commit 7dc37bdc9c
6 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/io/resource.cpp
View File

@@ -535,6 +535,10 @@ Ref<Resource> Resource::duplicate_deep(ResourceDeepDuplicateMode p_deep_subresou
return dupe; return dupe;
} }
Ref<Resource> Resource::_duplicate_deep_bind(DeepDuplicateMode p_deep_subresources_mode) const {
return _duplicate_from_variant(true, (ResourceDeepDuplicateMode)p_deep_subresources_mode, 0);
}
Ref<Resource> Resource::_duplicate_from_variant(bool p_deep, ResourceDeepDuplicateMode p_deep_subresources_mode, int p_recursion_count) const { Ref<Resource> Resource::_duplicate_from_variant(bool p_deep, ResourceDeepDuplicateMode p_deep_subresources_mode, int p_recursion_count) const {
// A call without deep duplication would have been early-rejected at Variant::duplicate() unless it's the root call. // A call without deep duplication would have been early-rejected at Variant::duplicate() unless it's the root call.
DEV_ASSERT(!(p_recursion_count > 0 && p_deep_subresources_mode == RESOURCE_DEEP_DUPLICATE_NONE)); DEV_ASSERT(!(p_recursion_count > 0 && p_deep_subresources_mode == RESOURCE_DEEP_DUPLICATE_NONE));
@@ -724,12 +728,13 @@ void Resource::_bind_methods() {
ClassDB::bind_method(D_METHOD("emit_changed"), &Resource::emit_changed); ClassDB::bind_method(D_METHOD("emit_changed"), &Resource::emit_changed);
ClassDB::bind_method(D_METHOD("duplicate", "deep"), &Resource::duplicate, DEFVAL(false)); ClassDB::bind_method(D_METHOD("duplicate", "deep"), &Resource::duplicate, DEFVAL(false));
ClassDB::bind_method(D_METHOD("duplicate_deep", "deep_subresources_mode"), &Resource::duplicate_deep, DEFVAL(RESOURCE_DEEP_DUPLICATE_INTERNAL)); ClassDB::bind_method(D_METHOD("duplicate_deep", "deep_subresources_mode"), &Resource::_duplicate_deep_bind, DEFVAL(RESOURCE_DEEP_DUPLICATE_INTERNAL));
// For the bindings, it's much more natural to expose this enum from the Variant realm via Resource. // For the bindings, it's much more natural to expose this enum from the Variant realm via Resource.
ClassDB::bind_integer_constant(get_class_static(), StringName("ResourceDeepDuplicateMode"), "RESOURCE_DEEP_DUPLICATE_NONE", RESOURCE_DEEP_DUPLICATE_NONE); // Therefore, we can't use BIND_ENUM_CONSTANT here because we need some customization.
ClassDB::bind_integer_constant(get_class_static(), StringName("ResourceDeepDuplicateMode"), "RESOURCE_DEEP_DUPLICATE_INTERNAL", RESOURCE_DEEP_DUPLICATE_INTERNAL); ClassDB::bind_integer_constant(get_class_static(), StringName("DeepDuplicateMode"), "DEEP_DUPLICATE_NONE", RESOURCE_DEEP_DUPLICATE_NONE);
ClassDB::bind_integer_constant(get_class_static(), StringName("ResourceDeepDuplicateMode"), "RESOURCE_DEEP_DUPLICATE_ALL", RESOURCE_DEEP_DUPLICATE_ALL); ClassDB::bind_integer_constant(get_class_static(), StringName("DeepDuplicateMode"), "DEEP_DUPLICATE_INTERNAL", RESOURCE_DEEP_DUPLICATE_INTERNAL);
ClassDB::bind_integer_constant(get_class_static(), StringName("DeepDuplicateMode"), "DEEP_DUPLICATE_ALL", RESOURCE_DEEP_DUPLICATE_ALL);
ADD_SIGNAL(MethodInfo("changed")); ADD_SIGNAL(MethodInfo("changed"));
ADD_SIGNAL(MethodInfo("setup_local_to_scene_requested")); ADD_SIGNAL(MethodInfo("setup_local_to_scene_requested"));

7
core/io/resource.h
View File

@@ -96,6 +96,11 @@ private:
Variant _duplicate_recursive(const Variant &p_variant, const DuplicateParams &p_params, uint32_t p_usage = 0) const; Variant _duplicate_recursive(const Variant &p_variant, const DuplicateParams &p_params, uint32_t p_usage = 0) const;
void _find_sub_resources(const Variant &p_variant, HashSet<Ref<Resource>> &p_resources_found); void _find_sub_resources(const Variant &p_variant, HashSet<Ref<Resource>> &p_resources_found);
// Only for binding the deep duplicate method, so it doesn't need actual members.
enum DeepDuplicateMode : int;
_ALWAYS_INLINE_ Ref<Resource> _duplicate_deep_bind(DeepDuplicateMode p_deep_subresources_mode) const;
protected: protected:
virtual void _resource_path_changed(); virtual void _resource_path_changed();
static void _bind_methods(); static void _bind_methods();
@@ -183,7 +188,7 @@ public:
~Resource(); ~Resource();
}; };
VARIANT_ENUM_CAST(ResourceDeepDuplicateMode); VARIANT_ENUM_CAST(Resource::DeepDuplicateMode);
class ResourceCache { class ResourceCache {
friend class Resource; friend class Resource;

2
core/variant/variant_call.cpp
View File

@@ -2206,6 +2206,8 @@ static void _register_variant_builtin_methods_math() {
bind_static_method(Color, from_rgba8, sarray("r8", "g8", "b8", "a8"), varray(255)); bind_static_method(Color, from_rgba8, sarray("r8", "g8", "b8", "a8"), varray(255));
} }
VARIANT_ENUM_CAST(ResourceDeepDuplicateMode);
static void _register_variant_builtin_methods_misc() { static void _register_variant_builtin_methods_misc() {
/* RID */ /* RID */

2
doc/classes/Array.xml
View File

@@ -341,7 +341,7 @@
<param index="0" name="deep_subresources_mode" type="int" default="1" /> <param index="0" name="deep_subresources_mode" type="int" default="1" />
<description> <description>
Duplicates this array, deeply, like [method duplicate][code](true)[/code], with extra control over how subresources are handled. Duplicates this array, deeply, like [method duplicate][code](true)[/code], with extra control over how subresources are handled.
[param deep_subresources_mode] must be one of the values from [enum Resource.ResourceDeepDuplicateMode]. By default, only internal resources will be duplicated (recursively). [param deep_subresources_mode] must be one of the values from [enum Resource.DeepDuplicateMode]. By default, only internal resources will be duplicated (recursively).
</description> </description>
</method> </method>
<method name="erase"> <method name="erase">

2
doc/classes/Dictionary.xml
View File

@@ -197,7 +197,7 @@
<param index="0" name="deep_subresources_mode" type="int" default="1" /> <param index="0" name="deep_subresources_mode" type="int" default="1" />
<description> <description>
Duplicates this dictionary, deeply, like [method duplicate][code](true)[/code], with extra control over how subresources are handled. Duplicates this dictionary, deeply, like [method duplicate][code](true)[/code], with extra control over how subresources are handled.
[param deep_subresources_mode] must be one of the values from [enum Resource.ResourceDeepDuplicateMode]. By default, only internal resources will be duplicated (recursively). [param deep_subresources_mode] must be one of the values from [enum Resource.DeepDuplicateMode]. By default, only internal resources will be duplicated (recursively).
</description> </description>
</method> </method>
<method name="erase"> <method name="erase">

12
doc/classes/Resource.xml
View File

@@ -54,7 +54,7 @@
<description> <description>
Duplicates this resource, returning a new resource with its [code]export[/code]ed or [constant PROPERTY_USAGE_STORAGE] properties copied from the original. Duplicates this resource, returning a new resource with its [code]export[/code]ed or [constant PROPERTY_USAGE_STORAGE] properties copied from the original.
If [param deep] is [code]false[/code], a [b]shallow[/b] copy is returned: nested [Array], [Dictionary], and [Resource] properties are not duplicated and are shared with the original resource. If [param deep] is [code]false[/code], a [b]shallow[/b] copy is returned: nested [Array], [Dictionary], and [Resource] properties are not duplicated and are shared with the original resource.
If [param deep] is [code]true[/code], a [b]deep[/b] copy is returned: all nested arrays, dictionaries, and packed arrays are also duplicated (recursively). Any [Resource] found inside will only be duplicated if it's local, like [constant RESOURCE_DEEP_DUPLICATE_INTERNAL] used with [method duplicate_deep]. If [param deep] is [code]true[/code], a [b]deep[/b] copy is returned: all nested arrays, dictionaries, and packed arrays are also duplicated (recursively). Any [Resource] found inside will only be duplicated if it's local, like [constant DEEP_DUPLICATE_INTERNAL] used with [method duplicate_deep].
The following exceptions apply: The following exceptions apply:
- Subresource properties with the [constant PROPERTY_USAGE_ALWAYS_DUPLICATE] flag are always duplicated (recursively or not, depending on [param deep]). - Subresource properties with the [constant PROPERTY_USAGE_ALWAYS_DUPLICATE] flag are always duplicated (recursively or not, depending on [param deep]).
- Subresource properties with the [constant PROPERTY_USAGE_NEVER_DUPLICATE] flag are never duplicated. - Subresource properties with the [constant PROPERTY_USAGE_NEVER_DUPLICATE] flag are never duplicated.
@@ -64,10 +64,10 @@
</method> </method>
<method name="duplicate_deep" qualifiers="const"> <method name="duplicate_deep" qualifiers="const">
<return type="Resource" /> <return type="Resource" />
<param index="0" name="deep_subresources_mode" type="int" enum="ResourceDeepDuplicateMode" default="1" /> <param index="0" name="deep_subresources_mode" type="int" enum="Resource.DeepDuplicateMode" default="1" />
<description> <description>
Duplicates this resource, deeply, like [method duplicate][code](true)[/code], with extra control over how subresources are handled. Duplicates this resource, deeply, like [method duplicate][code](true)[/code], with extra control over how subresources are handled.
[param deep_subresources_mode] must be one of the values from [enum ResourceDeepDuplicateMode]. [param deep_subresources_mode] must be one of the values from [enum DeepDuplicateMode].
</description> </description>
</method> </method>
<method name="emit_changed"> <method name="emit_changed">
@@ -186,13 +186,13 @@
</signal> </signal>
</signals> </signals>
<constants> <constants>
<constant name="RESOURCE_DEEP_DUPLICATE_NONE" value="0" enum="ResourceDeepDuplicateMode"> <constant name="DEEP_DUPLICATE_NONE" value="0" enum="DeepDuplicateMode">
No subresorces at all are duplicated. This is useful even in a deep duplication to have all the arrays and dictionaries duplicated but still pointing to the original resources. No subresorces at all are duplicated. This is useful even in a deep duplication to have all the arrays and dictionaries duplicated but still pointing to the original resources.
</constant> </constant>
<constant name="RESOURCE_DEEP_DUPLICATE_INTERNAL" value="1" enum="ResourceDeepDuplicateMode"> <constant name="DEEP_DUPLICATE_INTERNAL" value="1" enum="DeepDuplicateMode">
Only subresources without a path or with a scene-local path will be duplicated. Only subresources without a path or with a scene-local path will be duplicated.
</constant> </constant>
<constant name="RESOURCE_DEEP_DUPLICATE_ALL" value="2" enum="ResourceDeepDuplicateMode"> <constant name="DEEP_DUPLICATE_ALL" value="2" enum="DeepDuplicateMode">
Every subresource found will be duplicated, even if it has a non-local path. In other words, even potentially big resources stored separately will be duplicated. Every subresource found will be duplicated, even if it has a non-local path. In other words, even potentially big resources stored separately will be duplicated.
</constant> </constant>
</constants> </constants>