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

Merge pull request #18814 from PJB3005/18-05-12-imagetexture-load-error 

ImageTexture.load returns an error code.
This commit is contained in:
Rémi Verschelde 2018-05-16 23:23:08 +02:00 committed by GitHub
parent 97b1e8b517 622a754584
commit 2cf36651b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/classes/Image.xml
View File

@ -338,6 +338,7 @@
<argument index="0" name="buffer" type="PoolByteArray">
</argument>
<description>
Loads an image from the binary contents of a JPEG file.
</description>
</method>
<method name="load_png_from_buffer">
@ -346,6 +347,7 @@
<argument index="0" name="buffer" type="PoolByteArray">
</argument>
<description>
Loads an image from the binary contents of a PNG file.
</description>
</method>
<method name="lock">

4
doc/classes/ImageTexture.xml
View File

@ -47,12 +47,12 @@
</description>
</method>
<method name="load">
<return type="void">
<return type="int" enum="Error">
</return>
<argument index="0" name="path" type="String">
</argument>
<description>
Load an [code]ImageTexture[/code].
Load an [code]ImageTexture[/code] from a file path.
</description>
</method>
<method name="set_data">

9
scene/resources/texture.cpp
View File

@ -220,12 +220,15 @@ Image::Format ImageTexture::get_format() const {
return format;
}
void ImageTexture::load(const String &p_path) {
Error ImageTexture::load(const String &p_path) {
Ref<Image> img;
img.instance();
img->load(p_path);
create_from_image(img);
Error err = img->load(p_path);
if (err == OK) {
create_from_image(img);
}
return err;
}
void ImageTexture::set_data(const Ref<Image> &p_image) {

2
scene/resources/texture.h
View File

@ -124,7 +124,7 @@ public:
void set_flags(uint32_t p_flags);
uint32_t get_flags() const;
Image::Format get_format() const;
void load(const String &p_path);
Error load(const String &p_path);
void set_data(const Ref<Image> &p_image);
Ref<Image> get_data() const;