diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-28 17:21:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-28 17:21:16 +0100 |
| commit | 620030b600b375545ecab5190615e08919e56da4 (patch) | |
| tree | 0ca3e64b0da0edf3d4b1fd14ed558311dd9041e4 /modules/etc | |
| parent | 324e5a60dd068cbbff9c433802f8ecb78cff3364 (diff) | |
| parent | 475e4ea67b7e650fd1df01eab6ea659afbc16ec5 (diff) | |
Merge pull request #36640 from reduz/resource-loader-refactor
Removed ResourceInteractiveLoader, add built-in threaded loading.
Diffstat (limited to 'modules/etc')
| -rw-r--r-- | modules/etc/texture_loader_pkm.cpp | 2 | ||||
| -rw-r--r-- | modules/etc/texture_loader_pkm.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/etc/texture_loader_pkm.cpp b/modules/etc/texture_loader_pkm.cpp index e460c70cec..ad0cc91c96 100644 --- a/modules/etc/texture_loader_pkm.cpp +++ b/modules/etc/texture_loader_pkm.cpp @@ -42,7 +42,7 @@ struct ETC1Header { uint16_t origHeight; }; -RES ResourceFormatPKM::load(const String &p_path, const String &p_original_path, Error *r_error) { +RES ResourceFormatPKM::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/etc/texture_loader_pkm.h b/modules/etc/texture_loader_pkm.h index 3d52a9ea95..d6011993e3 100644 --- a/modules/etc/texture_loader_pkm.h +++ b/modules/etc/texture_loader_pkm.h @@ -36,7 +36,7 @@ class ResourceFormatPKM : 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; |