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 link faces algorithm.

Browse source
This commit is contained in:
lzwdgc 2020-03-01 21:20:19 +03:00
parent 6a74caf0d0
commit e262989492
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/model/model.cpp
View file

@ -370,10 +370,9 @@ std::string block::printObj(int group_offset, AxisSystem as) const
return printObj(group_offset, as, vertices, faces); return printObj(group_offset, as, vertices, faces);
} }
std::string block::printObjSlow(int group_offset, AxisSystem as) const static auto linkFaces(const std::vector<vertex> &vertices, const std::vector<face> &faces)
{ {
// TODO: this implementation is not working now // reference implementation by Razum: https://pastebin.com/KewhggDj
// Correct one is at https://pastebin.com/KewhggDj
std::vector<vertex> vertices2; std::vector<vertex> vertices2;
vertices2.reserve(vertices.size()); vertices2.reserve(vertices.size());
@ -383,29 +382,36 @@ std::string block::printObjSlow(int group_offset, AxisSystem as) const
auto sz = vertices.size(); auto sz = vertices.size();
for (int i = 0; i < sz; i++) for (int i = 0; i < sz; i++)
{ {
auto it = std::find_if(vertices2.begin(), vertices2.end(), [this, i](auto &v1) auto it = std::find_if(vertices2.begin(), vertices2.end(), [&vertices, i](auto &v1)
{ {
return (aim_vector3f&)vertices[i].coordinates == (aim_vector3f&)v1.coordinates; return (aim_vector3f&)vertices[i].coordinates == (aim_vector3f&)v1.coordinates;
}); });
if (it == vertices2.end()) if (it == vertices2.end())
{
vertices2.push_back(vertices[i]); vertices2.push_back(vertices[i]);
repl[i] = vertices2.size() - 1;
}
else else
repl[i] = std::distance(vertices2.begin(), it); repl[i] = std::distance(vertices2.begin(), it);
} }
std::vector<face> faces2; std::vector<face> faces2;
faces2.reserve(faces.size());
for (auto f : faces) for (auto f : faces)
{ {
for (auto &v : f.vertex_list) for (auto &v : f.vertex_list)
v = repl[v]; v = repl[v];
auto it = std::find_if(faces2.begin(), faces2.end(), [f](auto &f1) // remove duplicates
{ if (std::find(faces2.begin(), faces2.end(), f) == faces2.end())
return f.vertex_list == f1.vertex_list;
});
if (it == faces2.end())
faces2.push_back(f); faces2.push_back(f);
} }
return std::tuple{ vertices2, faces2 };
}
std::string block::printObjSlow(int group_offset, AxisSystem as) const
{
auto [vertices2, faces2] = linkFaces(vertices, faces);
return printObj(group_offset, as, vertices2, faces2); return printObj(group_offset, as, vertices2, faces2);
} }

1
src/model/model.h
View file

@ -149,6 +149,7 @@ struct face
uint16_t vertex_list[3]; uint16_t vertex_list[3];
void load(const buffer &b); void load(const buffer &b);
bool operator==(const face &rhs) const { return vertex_list == rhs.vertex_list; }
}; };
struct animation struct animation