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

Merge pull request #74668 from RedworkDE/image-texture-layered-set-images

Browse Source 
Add dedicated setter for `ImageTextureLayered::_images` to fix `create_from_images` being hidden from the C# bindings
This commit is contained in:
Rémi Verschelde 2023-03-10 14:04:17 +01:00
commit d3e448d1ae
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scene/resources/texture.cpp
View File

@ -2935,6 +2935,10 @@ TypedArray<Image> ImageTextureLayered::_get_images() const {
return images; return images;
} }
void ImageTextureLayered::_set_images(const TypedArray<Image> &p_images) {
ERR_FAIL_COND(_create_from_images(p_images) != OK);
}
Error ImageTextureLayered::create_from_images(Vector<Ref<Image>> p_images) { Error ImageTextureLayered::create_from_images(Vector<Ref<Image>> p_images) {
int new_layers = p_images.size(); int new_layers = p_images.size();
ERR_FAIL_COND_V(new_layers == 0, ERR_INVALID_PARAMETER); ERR_FAIL_COND_V(new_layers == 0, ERR_INVALID_PARAMETER);
@ -3014,8 +3018,9 @@ void ImageTextureLayered::_bind_methods() {
ClassDB::bind_method(D_METHOD("update_layer", "image", "layer"), &ImageTextureLayered::update_layer); ClassDB::bind_method(D_METHOD("update_layer", "image", "layer"), &ImageTextureLayered::update_layer);
ClassDB::bind_method(D_METHOD("_get_images"), &ImageTextureLayered::_get_images); ClassDB::bind_method(D_METHOD("_get_images"), &ImageTextureLayered::_get_images);
ClassDB::bind_method(D_METHOD("_set_images", "images"), &ImageTextureLayered::_set_images);
ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "_images", PROPERTY_HINT_ARRAY_TYPE, "Image", PROPERTY_USAGE_INTERNAL), "create_from_images", "_get_images"); ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "_images", PROPERTY_HINT_ARRAY_TYPE, "Image", PROPERTY_USAGE_INTERNAL), "_set_images", "_get_images");
} }
ImageTextureLayered::ImageTextureLayered(LayeredType p_layered_type) { ImageTextureLayered::ImageTextureLayered(LayeredType p_layered_type) {

1
scene/resources/texture.h
View File

@ -427,6 +427,7 @@ class ImageTextureLayered : public TextureLayered {
Error _create_from_images(const TypedArray<Image> &p_images); Error _create_from_images(const TypedArray<Image> &p_images);
TypedArray<Image> _get_images() const; TypedArray<Image> _get_images() const;
void _set_images(const TypedArray<Image> &p_images);
protected: protected:
static void _bind_methods(); static void _bind_methods();