fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-17 18:01:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: MultiTemplMatcher (#9850)

Browse Source 
* feat: MultiMatcher

* fix: 修正对threshold的处理
This commit is contained in:
Weiyou Wang
2024-07-23 19:55:56 +10:00
committed by GitHub
parent 9b58ede500
commit 50cb0ed9f7
1 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/MaaCore/Vision/MultiMatcher.cpp
View File

@@ -15,49 +15,48 @@ using namespace asst;
MultiMatcher::ResultsVecOpt MultiMatcher::analyze() const
{
auto match_results = Matcher::preproc_and_match(make_roi(m_image, m_roi), m_params);
if (match_results.empty()) {
return std::nullopt;
}
const auto& [matched, templ, templ_name] = match_results.front();
if (matched.empty()) {
return std::nullopt;
}
std::vector<Result> results;
double threshold = m_params.templ_thres.front();
for (size_t index = 0; index < match_results.size(); ++index) {
const auto& [matched, templ, templ_name] = match_results[index];
if (matched.empty()) {
continue;
}
int min_distance = (std::min)(templ.cols, templ.rows) / 2;
for (int i = 0; i != matched.rows; ++i) {
for (int j = 0; j != matched.cols; ++j) {
auto value = matched.at<float>(i, j);
if (value < threshold || std::isnan(value) || std::isinf(value)) {
continue;
}
Rect rect(j + m_roi.x, i + m_roi.y, templ.cols, templ.rows);
bool need_push = true;
// 如果有两个点离得太近，只取里面得分高的那个
// 一般相邻的都是刚刚push进去的，这里倒序快一点
for (auto& iter : ranges::reverse_view(results)) {
if (std::abs(j + m_roi.x - iter.rect.x) >= min_distance ||
std::abs(i + m_roi.y - iter.rect.y) >= min_distance) {
double threshold = m_params.templ_thres[index];
int min_distance = (std::min)(templ.cols, templ.rows) / 2;
for (int i = 0; i != matched.rows; ++i) {
for (int j = 0; j != matched.cols; ++j) {
auto value = matched.at<float>(i, j);
if (value < threshold || std::isnan(value) || std::isinf(value)) {
continue;
}
if (iter.score < value) {
iter.rect = rect;
iter.score = value;
} // else 这个点就放弃了
need_push = false;
break;
}
if (need_push) {
Result tmp;
tmp.rect = rect;
tmp.score = value;
results.emplace_back(std::move(tmp));
Rect rect(j + m_roi.x, i + m_roi.y, templ.cols, templ.rows);
bool need_push = true;
// 如果有两个点离得太近，只取里面得分高的那个
// 一般相邻的都是刚刚push进去的，这里倒序快一点
for (auto& iter : ranges::reverse_view(results)) {
if (std::abs(j + m_roi.x - iter.rect.x) >= min_distance ||
std::abs(i + m_roi.y - iter.rect.y) >= min_distance) {
continue;
}
if (iter.score < value) {
iter.rect = rect;
iter.score = value;
iter.templ_name = templ_name;
} // else 这个点就放弃了
need_push = false;
break;
}
if (need_push) {
Result tmp;
tmp.rect = rect;
tmp.score = value;
tmp.templ_name = templ_name;
results.emplace_back(std::move(tmp));
}
}
}
}
@@ -75,7 +74,7 @@ MultiMatcher::ResultsVecOpt MultiMatcher::analyze() const
#endif
if (m_log_tracing) {
Log.trace("multi_match_templ | ", templ_name, "result:", results, "roi:", m_roi);
Log.trace("multi_match | ", "result:", results, "roi:", m_roi);
}
// FIXME: 老接口太难重构了，先弄个这玩意兼容下，后续慢慢全删掉