From 453eac7f1f5ef70390ec51087fc1f190811a7507 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Wed, 17 Nov 2021 09:47:45 +0100 Subject: Replace sfml with mgl --- include/AsyncImageLoader.hpp | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'include/AsyncImageLoader.hpp') diff --git a/include/AsyncImageLoader.hpp b/include/AsyncImageLoader.hpp index 7556fbc..856e9cc 100644 --- a/include/AsyncImageLoader.hpp +++ b/include/AsyncImageLoader.hpp @@ -4,9 +4,10 @@ #include "../include/MessageQueue.hpp" #include "../include/FileAnalyzer.hpp" #include "../include/AsyncTask.hpp" -#include -#include -#include +#include +#include +#include +#include #include #include #include @@ -22,8 +23,8 @@ namespace QuickMedia { struct ThumbnailData { LoadingState loading_state = LoadingState::NOT_LOADED; - sf::Texture texture; - std::unique_ptr image; // Set in another thread. This should be .reset after loading it into |texture|, to save memory + mgl::Texture texture; + std::unique_ptr image; // Set in another thread. This should be .reset after loading it into |texture|, to save memory size_t counter = 0; Path thumbnail_path; }; @@ -33,12 +34,12 @@ namespace QuickMedia { Path thumbnail_path; bool local; std::shared_ptr thumbnail_data; - sf::Vector2i resize_target_size; + mgl::vec2i resize_target_size; }; // If |symlink_if_no_resize| is false then a copy is made from |thumbnail_path| to |thumbnail_path_resized| instead of a symlink if |thumbnail_path| is not larger than |resize_target_size|. // One example of why you might not want a symlink is if |thumbnail_path| is a temporary file. - bool create_thumbnail(const Path &thumbnail_path, const Path &thumbnail_path_resized, sf::Vector2i resize_target_size, ContentType content_type, bool symlink_if_no_resize); + bool create_thumbnail(const Path &thumbnail_path, const Path &thumbnail_path_resized, mgl::vec2i resize_target_size, ContentType content_type, bool symlink_if_no_resize); constexpr int NUM_IMAGE_LOAD_PARALLEL = 4; @@ -50,7 +51,7 @@ namespace QuickMedia { // This function should be called every frame for the objects that need to display this thumbnail, otherwise it can be unloaded. // set |resize_target_size| to {0, 0} to disable resizing. // Note: this method is not thread-safe - std::shared_ptr get_thumbnail(const std::string &url, bool local, sf::Vector2i resize_target_size); + std::shared_ptr get_thumbnail(const std::string &url, bool local, mgl::vec2i resize_target_size); // Note: this should only be called once every frame. // Note: this method is not thread-safe @@ -61,7 +62,7 @@ namespace QuickMedia { int64_t download_start = 0; Path thumbnail_path; std::shared_ptr thumbnail_data; - sf::Vector2i resize_target_size; + mgl::vec2i resize_target_size; std::string url; }; @@ -72,12 +73,12 @@ namespace QuickMedia { // set |resize_target_size| to {0, 0} to disable resizing. // Note: this method is not thread-safe - bool load_thumbnail(const std::string &url, bool local, sf::Vector2i resize_target_size, std::shared_ptr thumbnail_data, Path &thumbnail_path); + bool load_thumbnail(const std::string &url, bool local, mgl::vec2i resize_target_size, std::shared_ptr thumbnail_data, Path &thumbnail_path); // Returns -1 if all threads are busy int get_free_load_index() const; - void load_create_thumbnail(const Path &thumbnail_path, const Path &thumbnail_path_resized, ThumbnailData *thumbnail_data, sf::Vector2i resize_target_size); + void load_create_thumbnail(const Path &thumbnail_path, const Path &thumbnail_path_resized, ThumbnailData *thumbnail_data, mgl::vec2i resize_target_size); void process_thumbnail(ThumbnailLoadData &thumbnail_load_data); private: void reset_download(Download &download); -- cgit v1.2.3