diff options
| author | Juan Linietsky <juan@godotengine.org> | 2020-02-28 08:27:04 -0300 |
|---|---|---|
| committer | Juan Linietsky <juan@godotengine.org> | 2020-02-28 11:20:45 -0300 |
| commit | 475e4ea67b7e650fd1df01eab6ea659afbc16ec5 (patch) | |
| tree | 9e9603a3bd51a5d31a767334fa413b030a3ed402 /modules/dds | |
| parent | 5beccaf86fc89166d0b7d28cfcf719cad8fb30ee (diff) | |
Removed interactive loader, added proper thread loading.
Diffstat (limited to 'modules/dds')
| -rw-r--r-- | modules/dds/texture_loader_dds.cpp | 2 | ||||
| -rw-r--r-- | modules/dds/texture_loader_dds.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/dds/texture_loader_dds.cpp b/modules/dds/texture_loader_dds.cpp index a04989449c..ae21156b8b 100644 --- a/modules/dds/texture_loader_dds.cpp +++ b/modules/dds/texture_loader_dds.cpp @@ -94,7 +94,7 @@ static const DDSFormatInfo dds_format_info[DDS_MAX] = { { "GRAYSCALE_ALPHA", false, false, 1, 2, Image::FORMAT_LA8 } }; -RES ResourceFormatDDS::load(const String &p_path, const String &p_original_path, Error *r_error) { +RES ResourceFormatDDS::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress) { if (r_error) *r_error = ERR_CANT_OPEN; diff --git a/modules/dds/texture_loader_dds.h b/modules/dds/texture_loader_dds.h index 34f4e9b548..de8088af90 100644 --- a/modules/dds/texture_loader_dds.h +++ b/modules/dds/texture_loader_dds.h @@ -36,7 +36,7 @@ class ResourceFormatDDS : public ResourceFormatLoader { public: - virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL); + virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL, bool p_use_sub_threads = false, float *r_progress = nullptr); virtual void get_recognized_extensions(List<String> *p_extensions) const; virtual bool handles_type(const String &p_type) const; virtual String get_resource_type(const String &p_path) const; |