fix: 更新版本号至8.2.83，修改错误处理方式，重构资源管理

Author: GengGode

source/AutoTrack.cpp

@@ -12,6 +12,7 @@
 #include "frame/capture/capture.bitblt.h"
 #include "resource/version.h"
 
+#include "match/surf/SurfMatch.h"
 
 AutoTrack::AutoTrack(ErrorCode& err, Resources& res) : err(err), res(res)
 {
@@ -22,6 +23,12 @@ AutoTrack::AutoTrack(ErrorCode& err, Resources& res) : err(err), res(res)
 
     genshin_handle.config.frame_source = std::make_shared<tianli::frame::capture::capture_bitblt>();
     genshin_handle.config.frame_source->initialization();
+
+    genshin_screen.minimap_cailb_params = std::make_shared<tianli::global::match_minimap_cailb_params>();
+    genshin_screen.paimon_search_params = std::make_shared<tianli::global::check_paimon_search_params>();
+
+    genshin_minimap.matcher = std::make_shared<SurfMatch>(res);
+
     genshin_avatar_position.config.pos_filter = std::make_shared<tianli::algorithms::filter::filter_kalman>();
 }
 
@@ -51,110 +58,109 @@ bool AutoTrack::uninit()
     return !genshin_minimap.is_init_finish;
 }
 
+bool AutoTrack::SetHandle(long long int handle)
+{
+    if (handle == 0)
+    {
+        genshin_handle.config.is_auto_find_genshin = true;
+        return true;
+    }
+    else
+    {
+        genshin_handle.config.is_auto_find_genshin = false;
+        genshin_handle.handle = (HWND)handle;
+    }
+    return IsWindow(genshin_handle.handle);
+}
 
-        bool AutoTrack::SetHandle(long long int handle)
-        {
-            if (handle == 0)
-            {
-                genshin_handle.config.is_auto_find_genshin = true;
-                return true;
-            }
-            else
-            {
-                genshin_handle.config.is_auto_find_genshin = false;
-                genshin_handle.handle = (HWND)handle;
-            }
-            return IsWindow(genshin_handle.handle);
-        }
-
-        bool AutoTrack::SetWorldCenter(double x, double y)
-        {
-            genshin_avatar_position.target_map_world_center.x = x;
-            genshin_avatar_position.target_map_world_center.y = y;
-            return true;
-        }
+bool AutoTrack::SetWorldCenter(double x, double y)
+{
+    genshin_avatar_position.target_map_world_center.x = x;
+    genshin_avatar_position.target_map_world_center.y = y;
+    return true;
+}
 
-        bool AutoTrack::SetWorldScale(double scale)
-        {
-            genshin_avatar_position.target_map_world_scale = scale;
-            return true;
-        }
+bool AutoTrack::SetWorldScale(double scale)
+{
+    genshin_avatar_position.target_map_world_scale = scale;
+    return true;
+}
 
-        bool AutoTrack::startServe()
-        {
-            return false;
-        }
+bool AutoTrack::startServe()
+{
+    return false;
+}
 
-        bool AutoTrack::stopServe()
-        {
-            return false;
-        }
+bool AutoTrack::stopServe()
+{
+    return false;
+}
 
-        bool AutoTrack::SetDisableFileLog()
-        {
-            err.disableWirteFile();
-            return true;
-        }
+bool AutoTrack::SetDisableFileLog()
+{
+    err.disableWirteFile();
+    return true;
+}
 
-        bool AutoTrack::SetEnableFileLog()
-        {
-            err.enableWirteFile();
-            return true;
-        }
+bool AutoTrack::SetEnableFileLog()
+{
+    err.enableWirteFile();
+    return true;
+}
 
-        bool AutoTrack::DebugCapture()
-        {
-            return DebugCapturePath("Capture.png", 12);
-        }
+bool AutoTrack::DebugCapture()
+{
+    return DebugCapturePath("Capture.png", 12);
+}
 
-        bool AutoTrack::DebugCapturePath(const char* path_buff, int buff_size)
-        {
-            if (path_buff == NULL || buff_size < 1)
-            {
-                err = { 251, "路径缓存区为空指针或是路径缓存区大小为小于1" };
-                return false;
-            }
+bool AutoTrack::DebugCapturePath(const char* path_buff, int buff_size)
+{
+    if (path_buff == NULL || buff_size < 1)
+    {
+        err = { 251, "路径缓存区为空指针或是路径缓存区大小为小于1" };
+        return false;
+    }
 
-            if (genshin_screen.img_screen.empty())
+    if (genshin_screen.img_screen.empty())
+    {
+        err = { 252, "画面为空" };
+        return false;
+    }
+    cv::Mat out_info_img = genshin_screen.img_screen.clone();
+    switch (genshin_handle.config.frame_source->type)
+    {
+        case tianli::frame::frame_source::source_type::bitblt:
             {
-                err = { 252, "画面为空" };
-                return false;
+                // 绘制paimon Rect
+                cv::rectangle(out_info_img, genshin_paimon.rect_paimon, cv::Scalar(0, 0, 255), 2);
+                // 绘制miniMap Rect
+                cv::rectangle(out_info_img, genshin_minimap.rect_minimap, cv::Scalar(0, 0, 255), 2);
+                cv::Rect Avatar = genshin_minimap.rect_avatar;
+                Avatar.x += genshin_minimap.rect_minimap.x;
+                Avatar.y += genshin_minimap.rect_minimap.y;
+
+                // 绘制avatar Rect
+                cv::rectangle(out_info_img, Avatar, cv::Scalar(0, 0, 255), 2);
+                // 绘制UID Rect
+                cv::rectangle(out_info_img, genshin_handle.rect_uid, cv::Scalar(0, 0, 255), 2);
+                break;
             }
-            cv::Mat out_info_img = genshin_screen.img_screen.clone();
-            switch (genshin_handle.config.frame_source->type)
+        case tianli::frame::frame_source::source_type::window_graphics:
             {
-                case tianli::frame::frame_source::source_type::bitblt:
-                    {
-                        // 绘制paimon Rect
-                        cv::rectangle(out_info_img, genshin_paimon.rect_paimon, cv::Scalar(0, 0, 255), 2);
-                        // 绘制miniMap Rect
-                        cv::rectangle(out_info_img, genshin_minimap.rect_minimap, cv::Scalar(0, 0, 255), 2);
-                        cv::Rect Avatar = genshin_minimap.rect_avatar;
-                        Avatar.x += genshin_minimap.rect_minimap.x;
-                        Avatar.y += genshin_minimap.rect_minimap.y;
-
-                        // 绘制avatar Rect
-                        cv::rectangle(out_info_img, Avatar, cv::Scalar(0, 0, 255), 2);
-                        // 绘制UID Rect
-                        cv::rectangle(out_info_img, genshin_handle.rect_uid, cv::Scalar(0, 0, 255), 2);
-                        break;
-                    }
-                case tianli::frame::frame_source::source_type::window_graphics:
-                    {
-                        // 绘制paimon Rect
-                        cv::rectangle(out_info_img, genshin_paimon.rect_paimon, cv::Scalar(0, 0, 255), 2);
-                        // 绘制miniMap Rect
-                        cv::rectangle(out_info_img, genshin_minimap.rect_minimap, cv::Scalar(0, 0, 255), 2);
-                        cv::Rect Avatar = genshin_minimap.rect_avatar;
-                        Avatar.x += genshin_minimap.rect_minimap.x;
-                        Avatar.y += genshin_minimap.rect_minimap.y;
-
-                        // 绘制avatar Rect
-                        cv::rectangle(out_info_img, Avatar, cv::Scalar(0, 0, 255), 2);
-                        // 绘制UID Rect
-                        cv::rectangle(out_info_img, genshin_handle.rect_uid, cv::Scalar(0, 0, 255), 2);
-                    }
+                // 绘制paimon Rect
+                cv::rectangle(out_info_img, genshin_paimon.rect_paimon, cv::Scalar(0, 0, 255), 2);
+                // 绘制miniMap Rect
+                cv::rectangle(out_info_img, genshin_minimap.rect_minimap, cv::Scalar(0, 0, 255), 2);
+                cv::Rect Avatar = genshin_minimap.rect_avatar;
+                Avatar.x += genshin_minimap.rect_minimap.x;
+                Avatar.y += genshin_minimap.rect_minimap.y;
+
+                // 绘制avatar Rect
+                cv::rectangle(out_info_img, Avatar, cv::Scalar(0, 0, 255), 2);
+                // 绘制UID Rect
+                cv::rectangle(out_info_img, genshin_handle.rect_uid, cv::Scalar(0, 0, 255), 2);
             }
+    }
 
 #if (_MSC_VER && _MSVC_LANG <= 201703L) || (!_MSC_VER && __cplusplus <= 201703L)
     std::string last_time_str = global::format("{:%Y-%m-%d :%H:%M:%S}", std::chrono::system_clock::to_time_t(genshin_screen.last_time));
@@ -320,7 +326,7 @@ bool AutoTrack::GetUID(int& uid)
     }
 
     tianli::global::uid_calculation_config config;
-    uid_calculation(giUIDRef, uid, config);
+    uid_calculation(res, giUIDRef, uid, config);
     if (config.error)
     {
         err = config.err;
@@ -397,7 +403,7 @@ bool AutoTrack::GetAllInfo(double& x, double& y, int& mapId, double& a, double&
         }
 
         tianli::global::uid_calculation_config config;
-        uid_calculation(giUIDRef, uid, config);
+        uid_calculation(res, giUIDRef, uid, config);
         if (config.error)
         {
             err = config.err;

source/ErrorCode.h

@@ -38,6 +38,6 @@ class ErrorCode
 
 inline bool clear_error_logs()
 {
-    ErrorCode::getInstance() = { 0, "调用成功" };
+    *ErrorCode::getSharedPtr() = { 0, "调用成功" };
     return true;
 }

source/genshin/cailb/minimap/genshin.cailb.minimap.cpp

@@ -1,45 +1,27 @@
 #include "pch.h"
 #include "genshin.cailb.minimap.h"
-#include "../../../resources/Resources.h"
-bool match_minimap_cailb(const tianli::global::GenshinScreen& genshin_screen, tianli::global::GenshinMinimapCailb& out_genshin_minimap_cailb)
+bool match_minimap_cailb(const tianli::global::match_minimap_cailb_params& params, const tianli::global::GenshinScreen& genshin_screen, tianli::global::GenshinMinimapCailb& out_genshin_minimap_cailb)
 {
-    static std::vector<cv::Mat> split_minimap_cailb_template;
-    static cv::Mat minimap_cailb_template;
-    static cv::Mat minimap_cailb_template_handle_mode;
-    static cv::Mat minimap_cailb_template_no_alpha;
-    static cv::Mat minimap_cailb_template_no_alpha_handle_mode;
-    static bool is_first = true;
-    if (is_first)
-    {
-        cv::Mat minimap_cailb;
-        cv::resize(Resources::getInstance().MinimapCailbTemplate, minimap_cailb, cv::Size(), 0.8, 0.8);
-        cv::split(minimap_cailb, split_minimap_cailb_template);
-        minimap_cailb_template = split_minimap_cailb_template[3];
-        minimap_cailb_template_no_alpha = split_minimap_cailb_template[0];
-        cv::resize(split_minimap_cailb_template[3], minimap_cailb_template_handle_mode, cv::Size(), 1 / 1.2, 1 / 1.2, cv::INTER_CUBIC);
-        cv::resize(split_minimap_cailb_template[3], minimap_cailb_template_no_alpha_handle_mode, cv::Size(), 1.0 / 1.2, 1.0 / 1.2);
-        is_first = false;
-    }
 
     auto giMinimapCailbRef = genshin_screen.img_minimap_cailb_maybe;
     auto& rect_origin = genshin_screen.config.rect_minimap_cailb_maybe;
     auto& is_handle_mode = genshin_screen.config.is_handle_mode;
 
-    auto& template_not_handle_mode = split_minimap_cailb_template[3];
-    auto& template_handle_mode = minimap_cailb_template_handle_mode;
+    auto template_not_handle_mode = params.split_minimap_cailb_template[3];
+    auto template_handle_mode = params.minimap_cailb_template_handle_mode;
 
-    if (giMinimapCailbRef.empty() || minimap_cailb_template_handle_mode.empty())
+    if (giMinimapCailbRef.empty() || params.minimap_cailb_template_handle_mode.empty())
         return false;
-    if (giMinimapCailbRef.cols < split_minimap_cailb_template[3].cols || giMinimapCailbRef.rows < split_minimap_cailb_template[3].rows)
+    if (giMinimapCailbRef.cols < params.split_minimap_cailb_template[3].cols || giMinimapCailbRef.rows < params.split_minimap_cailb_template[3].rows)
         return false;
 
     // 设置阈值取值 根据是否使用alpha图层
     double check_match_minimap_cailb_param = out_genshin_minimap_cailb.config.check_match_minimap_cailb_params;
     if (genshin_screen.config.is_used_alpha == false)
     {
         cv::cvtColor(genshin_screen.img_minimap_cailb_maybe, giMinimapCailbRef, cv::COLOR_RGBA2GRAY);
-        template_not_handle_mode = minimap_cailb_template_no_alpha;
-        template_handle_mode = minimap_cailb_template_no_alpha_handle_mode;
+        template_not_handle_mode = params.minimap_cailb_template_no_alpha;
+        template_handle_mode = params.minimap_cailb_template_no_alpha_handle_mode;
         check_match_minimap_cailb_param = out_genshin_minimap_cailb.config.check_match_minimap_cailb_params_no_alpha;
     }
 
@@ -94,7 +76,7 @@ bool cailb_minimap_impl(const tianli::global::GenshinScreen& genshin_screen, tia
     if (genshin_screen.config.is_search_mode)
     {
         static tianli::global::GenshinMinimapCailb genshin_minimap_cailb;
-        bool is_find_minimap_cailb = match_minimap_cailb(genshin_screen, genshin_minimap_cailb);
+        bool is_find_minimap_cailb = match_minimap_cailb(*genshin_screen.minimap_cailb_params, genshin_screen, genshin_minimap_cailb);
         if (is_find_minimap_cailb == false)
         {
             return false;

source/genshin/cailb/minimap/genshin.cailb.minimap.h

@@ -1,6 +1,30 @@
 #pragma once
 #include "global/global.genshin.h"
 
+#include "../../../resources/Resources.h"
+
+namespace tianli::global
+{
+    struct match_minimap_cailb_params
+    {
+        std::vector<cv::Mat> split_minimap_cailb_template;
+        cv::Mat minimap_cailb_template;
+        cv::Mat minimap_cailb_template_handle_mode;
+        cv::Mat minimap_cailb_template_no_alpha;
+        cv::Mat minimap_cailb_template_no_alpha_handle_mode;
+
+        void init(Resources& res)
+        {
+            cv::Mat minimap_cailb;
+            cv::resize(res.MinimapCailbTemplate, minimap_cailb, cv::Size(), 0.8, 0.8);
+            cv::split(minimap_cailb, split_minimap_cailb_template);
+            minimap_cailb_template = split_minimap_cailb_template[3];
+            minimap_cailb_template_no_alpha = split_minimap_cailb_template[0];
+            cv::resize(split_minimap_cailb_template[3], minimap_cailb_template_handle_mode, cv::Size(), 1 / 1.2, 1 / 1.2, cv::INTER_CUBIC);
+            cv::resize(split_minimap_cailb_template[3], minimap_cailb_template_no_alpha_handle_mode, cv::Size(), 1.0 / 1.2, 1.0 / 1.2);
+        }
+    };
+} // namespace tianli::global
 namespace TianLi::Genshin::Cailb
 {
     bool cailb_minimap(const tianli::global::GenshinScreen& genshin_screen, tianli::global::GenshinMinimap& out_genshin_minimap);