diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2018-11-23 00:25:17 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-23 00:25:17 +0100 |
commit | 81cb545b10a7aa56af801cb4a1550540a2aa7881 (patch) | |
tree | 91cbb2df215c90072dd2132982e2eaeec3f3ca9a /core/io/image_loader.h | |
parent | f673bd017d717bae97f01bffc09ac2debb4fb39a (diff) | |
parent | a01608c389eb0fefdffd85ab8075cd95dbf901be (diff) |
Merge pull request #21716 from bit-shift-io/imageloader-fix
Improved support for custom image loaders
Diffstat (limited to 'core/io/image_loader.h')
-rw-r--r-- | core/io/image_loader.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/core/io/image_loader.h b/core/io/image_loader.h index d95a483c0d..7a58d46f93 100644 --- a/core/io/image_loader.h +++ b/core/io/image_loader.h @@ -70,20 +70,21 @@ public: class ImageLoader { - enum { - MAX_LOADERS = 32 - }; + static Vector<ImageFormatLoader *> loader; friend class ResourceFormatLoaderImage; - static ImageFormatLoader *loader[MAX_LOADERS]; - static int loader_count; protected: public: static Error load_image(String p_file, Ref<Image> p_image, FileAccess *p_custom = NULL, bool p_force_linear = false, float p_scale = 1.0); static void get_recognized_extensions(List<String> *p_extensions); - static bool recognize(const String &p_extension); + static ImageFormatLoader *recognize(const String &p_extension); static void add_image_format_loader(ImageFormatLoader *p_loader); + static void remove_image_format_loader(ImageFormatLoader *p_loader); + + static const Vector<ImageFormatLoader *> &get_image_format_loaders(); + + static void cleanup(); }; class ResourceFormatLoaderImage : public ResourceFormatLoader { |