diff --git a/src/MaaCore/Assistant.cpp b/src/MaaCore/Assistant.cpp index 024cec3ff1..f4da7c3023 100644 --- a/src/MaaCore/Assistant.cpp +++ b/src/MaaCore/Assistant.cpp @@ -1,6 +1,6 @@ #include "Assistant.h" -#include "Utils/NoWarningCV.h" +#include "MaaUtils/NoWarningCV.hpp" #include #include diff --git a/src/MaaCore/Common/AsstBattleDef.h b/src/MaaCore/Common/AsstBattleDef.h index 64d46c5357..f898bc069a 100644 --- a/src/MaaCore/Common/AsstBattleDef.h +++ b/src/MaaCore/Common/AsstBattleDef.h @@ -6,7 +6,7 @@ #include #include "AsstTypes.h" -#include "Utils/NoWarningCVMat.h" +#include "MaaUtils/NoWarningCVMat.hpp" namespace asst::battle { diff --git a/src/MaaCore/Common/AsstConf.h b/src/MaaCore/Common/AsstConf.h deleted file mode 100644 index 52f656fa8d..0000000000 --- a/src/MaaCore/Common/AsstConf.h +++ /dev/null @@ -1,40 +0,0 @@ -#pragma once - -#if !defined(ASST_USE_RANGES_STL) && !defined(ASST_USE_RANGES_RANGE_V3) && !defined(ASST_USE_RANGES_BOOST) -#define ASST_USE_RANGES_STL -#endif - -#if !defined(ASST_WITH_EMULATOR_EXTRAS) -#define ASST_WITH_EMULATOR_EXTRAS 1 -#endif - -#ifdef _MSC_VER -#define ASST_DO_PRAGMA(x) __pragma(x) -#elif defined(__GNUC__) -#define ASST_DO_PRAGMA(x) _Pragma(#x) -#else -#define ASST_DO_PRAGMA(x) -#endif - -#ifdef _MSC_VER -#define ASST_SUPPRESS_CV_WARNINGS_START \ - ASST_DO_PRAGMA(warning(push)) \ - ASST_DO_PRAGMA(warning(disable: 5054 4251 4305 4275 4100 4244)) -#define ASST_SUPPRESS_CV_WARNINGS_END ASST_DO_PRAGMA(warning(pop)) -#elif defined(__clang__) -#define ASST_SUPPRESS_CV_WARNINGS_START \ - ASST_DO_PRAGMA(clang diagnostic push) \ - ASST_DO_PRAGMA(clang diagnostic ignored "-Wdeprecated-enum-enum-conversion") \ - ASST_DO_PRAGMA(clang diagnostic ignored "-Wdeprecated-anon-enum-enum-conversion") \ - ASST_DO_PRAGMA(clang diagnostic ignored "-Wc11-extensions") \ - ASST_DO_PRAGMA(clang diagnostic ignored "-Wunused-but-set-variable") -#define ASST_SUPPRESS_CV_WARNINGS_END ASST_DO_PRAGMA(clang diagnostic pop) -#elif defined(__GNUC__) -#define ASST_SUPPRESS_CV_WARNINGS_START \ - ASST_DO_PRAGMA(GCC diagnostic push) \ - ASST_DO_PRAGMA(GCC diagnostic ignored "-Wdeprecated-enum-enum-conversion") -#define ASST_SUPPRESS_CV_WARNINGS_END ASST_DO_PRAGMA(GCC diagnostic pop) -#else -#define ASST_SUPPRESS_CV_WARNINGS_START -#define ASST_SUPPRESS_CV_WARNINGS_END -#endif diff --git a/src/MaaCore/Common/AsstInfrastDef.h b/src/MaaCore/Common/AsstInfrastDef.h index 9ae4afcb5a..35d01af0f3 100644 --- a/src/MaaCore/Common/AsstInfrastDef.h +++ b/src/MaaCore/Common/AsstInfrastDef.h @@ -1,7 +1,7 @@ #pragma once #include "AsstTypes.h" -#include "Utils/NoWarningCVMat.h" +#include "MaaUtils/NoWarningCVMat.hpp" namespace asst::infrast { diff --git a/src/MaaCore/Config/AbstractResource.h b/src/MaaCore/Config/AbstractResource.h index 16c1425e9e..ccdd875229 100644 --- a/src/MaaCore/Config/AbstractResource.h +++ b/src/MaaCore/Config/AbstractResource.h @@ -3,7 +3,7 @@ #include #include -#include "Utils/SingletonHolder.hpp" +#include "MaaUtils/SingletonHolder.hpp" namespace asst { diff --git a/src/MaaCore/Config/GeneralConfig.h b/src/MaaCore/Config/GeneralConfig.h index 718a555985..34253435bf 100644 --- a/src/MaaCore/Config/GeneralConfig.h +++ b/src/MaaCore/Config/GeneralConfig.h @@ -90,7 +90,7 @@ struct AdbCfg json::object extras; }; -class GeneralConfig final : public SingletonHolder, public AbstractConfig +class GeneralConfig final : public MAA_NS::SingletonHolder, public AbstractConfig { public: virtual ~GeneralConfig() override = default; diff --git a/src/MaaCore/Config/Miscellaneous/AvatarCacheManager.cpp b/src/MaaCore/Config/Miscellaneous/AvatarCacheManager.cpp index fd6e3ae05d..27ec1164de 100644 --- a/src/MaaCore/Config/Miscellaneous/AvatarCacheManager.cpp +++ b/src/MaaCore/Config/Miscellaneous/AvatarCacheManager.cpp @@ -2,7 +2,7 @@ #include "../TaskData.h" #include "BattleDataConfig.h" -#include "Utils/ImageIo.hpp" +#include "MaaUtils/ImageIo.h" #include "Utils/Logger.hpp" bool asst::AvatarCacheManager::load(const std::filesystem::path& path) @@ -76,7 +76,7 @@ void asst::AvatarCacheManager::set_avatar( auto path = m_save_path / utils::path(name + CacheExtension); Log.info(path.lexically_relative(UserDir.get())); - asst::imwrite(path, avatar); + MAA_NS::imwrite(path, avatar); } void asst::AvatarCacheManager::_load(LoadItem waiting_to_load) @@ -98,7 +98,7 @@ void asst::AvatarCacheManager::_load(LoadItem waiting_to_load) Log.trace(__FUNCTION__, name, filepath.lexically_relative(UserDir.get())); #endif - auto avatar = asst::imread(filepath); + auto avatar = MAA_NS::imread(filepath); if (avatar.empty()) { Log.error("load failed", filepath.lexically_relative(UserDir.get())); diff --git a/src/MaaCore/Config/Miscellaneous/AvatarCacheManager.h b/src/MaaCore/Config/Miscellaneous/AvatarCacheManager.h index 72f0c9b053..b4d8386250 100644 --- a/src/MaaCore/Config/Miscellaneous/AvatarCacheManager.h +++ b/src/MaaCore/Config/Miscellaneous/AvatarCacheManager.h @@ -6,14 +6,14 @@ #include #include -#include "Utils/NoWarningCVMat.h" +#include "MaaUtils/NoWarningCVMat.hpp" #include "Common/AsstBattleDef.h" #include "Common/AsstTypes.h" namespace asst { -class AvatarCacheManager final : public SingletonHolder, public AbstractResource +class AvatarCacheManager final : public MAA_NS::SingletonHolder, public AbstractResource { public: using AvatarsMap = std::unordered_map; diff --git a/src/MaaCore/Config/Miscellaneous/BattleDataConfig.h b/src/MaaCore/Config/Miscellaneous/BattleDataConfig.h index 812841203c..5995b88fc0 100644 --- a/src/MaaCore/Config/Miscellaneous/BattleDataConfig.h +++ b/src/MaaCore/Config/Miscellaneous/BattleDataConfig.h @@ -8,7 +8,7 @@ namespace asst { -class BattleDataConfig final : public SingletonHolder, public AbstractConfig +class BattleDataConfig final : public MAA_NS::SingletonHolder, public AbstractConfig { public: virtual ~BattleDataConfig() override = default; diff --git a/src/MaaCore/Config/Miscellaneous/CopilotConfig.h b/src/MaaCore/Config/Miscellaneous/CopilotConfig.h index d308bf1932..959cfac958 100644 --- a/src/MaaCore/Config/Miscellaneous/CopilotConfig.h +++ b/src/MaaCore/Config/Miscellaneous/CopilotConfig.h @@ -4,7 +4,7 @@ namespace asst { -class CopilotConfig : public SingletonHolder, public AbstractConfig +class CopilotConfig : public MAA_NS::SingletonHolder, public AbstractConfig { public: static battle::copilot::BasicInfo parse_basic_info(const json::value& json); diff --git a/src/MaaCore/Config/Miscellaneous/InfrastConfig.h b/src/MaaCore/Config/Miscellaneous/InfrastConfig.h index 84504296c5..cb96ff2216 100644 --- a/src/MaaCore/Config/Miscellaneous/InfrastConfig.h +++ b/src/MaaCore/Config/Miscellaneous/InfrastConfig.h @@ -8,7 +8,7 @@ namespace asst { -class InfrastConfig final : public SingletonHolder, public AbstractConfigWithTempl +class InfrastConfig final : public MAA_NS::SingletonHolder, public AbstractConfigWithTempl { public: virtual ~InfrastConfig() override = default; diff --git a/src/MaaCore/Config/Miscellaneous/ItemConfig.h b/src/MaaCore/Config/Miscellaneous/ItemConfig.h index ed5863462a..2059e52345 100644 --- a/src/MaaCore/Config/Miscellaneous/ItemConfig.h +++ b/src/MaaCore/Config/Miscellaneous/ItemConfig.h @@ -8,7 +8,7 @@ namespace asst { -class ItemConfig final : public SingletonHolder, public AbstractConfigWithTempl +class ItemConfig final : public MAA_NS::SingletonHolder, public AbstractConfigWithTempl { public: virtual ~ItemConfig() override = default; diff --git a/src/MaaCore/Config/Miscellaneous/OcrConfig.h b/src/MaaCore/Config/Miscellaneous/OcrConfig.h index cfbed795e4..593ece367b 100644 --- a/src/MaaCore/Config/Miscellaneous/OcrConfig.h +++ b/src/MaaCore/Config/Miscellaneous/OcrConfig.h @@ -13,7 +13,7 @@ namespace asst { -class OcrConfig final : public SingletonHolder, public AbstractConfig +class OcrConfig final : public MAA_NS::SingletonHolder, public AbstractConfig { public: virtual ~OcrConfig() override = default; diff --git a/src/MaaCore/Config/Miscellaneous/OcrPack.cpp b/src/MaaCore/Config/Miscellaneous/OcrPack.cpp index 00f6a67711..d245b25354 100644 --- a/src/MaaCore/Config/Miscellaneous/OcrPack.cpp +++ b/src/MaaCore/Config/Miscellaneous/OcrPack.cpp @@ -2,15 +2,14 @@ #include -#include "Utils/NoWarningCV.h" -ASST_SUPPRESS_CV_WARNINGS_START +#include "MaaUtils/NoWarningCV.hpp" +MAA_SUPPRESS_CV_WARNINGS_BEGIN #include "fastdeploy/vision/ocr/ppocr/dbdetector.h" #include "fastdeploy/vision/ocr/ppocr/ppocr_v3.h" #include "fastdeploy/vision/ocr/ppocr/recognizer.h" -ASST_SUPPRESS_CV_WARNINGS_END +MAA_SUPPRESS_CV_WARNINGS_END #include "Utils/Demangle.hpp" -#include "Utils/File.hpp" #include "Utils/Logger.hpp" #include "Utils/Platform.hpp" #include "Utils/StringMisc.hpp" diff --git a/src/MaaCore/Config/Miscellaneous/OcrPack.h b/src/MaaCore/Config/Miscellaneous/OcrPack.h index 96363c53e2..22cf44abf0 100644 --- a/src/MaaCore/Config/Miscellaneous/OcrPack.h +++ b/src/MaaCore/Config/Miscellaneous/OcrPack.h @@ -62,13 +62,13 @@ protected: std::optional m_gpu_id = std::nullopt; }; -class WordOcr final : public SingletonHolder, public OcrPack +class WordOcr final : public MAA_NS::SingletonHolder, public OcrPack { - friend class SingletonHolder; + friend class MAA_NS::SingletonHolder; }; -class CharOcr final : public SingletonHolder, public OcrPack +class CharOcr final : public MAA_NS::SingletonHolder, public OcrPack { - friend class SingletonHolder; + friend class MAA_NS::SingletonHolder; }; } diff --git a/src/MaaCore/Config/Miscellaneous/RecruitConfig.h b/src/MaaCore/Config/Miscellaneous/RecruitConfig.h index 4f253d9d62..fd231f6a4b 100644 --- a/src/MaaCore/Config/Miscellaneous/RecruitConfig.h +++ b/src/MaaCore/Config/Miscellaneous/RecruitConfig.h @@ -57,7 +57,7 @@ enum class ExtraTagsMode ExtraOnlyRare, // 2 - 如果可能, 同时选择更多的高星 Tag 组合, 即使可能冲突 }; -class RecruitConfig final : public SingletonHolder, public AbstractConfig +class RecruitConfig final : public MAA_NS::SingletonHolder, public AbstractConfig { public: using TagId = std::string; diff --git a/src/MaaCore/Config/Miscellaneous/SSSCopilotConfig.h b/src/MaaCore/Config/Miscellaneous/SSSCopilotConfig.h index a07d9c54af..e44f8cf08d 100644 --- a/src/MaaCore/Config/Miscellaneous/SSSCopilotConfig.h +++ b/src/MaaCore/Config/Miscellaneous/SSSCopilotConfig.h @@ -4,7 +4,7 @@ namespace asst { -class SSSCopilotConfig : public SingletonHolder, public AbstractConfig +class SSSCopilotConfig : public MAA_NS::SingletonHolder, public AbstractConfig { public: virtual ~SSSCopilotConfig() override = default; diff --git a/src/MaaCore/Config/Miscellaneous/StageDropsConfig.h b/src/MaaCore/Config/Miscellaneous/StageDropsConfig.h index 4bc19b6d09..3458c7cfcf 100644 --- a/src/MaaCore/Config/Miscellaneous/StageDropsConfig.h +++ b/src/MaaCore/Config/Miscellaneous/StageDropsConfig.h @@ -70,7 +70,7 @@ struct StageDropInfo int quantity = 0; }; -class StageDropsConfig final : public SingletonHolder, public AbstractConfig +class StageDropsConfig final : public MAA_NS::SingletonHolder, public AbstractConfig { public: virtual ~StageDropsConfig() override = default; diff --git a/src/MaaCore/Config/Miscellaneous/TilePack.cpp b/src/MaaCore/Config/Miscellaneous/TilePack.cpp index 0e34343c94..1e2f0df5bf 100644 --- a/src/MaaCore/Config/Miscellaneous/TilePack.cpp +++ b/src/MaaCore/Config/Miscellaneous/TilePack.cpp @@ -1,6 +1,6 @@ #include "TilePack.h" -#include "Common/AsstConf.h" +#include "MaaUtils/Conf.h" #include "meojson/json.hpp" #include @@ -15,9 +15,9 @@ #include #include -ASST_SUPPRESS_CV_WARNINGS_START +MAA_SUPPRESS_CV_WARNINGS_BEGIN #include -ASST_SUPPRESS_CV_WARNINGS_END +MAA_SUPPRESS_CV_WARNINGS_END #include "Utils/Logger.hpp" diff --git a/src/MaaCore/Config/Miscellaneous/TilePack.h b/src/MaaCore/Config/Miscellaneous/TilePack.h index 35f9691844..dd79227441 100644 --- a/src/MaaCore/Config/Miscellaneous/TilePack.h +++ b/src/MaaCore/Config/Miscellaneous/TilePack.h @@ -3,14 +3,15 @@ #include "Common/AsstBattleDef.h" #include "Common/AsstTypes.h" #include "Config/AbstractConfig.h" +#include "MaaUtils/Conf.h" -ASST_SUPPRESS_CV_WARNINGS_START +MAA_SUPPRESS_CV_WARNINGS_BEGIN #include -ASST_SUPPRESS_CV_WARNINGS_END +MAA_SUPPRESS_CV_WARNINGS_END namespace asst { -class TilePack final : public SingletonHolder, public AbstractConfig +class TilePack final : public MAA_NS::SingletonHolder, public AbstractConfig { public: using LevelKey = Map::LevelKey; diff --git a/src/MaaCore/Config/OnnxSessions.h b/src/MaaCore/Config/OnnxSessions.h index 1d89d2deaa..6ae7c9e7d0 100644 --- a/src/MaaCore/Config/OnnxSessions.h +++ b/src/MaaCore/Config/OnnxSessions.h @@ -14,7 +14,7 @@ namespace asst { -class OnnxSessions final : public SingletonHolder, public AbstractResource +class OnnxSessions final : public MAA_NS::SingletonHolder, public AbstractResource { public: virtual ~OnnxSessions(); diff --git a/src/MaaCore/Config/ResourceLoader.cpp b/src/MaaCore/Config/ResourceLoader.cpp index dbbe4e3cef..aa48af52d9 100644 --- a/src/MaaCore/Config/ResourceLoader.cpp +++ b/src/MaaCore/Config/ResourceLoader.cpp @@ -88,54 +88,54 @@ bool asst::ResourceLoader::load(const std::filesystem::path& path) std::unique_lock lock(m_entry_mutex); -#define LoadResourceAndCheckRet(Config, FilenameExpr) \ - { \ - auto filename = FilenameExpr; \ - auto full_path = path / filename; \ - bool ret = load_resource(full_path); \ - if (!ret) { \ - Log.error(#Config, " load failed, path:", full_path); \ - return false; \ - } \ - auto custom_path = path / (full_path.stem().string() + "_custom.json"); \ - if (std::filesystem::exists(custom_path)) { \ - ret = load_resource(custom_path); \ - Log.info("Loading custom file for ", #Config, ", path:", custom_path); \ - if (!ret) { \ - Log.error(#Config, " load failed, path:", custom_path); \ - return false; \ - } \ - } \ +#define LoadResourceAndCheckRet(Res, FilenameExpr) \ + { \ + auto filename = FilenameExpr; \ + auto full_path = path / filename; \ + bool ret = load_resource(full_path); \ + if (!ret) { \ + Log.error(#Res, " load failed, path:", full_path); \ + return false; \ + } \ + auto custom_path = path / (full_path.stem().string() + "_custom.json"); \ + if (std::filesystem::exists(custom_path)) { \ + ret = load_resource(custom_path); \ + Log.info("Loading custom file for ", #Res, ", path:", custom_path); \ + if (!ret) { \ + Log.error(#Res, " load failed, path:", custom_path); \ + return false; \ + } \ + } \ } #ifdef ASST_DEBUG // DEBUG 模式下这里同步加载，并检查返回值的，方便排查问题 -#define AsyncLoadConfig(Config, Filename) LoadResourceAndCheckRet(Config, Filename) +#define AsyncLoadConfig(Res, Filename) LoadResourceAndCheckRet(Res, Filename) #else -#define AsyncLoadConfig(Config, Filename) \ - { \ - add_load_queue(SingletonHolder::get_instance(), path / Filename); \ +#define AsyncLoadConfig(Res, Filename) \ + { \ + add_load_queue(Res::get_instance(), path / Filename); \ } #endif // ASST_DEBUG -#define LoadResourceWithTemplAndCheckRet(Config, Filename, TemplDir) \ - { \ - auto full_path = path / Filename; \ - auto full_templ_dir = path / TemplDir; \ - bool ret = load_resource_with_templ(full_path, full_templ_dir); \ - if (!ret) { \ - Log.error(#Config, "load failed, path:", full_path, ", templ dir:", full_templ_dir); \ - return false; \ - } \ +#define LoadResourceWithTemplAndCheckRet(Res, Filename, TemplDir) \ + { \ + auto full_path = path / Filename; \ + auto full_templ_dir = path / TemplDir; \ + bool ret = load_resource_with_templ(full_path, full_templ_dir); \ + if (!ret) { \ + Log.error(#Res, "load failed, path:", full_path, ", templ dir:", full_templ_dir); \ + return false; \ + } \ } -#define LoadCacheWithoutRet(Config, Dir) \ - { \ - auto full_path = UserDir.get() / "cache"_p / Dir; \ - if (!std::filesystem::exists(full_path)) { \ - std::filesystem::create_directories(full_path); \ - } \ - SingletonHolder::get_instance().load(full_path); \ +#define LoadCacheWithoutRet(Res, Dir) \ + { \ + auto full_path = UserDir.get() / "cache"_p / Dir; \ + if (!std::filesystem::exists(full_path)) { \ + std::filesystem::create_directories(full_path); \ + } \ + Res::get_instance().load(full_path); \ } LogTraceFunction; diff --git a/src/MaaCore/Config/ResourceLoader.h b/src/MaaCore/Config/ResourceLoader.h index be0e489442..db18a22afd 100644 --- a/src/MaaCore/Config/ResourceLoader.h +++ b/src/MaaCore/Config/ResourceLoader.h @@ -7,12 +7,12 @@ #include #include "AbstractConfigWithTempl.h" +#include "MaaUtils/SingletonHolder.hpp" #include "TemplResource.h" -#include "Utils/SingletonHolder.hpp" namespace asst { -class ResourceLoader final : public SingletonHolder, public AbstractResource +class ResourceLoader final : public MAA_NS::SingletonHolder, public AbstractResource { public: virtual ~ResourceLoader() override; @@ -30,7 +30,7 @@ public: private: void load_thread_func(); - template + template requires std::is_base_of_v bool load_resource(const std::filesystem::path& path) { @@ -40,7 +40,7 @@ private: return SingletonHolder::get_instance().load(path); } - template + template requires std::is_base_of_v bool load_resource_with_templ(const std::filesystem::path& path, const std::filesystem::path& templ_dir) { diff --git a/src/MaaCore/Config/Roguelike/RoguelikeCopilotConfig.h b/src/MaaCore/Config/Roguelike/RoguelikeCopilotConfig.h index 969c720860..05776235ea 100644 --- a/src/MaaCore/Config/Roguelike/RoguelikeCopilotConfig.h +++ b/src/MaaCore/Config/Roguelike/RoguelikeCopilotConfig.h @@ -7,7 +7,7 @@ namespace asst { -class RoguelikeCopilotConfig final : public SingletonHolder, public AbstractConfig +class RoguelikeCopilotConfig final : public MAA_NS::SingletonHolder, public AbstractConfig { public: virtual ~RoguelikeCopilotConfig() override = default; diff --git a/src/MaaCore/Config/Roguelike/RoguelikeMapConfig.h b/src/MaaCore/Config/Roguelike/RoguelikeMapConfig.h index f8d3fc0419..c1439e607c 100644 --- a/src/MaaCore/Config/Roguelike/RoguelikeMapConfig.h +++ b/src/MaaCore/Config/Roguelike/RoguelikeMapConfig.h @@ -39,7 +39,7 @@ enum class RoguelikeNodeType Scheme, // 筹谋 }; -class RoguelikeMapConfig final : public SingletonHolder, public AbstractConfig +class RoguelikeMapConfig final : public MAA_NS::SingletonHolder, public AbstractConfig { public: virtual ~RoguelikeMapConfig() override = default; diff --git a/src/MaaCore/Config/Roguelike/RoguelikeRecruitConfig.h b/src/MaaCore/Config/Roguelike/RoguelikeRecruitConfig.h index 06cdac4f75..6ecabae30c 100644 --- a/src/MaaCore/Config/Roguelike/RoguelikeRecruitConfig.h +++ b/src/MaaCore/Config/Roguelike/RoguelikeRecruitConfig.h @@ -65,7 +65,7 @@ struct RoguelikeGroupInfo std::vector> opers_in_order; // 未初始化，暂不可用 }; -class RoguelikeRecruitConfig final : public SingletonHolder, public AbstractConfig +class RoguelikeRecruitConfig final : public MAA_NS::SingletonHolder, public AbstractConfig { public: virtual ~RoguelikeRecruitConfig() override = default; diff --git a/src/MaaCore/Config/Roguelike/RoguelikeShoppingConfig.h b/src/MaaCore/Config/Roguelike/RoguelikeShoppingConfig.h index b96964b188..5a360530f1 100644 --- a/src/MaaCore/Config/Roguelike/RoguelikeShoppingConfig.h +++ b/src/MaaCore/Config/Roguelike/RoguelikeShoppingConfig.h @@ -19,7 +19,7 @@ struct RoguelikeGoods bool decrease_collapse = false; }; -class RoguelikeShoppingConfig final : public SingletonHolder, public AbstractConfig +class RoguelikeShoppingConfig final : public MAA_NS::SingletonHolder, public AbstractConfig { public: virtual ~RoguelikeShoppingConfig() override = default; diff --git a/src/MaaCore/Config/Roguelike/RoguelikeStageEncounterConfig.h b/src/MaaCore/Config/Roguelike/RoguelikeStageEncounterConfig.h index b0922c773c..8370489914 100644 --- a/src/MaaCore/Config/Roguelike/RoguelikeStageEncounterConfig.h +++ b/src/MaaCore/Config/Roguelike/RoguelikeStageEncounterConfig.h @@ -10,7 +10,9 @@ namespace asst { -class RoguelikeStageEncounterConfig final : public SingletonHolder, public AbstractConfig +class RoguelikeStageEncounterConfig final : + public MAA_NS::SingletonHolder, + public AbstractConfig { public: virtual ~RoguelikeStageEncounterConfig() override = default; diff --git a/src/MaaCore/Config/Roguelike/Sami/RoguelikeCollapsalParadigmConfig.h b/src/MaaCore/Config/Roguelike/Sami/RoguelikeCollapsalParadigmConfig.h index 259d223497..26542b654a 100644 --- a/src/MaaCore/Config/Roguelike/Sami/RoguelikeCollapsalParadigmConfig.h +++ b/src/MaaCore/Config/Roguelike/Sami/RoguelikeCollapsalParadigmConfig.h @@ -17,7 +17,7 @@ struct CollapsalParadigmClass }; class RoguelikeCollapsalParadigmConfig final : - public SingletonHolder, + public MAA_NS::SingletonHolder, public AbstractConfig { public: diff --git a/src/MaaCore/Config/Roguelike/Sami/RoguelikeFoldartalConfig.h b/src/MaaCore/Config/Roguelike/Sami/RoguelikeFoldartalConfig.h index 161cfb6cdd..162bc7db2e 100644 --- a/src/MaaCore/Config/Roguelike/Sami/RoguelikeFoldartalConfig.h +++ b/src/MaaCore/Config/Roguelike/Sami/RoguelikeFoldartalConfig.h @@ -21,7 +21,7 @@ struct RoguelikeFoldartalCombination std::vector pairs; // 适用的板子组合 }; -class RoguelikeFoldartalConfig final : public SingletonHolder, public AbstractConfig +class RoguelikeFoldartalConfig final : public MAA_NS::SingletonHolder, public AbstractConfig { public: virtual ~RoguelikeFoldartalConfig() override = default; diff --git a/src/MaaCore/Config/TaskData.h b/src/MaaCore/Config/TaskData.h index 752908df85..d7f5b6341a 100644 --- a/src/MaaCore/Config/TaskData.h +++ b/src/MaaCore/Config/TaskData.h @@ -10,7 +10,7 @@ namespace asst { -class TaskData final : public SingletonHolder, public AbstractConfigWithTempl +class TaskData final : public MAA_NS::SingletonHolder, public AbstractConfigWithTempl { private: static MatchTaskConstPtr _default_match_task_info(); diff --git a/src/MaaCore/Config/TemplResource.cpp b/src/MaaCore/Config/TemplResource.cpp index 26f206c94b..23b1acab11 100644 --- a/src/MaaCore/Config/TemplResource.cpp +++ b/src/MaaCore/Config/TemplResource.cpp @@ -4,9 +4,9 @@ #include #include -#include "Utils/ImageIo.hpp" +#include "MaaUtils/ImageIo.h" +#include "MaaUtils/NoWarningCV.hpp" #include "Utils/Logger.hpp" -#include "Utils/NoWarningCV.h" void asst::TemplResource::set_load_required(std::unordered_set required) noexcept { @@ -92,7 +92,7 @@ const cv::Mat& asst::TemplResource::get_templ(const std::string& name) #endif } - cv::Mat templ = asst::imread(path_iter->second); + cv::Mat templ = MAA_NS::imread(path_iter->second); m_templs.emplace(name, std::move(templ)); } return m_templs.at(name); diff --git a/src/MaaCore/Config/TemplResource.h b/src/MaaCore/Config/TemplResource.h index 176e33652a..36188065ff 100644 --- a/src/MaaCore/Config/TemplResource.h +++ b/src/MaaCore/Config/TemplResource.h @@ -5,12 +5,12 @@ #include #include -#include "Utils/NoWarningCVMat.h" -#include "Utils/SingletonHolder.hpp" +#include "MaaUtils/NoWarningCVMat.hpp" +#include "MaaUtils/SingletonHolder.hpp" namespace asst { -class TemplResource final : public SingletonHolder, public AbstractResource +class TemplResource final : public MAA_NS::SingletonHolder, public AbstractResource { public: virtual ~TemplResource() override = default; diff --git a/src/MaaCore/Controller/AdbController.cpp b/src/MaaCore/Controller/AdbController.cpp index 6c8c21c4f2..8982a5a125 100644 --- a/src/MaaCore/Controller/AdbController.cpp +++ b/src/MaaCore/Controller/AdbController.cpp @@ -1,8 +1,7 @@ #include "AdbController.h" #include "Assistant.h" -#include "Common/AsstConf.h" -#include "Utils/NoWarningCV.h" +#include "MaaUtils/NoWarningCV.hpp" #include #include diff --git a/src/MaaCore/Controller/AdbController.h b/src/MaaCore/Controller/AdbController.h index 9dd13b1a58..df3f40ee71 100644 --- a/src/MaaCore/Controller/AdbController.h +++ b/src/MaaCore/Controller/AdbController.h @@ -1,7 +1,5 @@ #pragma once -#include "Common/AsstConf.h" - #include "ControllerAPI.h" #include diff --git a/src/MaaCore/Controller/Controller.cpp b/src/MaaCore/Controller/Controller.cpp index b4767f99b9..e7600cad7d 100644 --- a/src/MaaCore/Controller/Controller.cpp +++ b/src/MaaCore/Controller/Controller.cpp @@ -7,8 +7,7 @@ #include #include "Assistant.h" -#include "Common/AsstConf.h" -#include "Utils/NoWarningCV.h" +#include "MaaUtils/NoWarningCV.hpp" #ifdef _MSC_VER #pragma warning(push) diff --git a/src/MaaCore/Controller/Controller.h b/src/MaaCore/Controller/Controller.h index ffa8ea4e86..0ba886cab7 100644 --- a/src/MaaCore/Controller/Controller.h +++ b/src/MaaCore/Controller/Controller.h @@ -21,8 +21,8 @@ #include "Common/AsstMsg.h" #include "Common/AsstTypes.h" #include "InstHelper.h" -#include "Utils/NoWarningCVMat.h" -#include "Utils/SingletonHolder.hpp" +#include "MaaUtils/NoWarningCVMat.hpp" +#include "MaaUtils/SingletonHolder.hpp" #include "adb-lite/client.hpp" namespace asst diff --git a/src/MaaCore/Controller/ControllerAPI.h b/src/MaaCore/Controller/ControllerAPI.h index b543e2e38c..e76014b7f9 100644 --- a/src/MaaCore/Controller/ControllerAPI.h +++ b/src/MaaCore/Controller/ControllerAPI.h @@ -3,7 +3,7 @@ #include #include "Common/AsstTypes.h" -#include "Utils/NoWarningCVMat.h" +#include "MaaUtils/NoWarningCVMat.hpp" namespace asst { diff --git a/src/MaaCore/Controller/LDExtras.cpp b/src/MaaCore/Controller/LDExtras.cpp index 1dc085c255..e6c596dccd 100644 --- a/src/MaaCore/Controller/LDExtras.cpp +++ b/src/MaaCore/Controller/LDExtras.cpp @@ -2,9 +2,9 @@ #if ASST_WITH_EMULATOR_EXTRAS +#include "MaaUtils/NoWarningCV.hpp" +#include "MaaUtils/SafeWindows.hpp" #include "Utils/Logger.hpp" -#include "Utils/NoWarningCV.h" -#include "Utils/Platform/SafeWindows.h" #include #include #include diff --git a/src/MaaCore/Controller/LDExtras.h b/src/MaaCore/Controller/LDExtras.h index 3b79fa425f..ec3d708011 100644 --- a/src/MaaCore/Controller/LDExtras.h +++ b/src/MaaCore/Controller/LDExtras.h @@ -1,18 +1,16 @@ #pragma once -#include "Common/AsstConf.h" - #if ASST_WITH_EMULATOR_EXTRAS -#include "Utils/Platform/SafeWindows.h" +#include "MaaUtils/SafeWindows.hpp" #include #include #include #include "LD/dnopengl/dnopengl.h" +#include "MaaUtils/NoWarningCVMat.hpp" #include "Utils/LibraryHolder.hpp" -#include "Utils/NoWarningCVMat.h" namespace asst { diff --git a/src/MaaCore/Controller/MumuExtras.cpp b/src/MaaCore/Controller/MumuExtras.cpp index 2f7fed3d44..6d1c3679d9 100644 --- a/src/MaaCore/Controller/MumuExtras.cpp +++ b/src/MaaCore/Controller/MumuExtras.cpp @@ -2,8 +2,8 @@ #if ASST_WITH_EMULATOR_EXTRAS +#include "MaaUtils/NoWarningCV.hpp" #include "Utils/Logger.hpp" -#include "Utils/NoWarningCV.h" namespace asst { diff --git a/src/MaaCore/Controller/MumuExtras.h b/src/MaaCore/Controller/MumuExtras.h index 45fc3963d7..baacfa45a6 100644 --- a/src/MaaCore/Controller/MumuExtras.h +++ b/src/MaaCore/Controller/MumuExtras.h @@ -1,7 +1,5 @@ #pragma once -#include "Common/AsstConf.h" - #if ASST_WITH_EMULATOR_EXTRAS #include @@ -10,8 +8,8 @@ #include "Mumu/external_renderer_ipc/external_renderer_ipc.h" +#include "MaaUtils/NoWarningCVMat.hpp" #include "Utils/LibraryHolder.hpp" -#include "Utils/NoWarningCVMat.h" namespace asst { diff --git a/src/MaaCore/Controller/Platform/PosixIO.cpp b/src/MaaCore/Controller/Platform/PosixIO.cpp index f7e2fb523e..09e23785ea 100644 --- a/src/MaaCore/Controller/Platform/PosixIO.cpp +++ b/src/MaaCore/Controller/Platform/PosixIO.cpp @@ -16,8 +16,8 @@ #include #include "Common/AsstTypes.h" +#include "MaaUtils/NoWarningCV.hpp" #include "Utils/Logger.hpp" -#include "Utils/NoWarningCV.h" asst::PosixIO::PosixIO(Assistant* inst) : InstHelper(inst) diff --git a/src/MaaCore/Controller/Platform/Win32IO.h b/src/MaaCore/Controller/Platform/Win32IO.h index 0a30152169..40238d075d 100644 --- a/src/MaaCore/Controller/Platform/Win32IO.h +++ b/src/MaaCore/Controller/Platform/Win32IO.h @@ -3,12 +3,12 @@ #ifdef _WIN32 #include "PlatformIO.h" -#include "Utils/Platform/SafeWindows.h" +#include "MaaUtils/SafeWindows.hpp" #include #include "Common/AsstTypes.h" #include "InstHelper.h" -#include "Utils/SingletonHolder.hpp" +#include "MaaUtils/SingletonHolder.hpp" namespace asst { @@ -42,9 +42,9 @@ public: private: // for Windows socket - class WsaHelper : public SingletonHolder + class WsaHelper : public MAA_NS::SingletonHolder { - friend class SingletonHolder; + friend class MAA_NS::SingletonHolder; public: virtual ~WsaHelper() override { WSACleanup(); } diff --git a/src/MaaCore/Controller/PlayToolsController.cpp b/src/MaaCore/Controller/PlayToolsController.cpp index e19b50fb51..9cfd9f8505 100644 --- a/src/MaaCore/Controller/PlayToolsController.cpp +++ b/src/MaaCore/Controller/PlayToolsController.cpp @@ -3,7 +3,7 @@ #include #include "Config/GeneralConfig.h" -#include "Utils/NoWarningCV.h" +#include "MaaUtils/NoWarningCV.hpp" using boost::asio::ip::tcp; namespace socket_ops = boost::asio::detail::socket_ops; diff --git a/src/MaaCore/Task/AbstractTask.cpp b/src/MaaCore/Task/AbstractTask.cpp index 358cf851f7..8a573bb507 100644 --- a/src/MaaCore/Task/AbstractTask.cpp +++ b/src/MaaCore/Task/AbstractTask.cpp @@ -6,15 +6,15 @@ #include #include +#include "MaaUtils/NoWarningCV.hpp" #include "Utils/Demangle.hpp" -#include "Utils/NoWarningCV.h" #include "AbstractTaskPlugin.h" #include "Assistant.h" #include "Config/GeneralConfig.h" #include "Controller/Controller.h" +#include "MaaUtils/ImageIo.h" #include "ProcessTask.h" -#include "Utils/ImageIo.hpp" #include "Utils/Logger.hpp" #include "Utils/StringMisc.hpp" @@ -160,7 +160,7 @@ bool asst::AbstractTask::save_img(const std::filesystem::path& relative_dir, boo if (image.empty()) { return false; } - std::string stem = utils::format_now_for_filename(); + std::string stem = MAA_NS::format_now_for_filename(); if (auto_clean) { // 第1次或每执行 debug.clean_files_freq(50) 次后执行清理 @@ -175,7 +175,7 @@ bool asst::AbstractTask::save_img(const std::filesystem::path& relative_dir, boo auto relative_path = relative_dir / (stem + "_raw.png"); Log.trace("Save image", relative_path); - return asst::imwrite(relative_path, image); + return MAA_NS::imwrite(relative_path, image); } size_t asst::AbstractTask::filenum_ctrl(const std::filesystem::path& relative_dir, size_t max_files) diff --git a/src/MaaCore/Task/BattleHelper.cpp b/src/MaaCore/Task/BattleHelper.cpp index 99111db325..4fdd65be3c 100644 --- a/src/MaaCore/Task/BattleHelper.cpp +++ b/src/MaaCore/Task/BattleHelper.cpp @@ -8,11 +8,11 @@ #include "Config/Miscellaneous/BattleDataConfig.h" #include "Config/TaskData.h" #include "Controller/Controller.h" +#include "MaaUtils/ImageIo.h" +#include "MaaUtils/NoWarningCV.hpp" +#include "MaaUtils/Time.hpp" #include "Task/ProcessTask.h" -#include "Utils/ImageIo.hpp" #include "Utils/Logger.hpp" -#include "Utils/NoWarningCV.h" -#include "Utils/Time.hpp" #include "Vision/Battle/BattlefieldClassifier.h" #include "Vision/Battle/BattlefieldMatcher.h" #include "Vision/Matcher.h" @@ -779,7 +779,7 @@ void asst::BattleHelper::save_map(const cv::Mat& image) suffix = "-" + std::to_string(m_camera_count); } std::vector jpeg_params = { cv::IMWRITE_JPEG_QUALITY, 50, cv::IMWRITE_JPEG_OPTIMIZE, 1 }; - asst::imwrite(MapRelativeDir / asst::utils::path(m_stage_name + suffix + ".jpeg"), draw, jpeg_params); + MAA_NS::imwrite(MapRelativeDir / asst::utils::path(m_stage_name + suffix + ".jpeg"), draw, jpeg_params); } bool asst::BattleHelper::click_oper_on_deployment(const std::string& name) @@ -894,8 +894,8 @@ bool asst::BattleHelper::click_skill(bool keep_waiting) #ifdef ASST_DEBUG if (!top_view.empty()) { using namespace asst::utils::path_literals; - asst::imwrite( - asst::utils::path(std::format("debug/skill/{}_{}.png", m_stage_name, utils::format_now_for_filename())), + MAA_NS::imwrite( + asst::utils::path(std::format("debug/skill/{}_{}.png", m_stage_name, MAA_NS::format_now_for_filename())), top_view); } #endif diff --git a/src/MaaCore/Task/BattleHelper.h b/src/MaaCore/Task/BattleHelper.h index 942315975e..8883a2247b 100644 --- a/src/MaaCore/Task/BattleHelper.h +++ b/src/MaaCore/Task/BattleHelper.h @@ -5,7 +5,7 @@ #include "Common/AsstBattleDef.h" #include "Config/Miscellaneous/TilePack.h" #include "InstHelper.h" -#include "Utils/NoWarningCVMat.h" +#include "MaaUtils/NoWarningCVMat.hpp" #include "Utils/Platform.hpp" #include "Utils/WorkingDir.hpp" #include "Vision/BestMatcher.h" diff --git a/src/MaaCore/Task/Experiment/CombatRecordRecognitionTask.cpp b/src/MaaCore/Task/Experiment/CombatRecordRecognitionTask.cpp index ac842006b5..1ea060a1d7 100644 --- a/src/MaaCore/Task/Experiment/CombatRecordRecognitionTask.cpp +++ b/src/MaaCore/Task/Experiment/CombatRecordRecognitionTask.cpp @@ -7,9 +7,9 @@ #include "Config/Miscellaneous/BattleDataConfig.h" #include "Config/Miscellaneous/TilePack.h" #include "Config/TaskData.h" -#include "Utils/ImageIo.hpp" +#include "MaaUtils/ImageIo.h" +#include "MaaUtils/NoWarningCV.hpp" #include "Utils/Logger.hpp" -#include "Utils/NoWarningCV.h" #include "Vision/Battle/BattleFormationAnalyzer.h" #include "Vision/Battle/BattlefieldClassifier.h" #include "Vision/Battle/BattlefieldDetector.h" @@ -90,7 +90,7 @@ bool asst::CombatRecordRecognitionTask::_run() "MaaAI_{}_{}_{}.json", m_stage_name, utils::path_to_utf8_string(m_video_path.stem()), - utils::format_now_for_filename()); + MAA_NS::format_now_for_filename()); auto filepath = UserDir.get() / "cache" / "CombatRecord" / utils::path(filename); std::filesystem::create_directories(filepath.parent_path()); std::ofstream osf(filepath); @@ -154,7 +154,7 @@ bool asst::CombatRecordRecognitionTask::analyze_formation() m_copilot_json["opers"].emplace(std::move(oper_json)); cb_formation.emplace(name); - asst::imwrite(utils::path("debug/video_export/formation/") / utils::path(name + ".png"), avatar); + MAA_NS::imwrite(utils::path("debug/video_export/formation/") / utils::path(name + ".png"), avatar); } callback(AsstMsg::SubTaskCompleted, cb_info); @@ -218,7 +218,7 @@ bool asst::CombatRecordRecognitionTask::analyze_stage() m_copilot_json["minimum_required"] = "v4.0.0"; m_copilot_json["doc"]["title"] = "MAA AI - " + m_stage_name; m_copilot_json["doc"]["details"] = - "Built at: " + utils::format_now() + "\n" + utils::path_to_utf8_string(m_video_path); + "Built at: " + MAA_NS::format_now() + "\n" + utils::path_to_utf8_string(m_video_path); callback(AsstMsg::SubTaskCompleted, basic_info_with_what("OcrStage")); return true; diff --git a/src/MaaCore/Task/Fight/FightTimesTaskPlugin.cpp b/src/MaaCore/Task/Fight/FightTimesTaskPlugin.cpp index ffac9ba763..be66faadf3 100644 --- a/src/MaaCore/Task/Fight/FightTimesTaskPlugin.cpp +++ b/src/MaaCore/Task/Fight/FightTimesTaskPlugin.cpp @@ -3,8 +3,8 @@ #include "Config/GeneralConfig.h" #include "Config/TaskData.h" #include "Controller/Controller.h" +#include "MaaUtils/NoWarningCV.hpp" #include "Task/ProcessTask.h" -#include "Utils/NoWarningCV.h" #include "Vision/Matcher.h" #include "Vision/MultiMatcher.h" #include "Vision/RegionOCRer.h" @@ -43,7 +43,7 @@ bool asst::FightTimesTaskPlugin::_run() LogTraceFunction; json::value sanity_info = basic_info_with_what("SanityBeforeStage"); json::value fight = basic_info_with_what("FightTimes"); - sanity_info["details"]["report_time"] = utils::format_now(); + sanity_info["details"]["report_time"] = MAA_NS::format_now(); // {"sanity_current": 100, "sanity_max": 135, "report_time": "2023-09-01 09:31:53.527"} auto image = ctrler()->get_image(); auto sanity = analyze_sanity_remain(image); diff --git a/src/MaaCore/Task/Fight/FightTimesTaskPlugin.h b/src/MaaCore/Task/Fight/FightTimesTaskPlugin.h index ed8bb0b7a1..2ebd2ec549 100644 --- a/src/MaaCore/Task/Fight/FightTimesTaskPlugin.h +++ b/src/MaaCore/Task/Fight/FightTimesTaskPlugin.h @@ -1,7 +1,7 @@ #pragma once #include "Common/AsstTypes.h" +#include "MaaUtils/NoWarningCVMat.hpp" #include "Task/AbstractTaskPlugin.h" -#include "Utils/NoWarningCVMat.h" namespace asst { diff --git a/src/MaaCore/Task/Fight/MedicineCounterTaskPlugin.cpp b/src/MaaCore/Task/Fight/MedicineCounterTaskPlugin.cpp index de2127717f..808cbcd597 100644 --- a/src/MaaCore/Task/Fight/MedicineCounterTaskPlugin.cpp +++ b/src/MaaCore/Task/Fight/MedicineCounterTaskPlugin.cpp @@ -6,11 +6,11 @@ #include "Config/TaskData.h" #include "Controller/Controller.h" #include "InstHelper.h" +#include "MaaUtils/NoWarningCV.hpp" #include "Task/Fight/DrGrandetTaskPlugin.h" #include "Task/Fight/FightTimesTaskPlugin.h" #include "Task/ProcessTask.h" #include "Utils/Logger.hpp" -#include "Utils/NoWarningCV.h" #include "Vision/Matcher.h" #include "Vision/MultiMatcher.h" #include "Vision/RegionOCRer.h" diff --git a/src/MaaCore/Task/Fight/StageQueueMissionCompletedTaskPlugin.cpp b/src/MaaCore/Task/Fight/StageQueueMissionCompletedTaskPlugin.cpp index dc0ae70e4b..48167f5031 100644 --- a/src/MaaCore/Task/Fight/StageQueueMissionCompletedTaskPlugin.cpp +++ b/src/MaaCore/Task/Fight/StageQueueMissionCompletedTaskPlugin.cpp @@ -3,8 +3,8 @@ #include "Config/Miscellaneous/ItemConfig.h" #include "Config/TaskData.h" #include "Controller/Controller.h" +#include "MaaUtils/ImageIo.h" #include "StageDropsTaskPlugin.h" -#include "Utils/ImageIo.hpp" #include "Utils/Logger.hpp" #include "Vision/Matcher.h" #include "Vision/Miscellaneous/StageDropsImageAnalyzer.h" diff --git a/src/MaaCore/Task/Fight/StageQueueMissionCompletedTaskPlugin.h b/src/MaaCore/Task/Fight/StageQueueMissionCompletedTaskPlugin.h index 0f7d2f55eb..034c7c5e0a 100644 --- a/src/MaaCore/Task/Fight/StageQueueMissionCompletedTaskPlugin.h +++ b/src/MaaCore/Task/Fight/StageQueueMissionCompletedTaskPlugin.h @@ -6,8 +6,8 @@ #include "Config/Miscellaneous/StageDropsConfig.h" #include "Config/TaskData.h" #include "Controller/Controller.h" +#include "MaaUtils/ImageIo.h" #include "Task/ReportDataTask.h" -#include "Utils/ImageIo.hpp" #include "Utils/Logger.hpp" #include "Vision/Miscellaneous/StageDropsImageAnalyzer.h" diff --git a/src/MaaCore/Task/Interface/DebugTask.cpp b/src/MaaCore/Task/Interface/DebugTask.cpp index 4a98d3f1bd..4fd4d80d3e 100644 --- a/src/MaaCore/Task/Interface/DebugTask.cpp +++ b/src/MaaCore/Task/Interface/DebugTask.cpp @@ -4,9 +4,9 @@ #include "Common/AsstTypes.h" #include "Config/TaskData.h" -#include "Utils/ImageIo.hpp" +#include "MaaUtils/ImageIo.h" +#include "MaaUtils/NoWarningCV.hpp" #include "Utils/Logger.hpp" -#include "Utils/NoWarningCV.h" #include "Vision/Battle/BattlefieldClassifier.h" #include "Vision/Battle/BattlefieldMatcher.h" #include "Vision/Matcher.h" @@ -31,7 +31,7 @@ void asst::DebugTask::test_drops() size_t total = 0; size_t success = 0; for (const auto& entry : std::filesystem::directory_iterator("../../test/drops/screenshots/zh_cn")) { - cv::Mat image = asst::imread(entry.path()); + cv::Mat image = MAA_NS::imread(entry.path()); if (image.empty()) { continue; } @@ -51,7 +51,7 @@ void asst::DebugTask::test_skill_ready() // 测试 y 类别（预期为 ready，即 true） for (const auto& entry : std::filesystem::directory_iterator(R"(../../test/skill_ready/y)")) { - cv::Mat image = imread(entry.path().string()); + cv::Mat image = MAA_NS::imread(entry.path()); BattlefieldClassifier analyzer(image); analyzer.set_object_of_interest({ .skill_ready = true }); total++; @@ -75,7 +75,7 @@ void asst::DebugTask::test_skill_ready() // 测试 n 类别（预期为 not ready，即 false） for (const auto& entry : std::filesystem::directory_iterator(R"(../../test/skill_ready/n)")) { - cv::Mat image = imread(entry.path().string()); + cv::Mat image = MAA_NS::imread(entry.path()); BattlefieldClassifier analyzer(image); analyzer.set_object_of_interest({ .skill_ready = true }); total++; @@ -98,7 +98,7 @@ void asst::DebugTask::test_skill_ready() // 测试 c 类别（同样预期为 not ready） for (const auto& entry : std::filesystem::directory_iterator(R"(../../test/skill_ready/c)")) { - cv::Mat image = imread(entry.path().string()); + cv::Mat image = MAA_NS::imread(entry.path()); BattlefieldClassifier analyzer(image); analyzer.set_object_of_interest({ .skill_ready = true }); total++; @@ -124,7 +124,7 @@ void asst::DebugTask::test_skill_ready() void asst::DebugTask::test_battle_image() { - cv::Mat image = asst::imread(utils::path("1.png")); + cv::Mat image = MAA_NS::imread(utils::path("1.png")); cv::Mat resized; cv::resize(image, resized, cv::Size(1280, 720), 0, 0, cv::INTER_AREA); BattlefieldMatcher analyzer(resized); @@ -135,7 +135,7 @@ void asst::DebugTask::test_battle_image() void asst::DebugTask::test_match_template() { auto test_task = [](const std::string& path, const std::string& task_name) -> double { - cv::Mat image = imread(utils::path(path)); + cv::Mat image = MAA_NS::imread(utils::path(path)); cv::Mat resized; cv::resize(image, resized, cv::Size(1280, 720), 0, 0, cv::INTER_AREA); Matcher match_analyzer(resized, Rect(0, 0, 1280, 720)); diff --git a/src/MaaCore/Task/Miscellaneous/AccountSwitchTask.cpp b/src/MaaCore/Task/Miscellaneous/AccountSwitchTask.cpp index 2883cd6f63..ad04123846 100644 --- a/src/MaaCore/Task/Miscellaneous/AccountSwitchTask.cpp +++ b/src/MaaCore/Task/Miscellaneous/AccountSwitchTask.cpp @@ -4,8 +4,8 @@ #include "Config/TaskData.h" #include "Controller/Controller.h" +#include "MaaUtils/ImageIo.h" #include "Task/ProcessTask.h" -#include "Utils/ImageIo.hpp" #include "Utils/Logger.hpp" #include "Vision/MultiMatcher.h" #include "Vision/RegionOCRer.h" diff --git a/src/MaaCore/Task/Miscellaneous/BattleFormationTask.cpp b/src/MaaCore/Task/Miscellaneous/BattleFormationTask.cpp index fa8778af77..e38b6d8da6 100644 --- a/src/MaaCore/Task/Miscellaneous/BattleFormationTask.cpp +++ b/src/MaaCore/Task/Miscellaneous/BattleFormationTask.cpp @@ -8,9 +8,9 @@ #include "Config/Miscellaneous/SSSCopilotConfig.h" #include "Config/TaskData.h" #include "Controller/Controller.h" +#include "MaaUtils/ImageIo.h" #include "Task/ProcessTask.h" #include "UseSupportUnitTaskPlugin.h" -#include "Utils/ImageIo.hpp" #include "Utils/Logger.hpp" #include "Vision/Miscellaneous/OperNameAnalyzer.h" #include "Vision/MultiMatcher.h" diff --git a/src/MaaCore/Task/Miscellaneous/BattleFormationTask.h b/src/MaaCore/Task/Miscellaneous/BattleFormationTask.h index 8c9c6c4031..0075e2f6cc 100644 --- a/src/MaaCore/Task/Miscellaneous/BattleFormationTask.h +++ b/src/MaaCore/Task/Miscellaneous/BattleFormationTask.h @@ -2,8 +2,8 @@ #include #include "Common/AsstBattleDef.h" +#include "MaaUtils/NoWarningCVMat.hpp" #include "Task/AbstractTask.h" -#include "Utils/NoWarningCVMat.h" #include "Vision/TemplDetOCRer.h" namespace asst diff --git a/src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp b/src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp index 9d4e4a3559..00a0748898 100644 --- a/src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp +++ b/src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp @@ -5,7 +5,7 @@ #include #include -#include "Utils/NoWarningCV.h" +#include "MaaUtils/NoWarningCV.hpp" #include "Config/GeneralConfig.h" #include "Config/Miscellaneous/BattleDataConfig.h" @@ -13,9 +13,9 @@ #include "Config/Miscellaneous/TilePack.h" #include "Config/TaskData.h" #include "Controller/Controller.h" +#include "MaaUtils/ImageIo.h" #include "Task/ProcessTask.h" #include "Utils/Algorithm.hpp" -#include "Utils/ImageIo.hpp" #include "Utils/Logger.hpp" #include "Vision/Battle/BattlefieldMatcher.h" #include "Vision/Matcher.h" diff --git a/src/MaaCore/Task/ProcessTask.h b/src/MaaCore/Task/ProcessTask.h index 4695701052..35ddd3d3f0 100644 --- a/src/MaaCore/Task/ProcessTask.h +++ b/src/MaaCore/Task/ProcessTask.h @@ -2,7 +2,7 @@ #include "AbstractTask.h" #include "Common/AsstTypes.h" -#include "Utils/NoWarningCVMat.h" +#include "MaaUtils/NoWarningCVMat.hpp" namespace asst { diff --git a/src/MaaCore/Task/Roguelike/Map/RoguelikeBoskyPassageMap.h b/src/MaaCore/Task/Roguelike/Map/RoguelikeBoskyPassageMap.h index 1c1fc2d6db..4523912834 100644 --- a/src/MaaCore/Task/Roguelike/Map/RoguelikeBoskyPassageMap.h +++ b/src/MaaCore/Task/Roguelike/Map/RoguelikeBoskyPassageMap.h @@ -5,7 +5,7 @@ #include #include "Config/Roguelike/RoguelikeMapConfig.h" -#include "Utils/SingletonHolder.hpp" +#include "MaaUtils/SingletonHolder.hpp" namespace asst { @@ -21,7 +21,7 @@ enum class RoguelikeBoskySubNodeType // 获取树篱之途子节点类型的字符串名称 std::string subtype2name(RoguelikeBoskySubNodeType sub_node_type); -class RoguelikeBoskyPassageMap : public SingletonHolder +class RoguelikeBoskyPassageMap : public MAA_NS::SingletonHolder { public: ~RoguelikeBoskyPassageMap() = default; diff --git a/src/MaaCore/Task/Roguelike/Map/RoguelikeBoskyPassageRoutingTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/Map/RoguelikeBoskyPassageRoutingTaskPlugin.cpp index d6ac4c4078..b6ad2409fb 100644 --- a/src/MaaCore/Task/Roguelike/Map/RoguelikeBoskyPassageRoutingTaskPlugin.cpp +++ b/src/MaaCore/Task/Roguelike/Map/RoguelikeBoskyPassageRoutingTaskPlugin.cpp @@ -2,9 +2,9 @@ #include "Config/TaskData.h" #include "Controller/Controller.h" -#include "Utils/ImageIo.hpp" +#include "MaaUtils/ImageIo.h" +#include "MaaUtils/NoWarningCV.hpp" #include "Utils/Logger.hpp" -#include "Utils/NoWarningCV.h" #include "Vision/MultiMatcher.h" bool asst::RoguelikeBoskyPassageRoutingTaskPlugin::load_params([[maybe_unused]] const json::value& params) @@ -167,9 +167,9 @@ void asst::RoguelikeBoskyPassageRoutingTaskPlugin::bosky_update_map() #ifdef ASST_DEBUG const std::filesystem::path& relative_dir = utils::path("debug") / utils::path("roguelikeMap"); - const auto relative_path = relative_dir / (std::format("{}_bosky_draw.png", utils::format_now_for_filename())); + const auto relative_path = relative_dir / (std::format("{}_bosky_draw.png", MAA_NS::format_now_for_filename())); Log.debug(__FUNCTION__, "| Saving bosky map image to", relative_path); - asst::imwrite(relative_path, image_draw); + MAA_NS::imwrite(relative_path, image_draw); #endif Log.info(__FUNCTION__, "| map updated with", RoguelikeBoskyPassageMap::get_instance().size(), "nodes"); diff --git a/src/MaaCore/Task/Roguelike/Map/RoguelikeRoutingTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/Map/RoguelikeRoutingTaskPlugin.cpp index 7c60ea9894..9cbd6f451c 100644 --- a/src/MaaCore/Task/Roguelike/Map/RoguelikeRoutingTaskPlugin.cpp +++ b/src/MaaCore/Task/Roguelike/Map/RoguelikeRoutingTaskPlugin.cpp @@ -5,10 +5,10 @@ #include "Config/TaskData.h" #include "Controller/Controller.h" +#include "MaaUtils/ImageIo.h" +#include "MaaUtils/NoWarningCV.hpp" #include "Task/ProcessTask.h" -#include "Utils/ImageIo.hpp" #include "Utils/Logger.hpp" -#include "Utils/NoWarningCV.h" #include "Vision/Matcher.h" #include "Vision/Miscellaneous/PixelAnalyzer.h" #include "Vision/MultiMatcher.h" @@ -116,9 +116,9 @@ bool asst::RoguelikeRoutingTaskPlugin::_run() update_map(image, RoguelikeMap::INIT_INDEX + 1, image_draw); #ifdef ASST_DEBUG const std::filesystem::path& relative_dir = utils::path("debug") / utils::path("roguelikeMap"); - const auto relative_path = relative_dir / (std::format("{}_draw.png", utils::format_now_for_filename())); + const auto relative_path = relative_dir / (std::format("{}_draw.png", MAA_NS::format_now_for_filename())); Log.trace("Save image", relative_path); - asst::imwrite(relative_path, image_draw); + MAA_NS::imwrite(relative_path, image_draw); #endif m_need_generate_map = false; @@ -184,9 +184,9 @@ bool asst::RoguelikeRoutingTaskPlugin::_run() update_map(image, RoguelikeMap::INIT_INDEX + 1, image_draw); #ifdef ASST_DEBUG const std::filesystem::path& relative_dir = utils::path("debug") / utils::path("roguelikeMap"); - const auto relative_path = relative_dir / (std::format("{}_draw.png", utils::format_now_for_filename())); + const auto relative_path = relative_dir / (std::format("{}_draw.png", MAA_NS::format_now_for_filename())); Log.trace("Save image", relative_path); - asst::imwrite(relative_path, image_draw); + MAA_NS::imwrite(relative_path, image_draw); #endif m_need_generate_map = false; } diff --git a/src/MaaCore/Task/Roguelike/Map/RoguelikeRoutingTaskPlugin.h b/src/MaaCore/Task/Roguelike/Map/RoguelikeRoutingTaskPlugin.h index 77a540d100..e4bc84e45c 100644 --- a/src/MaaCore/Task/Roguelike/Map/RoguelikeRoutingTaskPlugin.h +++ b/src/MaaCore/Task/Roguelike/Map/RoguelikeRoutingTaskPlugin.h @@ -1,9 +1,9 @@ #pragma once #include "Common/AsstTypes.h" +#include "MaaUtils/NoWarningCVMat.hpp" #include "RoguelikeMap.h" #include "Task/Roguelike/AbstractRoguelikeTaskPlugin.h" -#include "Utils/NoWarningCVMat.h" namespace asst { diff --git a/src/MaaCore/Task/Roguelike/RoguelikeBattleTaskPlugin.h b/src/MaaCore/Task/Roguelike/RoguelikeBattleTaskPlugin.h index 8853792d9b..e97dcc2413 100644 --- a/src/MaaCore/Task/Roguelike/RoguelikeBattleTaskPlugin.h +++ b/src/MaaCore/Task/Roguelike/RoguelikeBattleTaskPlugin.h @@ -7,8 +7,8 @@ #include "Common/AsstBattleDef.h" #include "Common/AsstTypes.h" #include "Config/Miscellaneous/TilePack.h" +#include "MaaUtils/NoWarningCVMat.hpp" #include "Task/BattleHelper.h" -#include "Utils/NoWarningCVMat.h" namespace asst { diff --git a/src/MaaCore/Task/Roguelike/RoguelikeSettlementTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeSettlementTaskPlugin.cpp index b359733ec0..f9a4eaac32 100644 --- a/src/MaaCore/Task/Roguelike/RoguelikeSettlementTaskPlugin.cpp +++ b/src/MaaCore/Task/Roguelike/RoguelikeSettlementTaskPlugin.cpp @@ -3,7 +3,7 @@ #include "Config/GeneralConfig.h" #include "Config/TaskData.h" #include "Controller/Controller.h" -#include "Utils/ImageIo.hpp" +#include "MaaUtils/ImageIo.h" #include "Vision/Matcher.h" #include "Vision/RegionOCRer.h" @@ -166,7 +166,7 @@ void asst::RoguelikeSettlementTaskPlugin::save_img( (m_save_file_cnt[relative_dir] + 1) % Config.get_options().debug.clean_files_freq; } - auto relative_path = relative_dir / (std::format("{}_{}.png", utils::format_now_for_filename(), name)); + auto relative_path = relative_dir / (std::format("{}_{}.png", MAA_NS::format_now_for_filename(), name)); Log.trace("Save image", relative_path); - asst::imwrite(relative_path, image); + MAA_NS::imwrite(relative_path, image); } diff --git a/src/MaaCore/Task/Roguelike/RoguelikeStageEncounterTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeStageEncounterTaskPlugin.cpp index 5ef2c2df84..df6c1d670f 100644 --- a/src/MaaCore/Task/Roguelike/RoguelikeStageEncounterTaskPlugin.cpp +++ b/src/MaaCore/Task/Roguelike/RoguelikeStageEncounterTaskPlugin.cpp @@ -3,11 +3,11 @@ #include "Config/Roguelike/RoguelikeStageEncounterConfig.h" #include "Config/TaskData.h" #include "Controller/Controller.h" +#include "MaaUtils/ImageIo.h" +#include "MaaUtils/NoWarningCV.hpp" #include "Task/ProcessTask.h" #include "Task/Roguelike/Map/RoguelikeBoskyPassageMap.h" -#include "Utils/ImageIo.hpp" #include "Utils/Logger.hpp" -#include "Utils/NoWarningCV.h" #include "Vision/Matcher.h" #include "Vision/RegionOCRer.h" @@ -555,7 +555,7 @@ std::optional asst::RoguelikeStageEncounterTaskPlugin::next_event(c bool asst::RoguelikeStageEncounterTaskPlugin::save_img(const cv::Mat& image, const std::string_view description) { const auto relative_dir = utils::path("debug") / utils::path("roguelike") / utils::path("encounter"); - const auto relative_path = relative_dir / (std::format("{}_raw.png", utils::format_now_for_filename())); + const auto relative_path = relative_dir / (std::format("{}_raw.png", MAA_NS::format_now_for_filename())); Log.info(std::format("Save {} to {}", description, relative_path.string())); - return imwrite(relative_path, image); + return MAA_NS::imwrite(relative_path, image); } diff --git a/src/MaaCore/Utils/File.hpp b/src/MaaCore/Utils/File.hpp deleted file mode 100644 index ec58551c7e..0000000000 --- a/src/MaaCore/Utils/File.hpp +++ /dev/null @@ -1,47 +0,0 @@ -#pragma once - -#include -#include - -namespace asst::utils -{ -template -concept ByteValueType = std::is_integral_v && sizeof(ValueType) == 1; - -template -concept AppendableBytesContainer = requires(ContainerType a) { - requires std::ranges::contiguous_range; - requires ByteValueType; - requires std::is_constructible_v; - requires std::is_constructible_v< - ContainerType, - size_t, - typename ContainerType::value_type>; // std::string(count, ch), - // std::vector(count, value) - a.insert(a.end(), a.begin(), a.begin() + (size_t)1); - a.resize(a.size()); -}; - -template -ContainerType read_file(const std::filesystem::path& path) -{ - ContainerType result; - std::ifstream file(path, std::ios::binary | std::ios::ate); - auto fileSize = file.tellg(); - if (fileSize != -1) { - result.resize(fileSize); - file.seekg(0, std::ios::beg); - file.read(reinterpret_cast(result.data()), fileSize); - } - else { - // no size available, read to EOF - constexpr auto chunksize = 4096; - ContainerType chunk(chunksize, 0); - while (!file.fail()) { - file.read(reinterpret_cast(chunk.data()), chunksize); - result.insert(result.end(), chunk.data(), chunk.data() + file.gcount()); - } - } - return result; -} -} diff --git a/src/MaaCore/Utils/ImageIo.hpp b/src/MaaCore/Utils/ImageIo.hpp deleted file mode 100644 index de25c91985..0000000000 --- a/src/MaaCore/Utils/ImageIo.hpp +++ /dev/null @@ -1,54 +0,0 @@ -#pragma once -#include -#include -#include -#include - -#include "NoWarningCV.h" -#include "NoWarningCVMat.h" - -#include "File.hpp" -#include "Platform.hpp" -#include "WorkingDir.hpp" - -namespace asst -{ -inline cv::Mat imread(const std::filesystem::path& path, int flags = cv::IMREAD_COLOR) -{ - auto content = asst::utils::read_file>(path); - return cv::imdecode(content, flags); -} - -inline cv::Mat imread(const std::string& utf8_path, int flags = cv::IMREAD_COLOR) -{ - return imread(asst::utils::path(utf8_path), flags); -} - -inline bool - imwrite(const std::filesystem::path& path, cv::InputArray img, const std::vector& params = std::vector()) -{ - std::filesystem::path absolute_path; - if (path.is_relative()) [[likely]] { - const auto& user_dir = UserDir.get(); - absolute_path = user_dir / path; - } - else { - absolute_path = path; - } - std::filesystem::create_directories(absolute_path.parent_path()); - std::ofstream of(absolute_path, std::ios::out | std::ios::binary); - std::vector encoded; - auto ext = asst::utils::path_to_utf8_string(absolute_path.extension()); - if (cv::imencode(ext, img, encoded, params)) { - of.write(reinterpret_cast(encoded.data()), encoded.size()); - return true; - } - return false; -} - -inline bool - imwrite(const std::string& utf8_path, cv::InputArray img, const std::vector& params = std::vector()) -{ - return imwrite(asst::utils::path(utf8_path), img, params); -} -} // namespace asst diff --git a/src/MaaCore/Utils/LibraryHolder.hpp b/src/MaaCore/Utils/LibraryHolder.hpp index 9eaa2b407e..104b571722 100644 --- a/src/MaaCore/Utils/LibraryHolder.hpp +++ b/src/MaaCore/Utils/LibraryHolder.hpp @@ -6,7 +6,7 @@ #include #ifdef _WIN32 -#include "Utils/Platform/SafeWindows.h" +#include "MaaUtils/SafeWindows.hpp" #else #include #endif diff --git a/src/MaaCore/Utils/Locale.hpp b/src/MaaCore/Utils/Locale.hpp index 49382b338a..6715a2327e 100644 --- a/src/MaaCore/Utils/Locale.hpp +++ b/src/MaaCore/Utils/Locale.hpp @@ -11,7 +11,7 @@ #include "Meta.hpp" #ifdef _WIN32 -#include "Platform/SafeWindows.h" +#include "MaaUtils/SafeWindows.hpp" #include #include diff --git a/src/MaaCore/Utils/Logger.hpp b/src/MaaCore/Utils/Logger.hpp index 77311ec463..7f2b0b0bb8 100644 --- a/src/MaaCore/Utils/Logger.hpp +++ b/src/MaaCore/Utils/Logger.hpp @@ -19,11 +19,11 @@ #include "Common/AsstTypes.h" #include "Common/AsstVersion.h" #include "Locale.hpp" +#include "MaaUtils/SingletonHolder.hpp" +#include "MaaUtils/Time.hpp" #include "Meta.hpp" #include "NullStreambuf.hpp" #include "Platform.hpp" -#include "SingletonHolder.hpp" -#include "Time.hpp" #include "Utils/ExceptionStacktrace.hpp" #include "WorkingDir.hpp" @@ -346,7 +346,7 @@ public: template ostreams(Args&&...) -> ostreams...>; -class Logger : public SingletonHolder +class Logger : public MAA_NS::SingletonHolder { public: struct separator @@ -478,7 +478,7 @@ public: #endif auto tid = static_cast(std::hash {}(std::this_thread::get_id())); - s << std::format("[{}][{}][Px{}][Tx{}]", utils::format_now(), v.str, pid, tid); + s << std::format("[{}][{}][Px{}][Tx{}]", MAA_NS::format_now(), v.str, pid, tid); } else if constexpr (std::is_enum_v && enum_could_to_string) { s << asst::enum_to_string(std::forward(v)); @@ -730,7 +730,7 @@ public: } private: - friend class SingletonHolder; + friend class MAA_NS::SingletonHolder; Logger() : m_directory(UserDir.get()), diff --git a/src/MaaCore/Utils/NoWarningCV.h b/src/MaaCore/Utils/NoWarningCV.h deleted file mode 100644 index 7fdd22d183..0000000000 --- a/src/MaaCore/Utils/NoWarningCV.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#include "Common/AsstConf.h" - -ASST_SUPPRESS_CV_WARNINGS_START -#include -ASST_SUPPRESS_CV_WARNINGS_END diff --git a/src/MaaCore/Utils/NoWarningCVMat.h b/src/MaaCore/Utils/NoWarningCVMat.h deleted file mode 100644 index d7156ae674..0000000000 --- a/src/MaaCore/Utils/NoWarningCVMat.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#include "Common/AsstConf.h" - -ASST_SUPPRESS_CV_WARNINGS_START -#include -ASST_SUPPRESS_CV_WARNINGS_END diff --git a/src/MaaCore/Utils/Platform/Platform.h b/src/MaaCore/Utils/Platform/Platform.h index 8af2682dd8..83eebb39b6 100644 --- a/src/MaaCore/Utils/Platform/Platform.h +++ b/src/MaaCore/Utils/Platform/Platform.h @@ -8,8 +8,8 @@ #include #ifdef _WIN32 +#include "MaaUtils/SafeWindows.hpp" #include "PlatformWin32.h" -#include "SafeWindows.h" #else #include "PlatformPosix.h" #endif // _WIN32 diff --git a/src/MaaCore/Utils/Platform/PlatformWin32.cpp b/src/MaaCore/Utils/Platform/PlatformWin32.cpp index 786c9a7092..3625fd1b79 100644 --- a/src/MaaCore/Utils/Platform/PlatformWin32.cpp +++ b/src/MaaCore/Utils/Platform/PlatformWin32.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include "Utils/Logger.hpp" #include "Utils/StringMisc.hpp" diff --git a/src/MaaCore/Utils/Platform/PlatformWin32.h b/src/MaaCore/Utils/Platform/PlatformWin32.h index 3f2742300b..9fa0537469 100644 --- a/src/MaaCore/Utils/Platform/PlatformWin32.h +++ b/src/MaaCore/Utils/Platform/PlatformWin32.h @@ -1,7 +1,7 @@ #pragma once #ifdef _WIN32 -#include "SafeWindows.h" +#include "MaaUtils/SafeWindows.hpp" #include diff --git a/src/MaaCore/Utils/Platform/SafeWindows.h b/src/MaaCore/Utils/Platform/SafeWindows.h deleted file mode 100644 index f2c5619ac1..0000000000 --- a/src/MaaCore/Utils/Platform/SafeWindows.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#include - -#include diff --git a/src/MaaCore/Utils/SingletonHolder.hpp b/src/MaaCore/Utils/SingletonHolder.hpp deleted file mode 100644 index c0a7cde567..0000000000 --- a/src/MaaCore/Utils/SingletonHolder.hpp +++ /dev/null @@ -1,32 +0,0 @@ -#pragma once - -#include - -namespace asst -{ -template -class SingletonHolder -{ -public: - static T& get_instance() - { - static T unique_instance; - return unique_instance; - } - - virtual ~SingletonHolder() = default; - -public: - SingletonHolder(const SingletonHolder&) = delete; - SingletonHolder(SingletonHolder&&) = delete; - - SingletonHolder& operator=(const SingletonHolder&) = delete; - SingletonHolder& operator=(SingletonHolder&&) = delete; - -protected: - SingletonHolder() = default; -}; - -template -concept Singleton = std::is_base_of_v, T>; -} diff --git a/src/MaaCore/Utils/StringMisc.hpp b/src/MaaCore/Utils/StringMisc.hpp index 582ba8808e..be5a2df95d 100644 --- a/src/MaaCore/Utils/StringMisc.hpp +++ b/src/MaaCore/Utils/StringMisc.hpp @@ -58,22 +58,6 @@ inline constexpr void } } -#ifdef ASST_USE_RANGES_RANGE_V3 -// workaround for P2210R2 -template -requires(requires(Rng rng) { std::basic_string_view(std::addressof(*rng.begin()), std::ranges::distance(rng)); }) -inline auto make_string_view(Rng&& rng) -{ - return std::basic_string_view(std::addressof(*rng.begin()), std::ranges::distance(rng)); -} - -template End> -requires(requires(It beg, End end) { std::basic_string_view(std::addressof(*beg), std::distance(beg, end)); }) -inline auto make_string_view(It beg, End end) -{ - return std::basic_string_view(std::addressof(*beg), std::distance(beg, end)); -} -#else inline auto make_string_view(std::ranges::contiguous_range auto&& rng) { return std::basic_string_view(rng.begin(), rng.end()); @@ -85,7 +69,6 @@ inline auto make_string_view(It beg, End end) { return std::basic_string_view(beg, end); } -#endif template [[nodiscard]] inline constexpr auto diff --git a/src/MaaCore/Utils/Time.hpp b/src/MaaCore/Utils/Time.hpp deleted file mode 100644 index f7aba8a697..0000000000 --- a/src/MaaCore/Utils/Time.hpp +++ /dev/null @@ -1,85 +0,0 @@ -#pragma once - -#include -#include - -#ifdef _WIN32 -#include "Platform/SafeWindows.h" -#else -#include -#include -#include -#endif - -#include -#include -#include - -namespace asst::utils -{ -inline std::string format_now() -{ - constexpr std::string_view kFormat = "{:0>4}-{:0>2}-{:0>2} {:0>2}:{:0>2}:{:0>2}.{:0>3}"; - -#ifdef _WIN32 - SYSTEMTIME sys {}; - GetLocalTime(&sys); - return std::format( - kFormat, - sys.wYear, - sys.wMonth, - sys.wDay, - sys.wHour, - sys.wMinute, - sys.wSecond, - sys.wMilliseconds); -#else - timeval tv = {}; - gettimeofday(&tv, nullptr); - time_t nowtime = tv.tv_sec; - tm* tm_info = localtime(&nowtime); - return std::format( - kFormat, - tm_info->tm_year + 1900, - tm_info->tm_mon, - tm_info->tm_mday, - tm_info->tm_hour, - tm_info->tm_min, - tm_info->tm_sec, - tv.tv_usec / 1000); -#endif -} - -inline std::string format_now_for_filename() -{ - constexpr std::string_view kFormat = "{:0>4}.{:0>2}.{:0>2}-{:0>2}.{:0>2}.{:0>2}.{}"; - -#ifdef _WIN32 - SYSTEMTIME sys {}; - GetLocalTime(&sys); - return std::format( - kFormat, - sys.wYear, - sys.wMonth, - sys.wDay, - sys.wHour, - sys.wMinute, - sys.wSecond, - sys.wMilliseconds); -#else - timeval tv = {}; - gettimeofday(&tv, nullptr); - time_t nowtime = tv.tv_sec; - tm* tm_info = localtime(&nowtime); - return std::format( - kFormat, - tm_info->tm_year + 1900, - tm_info->tm_mon, - tm_info->tm_mday, - tm_info->tm_hour, - tm_info->tm_min, - tm_info->tm_sec, - tv.tv_usec / 1000); -#endif -} -} // namespace asst::utils diff --git a/src/MaaCore/Utils/WorkingDir.hpp b/src/MaaCore/Utils/WorkingDir.hpp index 6cab023831..961a9739ad 100644 --- a/src/MaaCore/Utils/WorkingDir.hpp +++ b/src/MaaCore/Utils/WorkingDir.hpp @@ -1,7 +1,7 @@ #pragma once +#include "MaaUtils/SingletonHolder.hpp" #include "Platform.hpp" -#include "SingletonHolder.hpp" namespace asst { @@ -12,7 +12,7 @@ enum class WorkingDirType }; template -class WorkingDir : public SingletonHolder> +class WorkingDir : public MAA_NS::SingletonHolder> { public: bool empty() const noexcept { return dir_.empty(); } diff --git a/src/MaaCore/Vision/Battle/BattleFormationAnalyzer.cpp b/src/MaaCore/Vision/Battle/BattleFormationAnalyzer.cpp index 8e01fb0b5e..52b1ecf8b5 100644 --- a/src/MaaCore/Vision/Battle/BattleFormationAnalyzer.cpp +++ b/src/MaaCore/Vision/Battle/BattleFormationAnalyzer.cpp @@ -2,8 +2,8 @@ #include "Config/Miscellaneous/BattleDataConfig.h" #include "Config/TaskData.h" +#include "MaaUtils/NoWarningCV.hpp" #include "Utils/Logger.hpp" -#include "Utils/NoWarningCV.h" #include "Vision/Miscellaneous/PipelineAnalyzer.h" #include "Vision/TemplDetOCRer.h" diff --git a/src/MaaCore/Vision/Battle/BattlefieldClassifier.cpp b/src/MaaCore/Vision/Battle/BattlefieldClassifier.cpp index d0f3ef10d7..0a779d620c 100644 --- a/src/MaaCore/Vision/Battle/BattlefieldClassifier.cpp +++ b/src/MaaCore/Vision/Battle/BattlefieldClassifier.cpp @@ -1,6 +1,6 @@ #include "BattlefieldClassifier.h" -#include "Utils/NoWarningCV.h" +#include "MaaUtils/NoWarningCV.hpp" #include #include @@ -8,7 +8,7 @@ #include "Config/OnnxSessions.h" #include "Config/TaskData.h" -#include "Utils/ImageIo.hpp" +#include "MaaUtils/ImageIo.h" #include "Utils/Logger.hpp" using namespace asst; @@ -189,7 +189,7 @@ BattlefieldClassifier::SkillReadyResult BattlefieldClassifier::skill_ready_analy std::string filename = std::format( "debug/skill_ready/{}/{}_{}_{}(c{:3f})(n{:3f})(y{:3f}).png", subfolder, - utils::format_now_for_filename(), + MAA_NS::format_now_for_filename(), m_base_point.x, m_base_point.y, prob[0], @@ -201,7 +201,7 @@ BattlefieldClassifier::SkillReadyResult BattlefieldClassifier::skill_ready_analy last_save_time = now; Log.trace("Save image", relative_path); - asst::imwrite(relative_path, image); + MAA_NS::imwrite(relative_path, image); } return result; diff --git a/src/MaaCore/Vision/Battle/BattlefieldDetector.cpp b/src/MaaCore/Vision/Battle/BattlefieldDetector.cpp index 65b5057fe5..151f9011f3 100644 --- a/src/MaaCore/Vision/Battle/BattlefieldDetector.cpp +++ b/src/MaaCore/Vision/Battle/BattlefieldDetector.cpp @@ -4,7 +4,7 @@ #include #include -#include "Utils/NoWarningCV.h" +#include "MaaUtils/NoWarningCV.hpp" #include "Config/Miscellaneous/TilePack.h" #include "Config/OnnxSessions.h" diff --git a/src/MaaCore/Vision/Battle/BattlefieldMatcher.cpp b/src/MaaCore/Vision/Battle/BattlefieldMatcher.cpp index 3c6d2c316e..a3732cad76 100644 --- a/src/MaaCore/Vision/Battle/BattlefieldMatcher.cpp +++ b/src/MaaCore/Vision/Battle/BattlefieldMatcher.cpp @@ -3,7 +3,7 @@ #include #include -#include "Utils/NoWarningCV.h" +#include "MaaUtils/NoWarningCV.hpp" #include "Config/TaskData.h" #include "Config/TemplResource.h" diff --git a/src/MaaCore/Vision/Battle/SupportListAnalyzer.cpp b/src/MaaCore/Vision/Battle/SupportListAnalyzer.cpp index 7fce85dd9a..b5cef19a3d 100644 --- a/src/MaaCore/Vision/Battle/SupportListAnalyzer.cpp +++ b/src/MaaCore/Vision/Battle/SupportListAnalyzer.cpp @@ -1,7 +1,7 @@ #include "SupportListAnalyzer.h" #include "Config/TaskData.h" -#include "Utils/NoWarningCV.h" +#include "MaaUtils/NoWarningCV.hpp" #include "Vision/Matcher.h" #include "Vision/MultiMatcher.h" #include "Vision/RegionOCRer.h" diff --git a/src/MaaCore/Vision/BestMatcher.cpp b/src/MaaCore/Vision/BestMatcher.cpp index e93bc7f18d..cfbb30bdfe 100644 --- a/src/MaaCore/Vision/BestMatcher.cpp +++ b/src/MaaCore/Vision/BestMatcher.cpp @@ -1,6 +1,6 @@ #include "BestMatcher.h" -#include "Utils/NoWarningCV.h" +#include "MaaUtils/NoWarningCV.hpp" #include "Config/TaskData.h" #include "Config/TemplResource.h" diff --git a/src/MaaCore/Vision/Config/FeatureMatcherConfig.h b/src/MaaCore/Vision/Config/FeatureMatcherConfig.h index 27c501b3b5..2679bd77c4 100644 --- a/src/MaaCore/Vision/Config/FeatureMatcherConfig.h +++ b/src/MaaCore/Vision/Config/FeatureMatcherConfig.h @@ -1,6 +1,6 @@ #pragma once #include "Common/AsstTypes.h" -#include "Utils/NoWarningCVMat.h" +#include "MaaUtils/NoWarningCVMat.hpp" #include namespace asst diff --git a/src/MaaCore/Vision/Config/MatcherConfig.h b/src/MaaCore/Vision/Config/MatcherConfig.h index 555a614ee6..04559a7529 100644 --- a/src/MaaCore/Vision/Config/MatcherConfig.h +++ b/src/MaaCore/Vision/Config/MatcherConfig.h @@ -1,7 +1,7 @@ #pragma once #include "Common/AsstTypes.h" -#include "Utils/NoWarningCVMat.h" +#include "MaaUtils/NoWarningCVMat.hpp" #include diff --git a/src/MaaCore/Vision/Config/OCRerConfig.h b/src/MaaCore/Vision/Config/OCRerConfig.h index d5585e71b2..e8d3abc095 100644 --- a/src/MaaCore/Vision/Config/OCRerConfig.h +++ b/src/MaaCore/Vision/Config/OCRerConfig.h @@ -1,7 +1,7 @@ #pragma once #include "Common/AsstTypes.h" -#include "Utils/NoWarningCVMat.h" +#include "MaaUtils/NoWarningCVMat.hpp" #include diff --git a/src/MaaCore/Vision/FeatureMatcher.cpp b/src/MaaCore/Vision/FeatureMatcher.cpp index 91ccc53eef..a1cc1569ad 100644 --- a/src/MaaCore/Vision/FeatureMatcher.cpp +++ b/src/MaaCore/Vision/FeatureMatcher.cpp @@ -1,8 +1,8 @@ #include "FeatureMatcher.h" #include "Config/TemplResource.h" +#include "MaaUtils/NoWarningCV.hpp" #include "Utils/Logger.hpp" -#include "Utils/NoWarningCV.h" #include // MAA_SUPPRESS_CV_WARNINGS_BEGIN diff --git a/src/MaaCore/Vision/Hasher.cpp b/src/MaaCore/Vision/Hasher.cpp index b9dba56153..c8b787888b 100644 --- a/src/MaaCore/Vision/Hasher.cpp +++ b/src/MaaCore/Vision/Hasher.cpp @@ -1,6 +1,6 @@ #include "Hasher.h" -#include "Utils/NoWarningCV.h" +#include "MaaUtils/NoWarningCV.hpp" #include "Utils/Logger.hpp" diff --git a/src/MaaCore/Vision/Infrast/InfrastClueVacancyImageAnalyzer.cpp b/src/MaaCore/Vision/Infrast/InfrastClueVacancyImageAnalyzer.cpp index ee48841ca1..27caf36b8e 100644 --- a/src/MaaCore/Vision/Infrast/InfrastClueVacancyImageAnalyzer.cpp +++ b/src/MaaCore/Vision/Infrast/InfrastClueVacancyImageAnalyzer.cpp @@ -1,7 +1,7 @@ #include "InfrastClueVacancyImageAnalyzer.h" +#include "MaaUtils/NoWarningCV.hpp" #include "Utils/Logger.hpp" -#include "Utils/NoWarningCV.h" #include "Vision/Matcher.h" bool asst::InfrastClueVacancyImageAnalyzer::analyze() diff --git a/src/MaaCore/Vision/Infrast/InfrastFacilityImageAnalyzer.cpp b/src/MaaCore/Vision/Infrast/InfrastFacilityImageAnalyzer.cpp index 2834afb343..15b7d813d9 100644 --- a/src/MaaCore/Vision/Infrast/InfrastFacilityImageAnalyzer.cpp +++ b/src/MaaCore/Vision/Infrast/InfrastFacilityImageAnalyzer.cpp @@ -1,6 +1,6 @@ #include "InfrastFacilityImageAnalyzer.h" -#include "Utils/NoWarningCV.h" +#include "MaaUtils/NoWarningCV.hpp" #include "Config/TaskData.h" #include "Utils/Logger.hpp" diff --git a/src/MaaCore/Vision/Infrast/InfrastOperImageAnalyzer.cpp b/src/MaaCore/Vision/Infrast/InfrastOperImageAnalyzer.cpp index d21bba0139..3daf26a0f1 100644 --- a/src/MaaCore/Vision/Infrast/InfrastOperImageAnalyzer.cpp +++ b/src/MaaCore/Vision/Infrast/InfrastOperImageAnalyzer.cpp @@ -1,6 +1,6 @@ #include "InfrastOperImageAnalyzer.h" -#include "Utils/NoWarningCV.h" +#include "MaaUtils/NoWarningCV.hpp" #include #include "Config/Miscellaneous/InfrastConfig.h" diff --git a/src/MaaCore/Vision/Infrast/InfrastSmileyImageAnalyzer.cpp b/src/MaaCore/Vision/Infrast/InfrastSmileyImageAnalyzer.cpp index 569573cbb9..19859fa784 100644 --- a/src/MaaCore/Vision/Infrast/InfrastSmileyImageAnalyzer.cpp +++ b/src/MaaCore/Vision/Infrast/InfrastSmileyImageAnalyzer.cpp @@ -1,6 +1,6 @@ #include "InfrastSmileyImageAnalyzer.h" -#include "Utils/NoWarningCV.h" +#include "MaaUtils/NoWarningCV.hpp" #include "Utils/StringMisc.hpp" #include "Vision/MultiMatcher.h" diff --git a/src/MaaCore/Vision/Matcher.cpp b/src/MaaCore/Vision/Matcher.cpp index a6bda77c82..1905fd5a25 100644 --- a/src/MaaCore/Vision/Matcher.cpp +++ b/src/MaaCore/Vision/Matcher.cpp @@ -1,10 +1,10 @@ #include "Matcher.h" -#include "Utils/NoWarningCV.h" +#include "MaaUtils/NoWarningCV.hpp" #include "Config/TaskData.h" #include "Config/TemplResource.h" -#include "Utils/ImageIo.hpp" +#include "MaaUtils/ImageIo.h" #include "Utils/Logger.hpp" #include "Utils/StringMisc.hpp" @@ -57,8 +57,8 @@ Matcher::ResultOpt Matcher::analyze() const 95, cv::IMWRITE_JPEG_OPTIMIZE, 1 }; - asst::imwrite( - utils::path(std::format("debug/hsv/{}_{}.jpg", text, utils::format_now_for_filename())), + MAA_NS::imwrite( + utils::path(std::format("debug/hsv/{}_{}.jpg", text, MAA_NS::format_now_for_filename())), cropped, jpeg_params); } diff --git a/src/MaaCore/Vision/Miscellaneous/CreditShopImageAnalyzer.cpp b/src/MaaCore/Vision/Miscellaneous/CreditShopImageAnalyzer.cpp index 585ee70cf6..f3612a3569 100644 --- a/src/MaaCore/Vision/Miscellaneous/CreditShopImageAnalyzer.cpp +++ b/src/MaaCore/Vision/Miscellaneous/CreditShopImageAnalyzer.cpp @@ -2,7 +2,7 @@ #include -#include "Utils/NoWarningCV.h" +#include "MaaUtils/NoWarningCV.hpp" #include "Config/TaskData.h" #include "Utils/Logger.hpp" diff --git a/src/MaaCore/Vision/Miscellaneous/DepotImageAnalyzer.cpp b/src/MaaCore/Vision/Miscellaneous/DepotImageAnalyzer.cpp index c6df5ff797..1981a36fe4 100644 --- a/src/MaaCore/Vision/Miscellaneous/DepotImageAnalyzer.cpp +++ b/src/MaaCore/Vision/Miscellaneous/DepotImageAnalyzer.cpp @@ -1,6 +1,6 @@ #include "DepotImageAnalyzer.h" -#include "Utils/NoWarningCV.h" +#include "MaaUtils/NoWarningCV.hpp" #include "Config/Miscellaneous/ItemConfig.h" #include "Config/TaskData.h" diff --git a/src/MaaCore/Vision/Miscellaneous/OperBoxImageAnalyzer.cpp b/src/MaaCore/Vision/Miscellaneous/OperBoxImageAnalyzer.cpp index ca16e51830..c7cda34ae4 100644 --- a/src/MaaCore/Vision/Miscellaneous/OperBoxImageAnalyzer.cpp +++ b/src/MaaCore/Vision/Miscellaneous/OperBoxImageAnalyzer.cpp @@ -3,9 +3,9 @@ #include "Common/AsstTypes.h" #include "Config/Miscellaneous/BattleDataConfig.h" #include "Config/TaskData.h" -#include "Utils/ImageIo.hpp" +#include "MaaUtils/ImageIo.h" +#include "MaaUtils/NoWarningCV.hpp" #include "Utils/Logger.hpp" -#include "Utils/NoWarningCV.h" #include "Vision/BestMatcher.h" #include "Vision/Matcher.h" #include "Vision/Miscellaneous/OperNameAnalyzer.h" diff --git a/src/MaaCore/Vision/Miscellaneous/OperNameAnalyzer.cpp b/src/MaaCore/Vision/Miscellaneous/OperNameAnalyzer.cpp index 734fd52514..f204e47f4d 100644 --- a/src/MaaCore/Vision/Miscellaneous/OperNameAnalyzer.cpp +++ b/src/MaaCore/Vision/Miscellaneous/OperNameAnalyzer.cpp @@ -1,6 +1,6 @@ #include "OperNameAnalyzer.h" -#include "Utils/NoWarningCV.h" +#include "MaaUtils/NoWarningCV.hpp" #include "Vision/RegionOCRer.h" asst::OperNameAnalyzer::ResultOpt asst::OperNameAnalyzer::analyze() const diff --git a/src/MaaCore/Vision/Miscellaneous/PixelAnalyzer.cpp b/src/MaaCore/Vision/Miscellaneous/PixelAnalyzer.cpp index 67ae8ad9ec..87e689975f 100644 --- a/src/MaaCore/Vision/Miscellaneous/PixelAnalyzer.cpp +++ b/src/MaaCore/Vision/Miscellaneous/PixelAnalyzer.cpp @@ -2,8 +2,8 @@ #include +#include "MaaUtils/NoWarningCV.hpp" #include "Utils/Logger.hpp" -#include "Utils/NoWarningCV.h" using namespace asst; diff --git a/src/MaaCore/Vision/Miscellaneous/StageDropsImageAnalyzer.cpp b/src/MaaCore/Vision/Miscellaneous/StageDropsImageAnalyzer.cpp index f2f2f4d297..4e413e4c90 100644 --- a/src/MaaCore/Vision/Miscellaneous/StageDropsImageAnalyzer.cpp +++ b/src/MaaCore/Vision/Miscellaneous/StageDropsImageAnalyzer.cpp @@ -5,13 +5,13 @@ #include -#include "Utils/NoWarningCV.h" +#include "MaaUtils/NoWarningCV.hpp" #include "Config/Miscellaneous/ItemConfig.h" #include "Config/Miscellaneous/StageDropsConfig.h" #include "Config/TaskData.h" #include "Config/TemplResource.h" -#include "Utils/ImageIo.hpp" +#include "MaaUtils/ImageIo.h" #include "Utils/Logger.hpp" #include "Vision/Matcher.h" #include "Vision/RegionOCRer.h" diff --git a/src/MaaCore/Vision/MultiMatcher.cpp b/src/MaaCore/Vision/MultiMatcher.cpp index 81fb0f5b9e..7ddcf2b04f 100644 --- a/src/MaaCore/Vision/MultiMatcher.cpp +++ b/src/MaaCore/Vision/MultiMatcher.cpp @@ -3,7 +3,7 @@ #include #include -#include "Utils/NoWarningCV.h" +#include "MaaUtils/NoWarningCV.hpp" #include "Config/TaskData.h" #include "Config/TemplResource.h" diff --git a/src/MaaCore/Vision/OnnxHelper.cpp b/src/MaaCore/Vision/OnnxHelper.cpp index 1e9c61dc05..734d5ee339 100644 --- a/src/MaaCore/Vision/OnnxHelper.cpp +++ b/src/MaaCore/Vision/OnnxHelper.cpp @@ -1,6 +1,6 @@ #include "OnnxHelper.h" -#include "Utils/NoWarningCV.h" +#include "MaaUtils/NoWarningCV.hpp" using namespace asst; diff --git a/src/MaaCore/Vision/RegionOCRer.cpp b/src/MaaCore/Vision/RegionOCRer.cpp index 9ceae2f01a..7e1bf4540e 100644 --- a/src/MaaCore/Vision/RegionOCRer.cpp +++ b/src/MaaCore/Vision/RegionOCRer.cpp @@ -1,6 +1,6 @@ #include "RegionOCRer.h" -#include "Utils/NoWarningCV.h" +#include "MaaUtils/NoWarningCV.hpp" using namespace asst; diff --git a/src/MaaCore/Vision/Roguelike/RoguelikeEncounterOptionAnalyzer.cpp b/src/MaaCore/Vision/Roguelike/RoguelikeEncounterOptionAnalyzer.cpp index 21ec4dd89d..fab4e87109 100644 --- a/src/MaaCore/Vision/Roguelike/RoguelikeEncounterOptionAnalyzer.cpp +++ b/src/MaaCore/Vision/Roguelike/RoguelikeEncounterOptionAnalyzer.cpp @@ -1,8 +1,8 @@ #include "RoguelikeEncounterOptionAnalyzer.h" #include "Config/TaskData.h" +#include "MaaUtils/ImageIo.h" #include "Task/Roguelike/RoguelikeConfig.h" -#include "Utils/ImageIo.hpp" #include "Utils/Logger.hpp" #include "Vision/RegionOCRer.h" @@ -304,7 +304,7 @@ cv::Mat asst::RoguelikeEncounterOptionAnalyzer::binarize_for_ocr(const cv::Mat& bool asst::RoguelikeEncounterOptionAnalyzer::save_img(const cv::Mat& image, const std::string_view description) { const auto relative_dir = utils::path("debug") / utils::path("roguelike") / utils::path("encounter"); - const auto relative_path = relative_dir / (std::format("{}_raw.png", utils::format_now_for_filename())); + const auto relative_path = relative_dir / (std::format("{}_raw.png", MAA_NS::format_now_for_filename())); Log.info(std::format("Save {} to {}", description, relative_path.string())); - return imwrite(relative_path, image); + return MAA_NS::imwrite(relative_path, image); } diff --git a/src/MaaCore/Vision/Roguelike/RoguelikeFormationImageAnalyzer.cpp b/src/MaaCore/Vision/Roguelike/RoguelikeFormationImageAnalyzer.cpp index 46e2370a36..45e8086b3e 100644 --- a/src/MaaCore/Vision/Roguelike/RoguelikeFormationImageAnalyzer.cpp +++ b/src/MaaCore/Vision/Roguelike/RoguelikeFormationImageAnalyzer.cpp @@ -1,6 +1,6 @@ #include "RoguelikeFormationImageAnalyzer.h" -#include "Utils/NoWarningCV.h" +#include "MaaUtils/NoWarningCV.hpp" #include "Config/TaskData.h" #include "Utils/Logger.hpp" diff --git a/src/MaaCore/Vision/Roguelike/RoguelikeParameterAnalyzer.cpp b/src/MaaCore/Vision/Roguelike/RoguelikeParameterAnalyzer.cpp index 6f3a4507be..a9227cd156 100644 --- a/src/MaaCore/Vision/Roguelike/RoguelikeParameterAnalyzer.cpp +++ b/src/MaaCore/Vision/Roguelike/RoguelikeParameterAnalyzer.cpp @@ -1,9 +1,9 @@ #include "RoguelikeParameterAnalyzer.h" #include "Controller/Controller.h" +#include "MaaUtils/ImageIo.h" #include "Status.h" #include "Task/ProcessTask.h" -#include "Utils/ImageIo.hpp" #include "Utils/Logger.hpp" /* bool asst::RoguelikeParameterAnalyzer::analyze() diff --git a/src/MaaCore/Vision/Roguelike/RoguelikeRecruitImageAnalyzer.cpp b/src/MaaCore/Vision/Roguelike/RoguelikeRecruitImageAnalyzer.cpp index 2e192bfa2b..dcbe47901c 100644 --- a/src/MaaCore/Vision/Roguelike/RoguelikeRecruitImageAnalyzer.cpp +++ b/src/MaaCore/Vision/Roguelike/RoguelikeRecruitImageAnalyzer.cpp @@ -1,8 +1,8 @@ #include "RoguelikeRecruitImageAnalyzer.h" #include "Config/TaskData.h" +#include "MaaUtils/NoWarningCV.hpp" #include "Utils/Logger.hpp" -#include "Utils/NoWarningCV.h" #include "Vision/Matcher.h" #include "Vision/RegionOCRer.h" #include "Vision/TemplDetOCRer.h" diff --git a/src/MaaCore/Vision/Roguelike/RoguelikeRecruitSupportAnalyzer.cpp b/src/MaaCore/Vision/Roguelike/RoguelikeRecruitSupportAnalyzer.cpp index 021518e8c8..a94f78f253 100644 --- a/src/MaaCore/Vision/Roguelike/RoguelikeRecruitSupportAnalyzer.cpp +++ b/src/MaaCore/Vision/Roguelike/RoguelikeRecruitSupportAnalyzer.cpp @@ -6,8 +6,8 @@ #include "Config/Miscellaneous/BattleDataConfig.h" #include "Config/TaskData.h" #include "Controller/Controller.h" +#include "MaaUtils/NoWarningCV.hpp" #include "Utils/Logger.hpp" -#include "Utils/NoWarningCV.h" #include "Vision/Matcher.h" #include "Vision/OCRer.h" #include "Vision/RegionOCRer.h" diff --git a/src/MaaCore/Vision/Roguelike/RoguelikeSkillSelectionImageAnalyzer.cpp b/src/MaaCore/Vision/Roguelike/RoguelikeSkillSelectionImageAnalyzer.cpp index f51da9ee22..6c3bc068ce 100644 --- a/src/MaaCore/Vision/Roguelike/RoguelikeSkillSelectionImageAnalyzer.cpp +++ b/src/MaaCore/Vision/Roguelike/RoguelikeSkillSelectionImageAnalyzer.cpp @@ -1,6 +1,6 @@ #include "RoguelikeSkillSelectionImageAnalyzer.h" -#include "Utils/NoWarningCV.h" +#include "MaaUtils/NoWarningCV.hpp" #include "Config/Roguelike/RoguelikeRecruitConfig.h" #include "Config/TaskData.h" diff --git a/src/MaaCore/Vision/VisionHelper.cpp b/src/MaaCore/Vision/VisionHelper.cpp index d5daf3a60f..b5192bd85a 100644 --- a/src/MaaCore/Vision/VisionHelper.cpp +++ b/src/MaaCore/Vision/VisionHelper.cpp @@ -1,13 +1,13 @@ #include "VisionHelper.h" -#include "Utils/NoWarningCV.h" +#include "MaaUtils/NoWarningCV.hpp" #include "Assistant.h" #include "InstHelper.h" -#include "Utils/ImageIo.hpp" +#include "MaaUtils/ImageIo.h" +#include "MaaUtils/Time.hpp" #include "Utils/Logger.hpp" #include "Utils/StringMisc.hpp" -#include "Utils/Time.hpp" using namespace asst; @@ -131,13 +131,13 @@ cv::Mat asst::VisionHelper::create_mask(const cv::Mat& image, const cv::Rect& ro bool VisionHelper::save_img(const std::filesystem::path& relative_dir) { - std::string stem = utils::format_now_for_filename(); + std::string stem = MAA_NS::format_now_for_filename(); auto relative_path = relative_dir / (stem + "_raw.png"); Log.trace("Save image", relative_path); - bool ret = imwrite(relative_path, m_image); + bool ret = MAA_NS::imwrite(relative_path, m_image); #ifdef ASST_DEBUG - imwrite(relative_dir / (stem + "_draw.png"), m_image_draw); + MAA_NS::imwrite(relative_dir / (stem + "_draw.png"), m_image_draw); #endif return ret; diff --git a/src/MaaCore/Vision/VisionHelper.h b/src/MaaCore/Vision/VisionHelper.h index a59521ce94..f3ea8dfeca 100644 --- a/src/MaaCore/Vision/VisionHelper.h +++ b/src/MaaCore/Vision/VisionHelper.h @@ -2,7 +2,7 @@ #include "Common/AsstTypes.h" #include "InstHelper.h" -#include "Utils/NoWarningCVMat.h" +#include "MaaUtils/NoWarningCVMat.hpp" #include "Utils/Platform.hpp" #include diff --git a/src/MaaUtils b/src/MaaUtils index 32b4ce389f..3b5f98691a 160000 --- a/src/MaaUtils +++ b/src/MaaUtils @@ -1 +1 @@ -Subproject commit 32b4ce389f751274fc3194c8a988a6626cf77b90 +Subproject commit 3b5f98691afcff47cdb64f8976cf6060728868e9