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: update BattleHelper::move_camera

Browse Source
This commit is contained in:
Horror Proton
2023-01-11 11:33:58 +08:00
parent 456828425f
commit 187ee9e577
5 changed files with 25 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/MaaCore/Task/BattleHelper.cpp
View File

@@ -45,7 +45,7 @@ void asst::BattleHelper::clear()
m_used_tiles.clear();
}
bool asst::BattleHelper::calc_tiles_info(const std::string& stage_name)
bool asst::BattleHelper::calc_tiles_info(const std::string& stage_name, double shift_x, double shift_y)
{
LogTraceFunction;
@@ -53,8 +53,8 @@ bool asst::BattleHelper::calc_tiles_info(const std::string& stage_name)
return false;
}
m_normal_tile_info = Tile.calc(stage_name, false);
m_side_tile_info = Tile.calc(stage_name, true);
m_normal_tile_info = Tile.calc(stage_name, false, shift_x, shift_y);
m_side_tile_info = Tile.calc(stage_name, true, shift_x, shift_y);
return true;
}
@@ -619,37 +619,7 @@ bool asst::BattleHelper::move_camera(const std::pair<double, double>& move_loc,
LogTraceFunction;
Log.info("move", move_loc.first, move_loc.second);
auto move_tiles = [&](std::unordered_map<Point, TilePack::TileInfo>& tile_info) {
auto raw_tile_info = tile_info;
for (auto& [loc, tile] : tile_info) {
int view_loc_x = loc.x - static_cast<int>(move_loc.first);
int view_loc_y = loc.y - static_cast<int>(move_loc.second);
auto iter = raw_tile_info.find(Point(view_loc_x, view_loc_y));
if (iter == raw_tile_info.end()) {
continue;
}
tile.pos.x = iter->second.pos.x;
// y 的移动会导致高台和平地的坐标不对，先不管了
// tile.pos.y = iter->second.pos.y;
if (double view_loc_x_dec = std::fabs(loc.x - move_loc.first - view_loc_x); view_loc_x_dec > DoubleDiff) {
auto left_iter = raw_tile_info.find(Point(view_loc_x - 1, view_loc_y));
if (left_iter != raw_tile_info.end()) {
tile.pos.x -= static_cast<int>((tile.pos.x - left_iter->second.pos.x) * view_loc_x_dec);
}
}
// if (double view_loc_y_dec = std::fabs(loc.y - move_loc.second - view_loc_y); view_loc_y_dec > DoubleDiff)
// {
// auto top_iter = raw_tile_info.find(Point(view_loc_x, view_loc_y - 1));
// if (top_iter != raw_tile_info.end()) {
// tile.pos.y -= static_cast<int>((tile.pos.y - top_iter->second.pos.y) * view_loc_y_dec);
// }
// }
}
};
move_tiles(m_side_tile_info);
move_tiles(m_normal_tile_info);
calc_tiles_info(m_stage_name, -move_loc.first, move_loc.second);
if (clear_kills) {
m_kills = 0;