mirror of
https://github.com/godotengine/godot.git
synced 2025-10-19 16:03:29 +00:00
Added Image's load_svg_from_(buffer|string)
No core dependency to the svg module.
This commit is contained in:
parent
f9fc77bbe4
commit
26eb3db234
15 changed files with 96 additions and 44 deletions
|
@ -43,11 +43,6 @@
|
|||
#include "editor/project_settings_editor.h"
|
||||
#include "scene/gui/menu_button.h"
|
||||
|
||||
#include "modules/modules_enabled.gen.h" // For svg.
|
||||
#ifdef MODULE_SVG_ENABLED
|
||||
#include "modules/svg/image_loader_svg.h"
|
||||
#endif
|
||||
|
||||
static inline void setup_http_request(HTTPRequest *request) {
|
||||
request->set_use_threads(EDITOR_DEF("asset_library/use_threads", true));
|
||||
|
||||
|
@ -775,18 +770,9 @@ void EditorAssetLibrary::_image_update(bool use_cache, bool final, const PackedB
|
|||
image->copy_internals_from(Image::_webp_mem_loader_func(r, len));
|
||||
} else if ((memcmp(&r[0], &bmp_signature[0], 2) == 0) && Image::_bmp_mem_loader_func) {
|
||||
image->copy_internals_from(Image::_bmp_mem_loader_func(r, len));
|
||||
} else if (Image::_svg_scalable_mem_loader_func) {
|
||||
image->copy_internals_from(Image::_svg_scalable_mem_loader_func(r, len, 1.0));
|
||||
}
|
||||
#ifdef MODULE_SVG_ENABLED
|
||||
else {
|
||||
ImageLoaderSVG svg_loader;
|
||||
Ref<Image> img = Ref<Image>(memnew(Image));
|
||||
Error err = svg_loader.create_image_from_utf8_buffer(img, image_data, 1.0, false);
|
||||
|
||||
if (err == OK) {
|
||||
image->copy_internals_from(img);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
if (!image->is_empty()) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue