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/gdnative/nativescript | |
| parent | 5beccaf86fc89166d0b7d28cfcf719cad8fb30ee (diff) | |
| download | redot-engine-475e4ea67b7e650fd1df01eab6ea659afbc16ec5.tar.gz | |
Removed interactive loader, added proper thread loading.
Diffstat (limited to 'modules/gdnative/nativescript')
| -rw-r--r-- | modules/gdnative/nativescript/nativescript.cpp | 2 | ||||
| -rw-r--r-- | modules/gdnative/nativescript/nativescript.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/gdnative/nativescript/nativescript.cpp b/modules/gdnative/nativescript/nativescript.cpp index 0ec6ad71d9..d0e196b3e6 100644 --- a/modules/gdnative/nativescript/nativescript.cpp +++ b/modules/gdnative/nativescript/nativescript.cpp @@ -1931,7 +1931,7 @@ void NativeReloadNode::_notification(int p_what) { #endif } -RES ResourceFormatLoaderNativeScript::load(const String &p_path, const String &p_original_path, Error *r_error) { +RES ResourceFormatLoaderNativeScript::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress) { return ResourceFormatLoaderText::singleton->load(p_path, p_original_path, r_error); } diff --git a/modules/gdnative/nativescript/nativescript.h b/modules/gdnative/nativescript/nativescript.h index 04670b952b..90542c96b7 100644 --- a/modules/gdnative/nativescript/nativescript.h +++ b/modules/gdnative/nativescript/nativescript.h @@ -406,7 +406,7 @@ public: class ResourceFormatLoaderNativeScript : 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; |