zhanshi/mekhanoidy-tools
1
0
Fork 0
mirror of https://github.com/aimrebirth/tools.git synced 2026-04-15 01:43:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix C++20 array comparison.

Browse source
This commit is contained in:
lzwdgc 2020-12-09 14:19:20 +03:00
parent 1c0bea8a9c
commit 2ce251997d
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/model/model.h
View file

@ -151,7 +151,13 @@ struct face
void load(const buffer &b); void load(const buffer &b);
bool operator==(const face &rhs) const { return vertex_list == rhs.vertex_list; } bool operator==(const face &rhs) const
{
return std::equal(
std::begin(vertex_list), std::end(vertex_list),
std::begin(rhs.vertex_list), std::end(rhs.vertex_list)
);
}
}; };
struct model_data struct model_data
@ -172,11 +178,22 @@ struct processed_model_data
uint16_t vertex; uint16_t vertex;
uint16_t normal; uint16_t normal;
uint16_t uv; uint16_t uv;
bool operator==(const point &rhs) const
{
return std::tie(vertex, normal, uv) == std::tie(rhs.vertex, rhs.normal, rhs.uv);
}
}; };
point points[3]; point points[3];
bool operator==(const face &rhs) const { return points == rhs.points; } bool operator==(const face &rhs) const
{
return std::equal(
std::begin(points), std::end(points),
std::begin(rhs.points), std::end(rhs.points)
);
}
}; };
std::vector<aim_vector4> vertices; std::vector<aim_vector4> vertices;