fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-20 02:55:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

style: 小优化

Browse Source
This commit is contained in:
zzyyyl
2022-08-26 18:52:21 +08:00
parent e666cef963
commit 24eb4a0d6a
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/MeoAssistant/AsstUtils.hpp
View File

@@ -179,7 +179,7 @@ namespace asst::utils
MultiByteToWideChar(CP_UTF8, 0, src_str, -1, wstr, len);
std::string unicode_escape_str = {};
constexpr static char hexcode[] = "0123456789abcdef";
constinit static char hexcode[] = "0123456789abcdef";
for (const wchar_t* pchr = wstr; *pchr; ++pchr) {
const wchar_t& chr = *pchr;
if (chr > 255) {

21
src/MeoAssistant/DepotImageAnalyzer.cpp
View File

@@ -64,14 +64,15 @@ bool asst::DepotImageAnalyzer::analyze_base_rect()
if (pos == NPos) {
return false;
}
auto& base_rect = base_item_info.rect;
const auto& base_rect = base_item_info.rect;
const auto& [base_x, base_y, base_w, base_h] = base_rect;
#ifdef ASST_DEBUG
cv::rectangle(m_image_draw_resized, utils::make_rect<cv::Rect>(base_rect), cv::Scalar(0, 0, 255), 2);
#endif
// 每个材料之间有间隔，这里 高度 * 2 的 roi, 一定有一个完整的材料 + 一个不完整的材料。所以识别结果只会有一个（除非这个间隔非常大）
Rect vertical_rect(base_rect.x, base_rect.y + base_rect.height, base_rect.width, base_rect.height * 2);
// 每个材料之间有间隔，这里 高度 * 2 的 roi, 一定有一个完整的材料 + 一个不完整的材料。
// 所以识别结果只会有一个（除非这个间隔非常大）
const Rect vertical_rect(base_x, base_y + base_h, base_w, base_h * 2);
ItemInfo vertical_item_info;
pos = match_item(vertical_rect, vertical_item_info, pos + 1);
@@ -80,7 +81,7 @@ bool asst::DepotImageAnalyzer::analyze_base_rect()
#endif
// 宽度 * 2，同上
Rect horizontal_roi(base_rect.x + base_rect.width, base_rect.y, base_rect.width * 2, base_rect.height);
const Rect horizontal_roi(base_x + base_w, base_y, base_w * 2, base_h);
ItemInfo horizontal_item_info;
pos = match_item(horizontal_roi, horizontal_item_info, pos + 1);
@@ -88,12 +89,12 @@ bool asst::DepotImageAnalyzer::analyze_base_rect()
cv::rectangle(m_image_draw_resized, utils::make_rect<cv::Rect>(horizontal_item_info.rect), cv::Scalar(0, 0, 255), 2);
#endif
int horizontal_spacing = horizontal_item_info.rect.x - (base_rect.x + base_rect.width);
int vertical_spacing = vertical_item_info.rect.y - (base_rect.y + base_rect.height);
const int horizontal_spacing = horizontal_item_info.rect.x - (base_x + base_w);
const int vertical_spacing = vertical_item_info.rect.y - (base_y + base_h);
for (int x = base_rect.x; x <= m_image_resized.cols; x += (base_rect.width + horizontal_spacing)) {
for (int y = base_rect.y; y <= m_image_resized.rows; y += (base_rect.height + vertical_spacing)) {
Rect item_roi = Rect(x, y, base_rect.width, base_rect.height);
for (int x = base_x; x <= m_image_resized.cols; x += (base_w + horizontal_spacing)) {
for (int y = base_y; y <= m_image_resized.rows; y += (base_h + vertical_spacing)) {
Rect item_roi = Rect(x, y, base_w, base_h);
if (!m_resized_rect.include(item_roi)) {
continue;
}