Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-11 12:20:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Keep exploring

Browse source
This commit is contained in:
Sam Gateau 2019-10-21 00:33:46 -07:00 committed by sabrina-shanman
parent 927e08acdb
commit 24e6a966a8
2 changed files with 47 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/hfm/src/hfm/HFM.h
View file

@ -261,7 +261,8 @@ public:
graphics::MeshPointer _mesh;
bool wasCompressed { false };
MeshIndexedTrianglesPos _meshAsIndexedTrianglePos;
std::vector<glm::vec3> uniqueVertices;
std::vector<uint32_t> trianglesIndices;
};
/// A single animation frame.

52
libraries/hfm/src/hfm/HFMModelMath.cpp
View file

@ -14,6 +14,8 @@
#include <LogHandler.h>
#include "ModelFormatLogging.h"
#include <unordered_map>
namespace hfm {
void forEachIndex(const hfm::MeshPart& meshPart, std::function<void(uint32_t)> func) {
@ -142,19 +144,55 @@ ReweightedDeformers getReweightedDeformers(const size_t numMeshVertices, const s
MeshIndexedTrianglesPos generateMeshIndexedTrianglePos(const std::vector<glm::vec3>& srcVertices, const std::vector<HFMMeshPart> srcParts) {
MeshIndexedTrianglesPos dest;
dest.vertices.resize(srcVertices.size());
std::vector<uint32_t> remap(srcVertices.size());
{
std::unordered_map<glm::vec3, uint32_t> uniqueVertices;
int vi = 0;
int vu = 0;
for (const auto& v : srcVertices) {
auto foundIndex = uniqueVertices.find(v);
if (foundIndex != uniqueVertices.end()) {
remap[vi] = foundIndex->second;
} else {
uniqueVertices[v] = vu;
remap[vi] = vu;
dest.vertices[vu] = v;
vu++;
}
++vi;
}
if (uniqueVertices.size() < srcVertices.size()) {
dest.vertices.resize(uniqueVertices.size());
dest.vertices.shrink_to_fit();
}
}
auto newIndicesCount = 0;
for (const auto& part : srcParts) {
newIndicesCount += part.triangleIndices.size() + part.quadTrianglesIndices.size();
}
MeshIndexedTrianglesPos dest;
dest.indices.reserve(newIndicesCount);
for (const auto& part : srcParts) {
dest.indices.insert(dest.indices.end(), part.triangleIndices.cbegin(), part.triangleIndices.cend());
dest.indices.insert(dest.indices.end(), part.quadTrianglesIndices.cbegin(), part.quadTrianglesIndices.cend());
}
{
dest.indices.resize(newIndicesCount);
int i = 0;
for (const auto& part : srcParts) {
for (const auto& qti : part.quadTrianglesIndices) {
dest.indices[i] = remap[qti];
++i;
}
for (const auto& ti : part.quadTrianglesIndices) {
dest.indices[i] = remap[ti];
++i;
}
dest.vertices = srcVertices;
// dest.indices.insert(dest.indices.end(), part.quadTrianglesIndices.cbegin(), part.quadTrianglesIndices.cend());
// dest.indices.insert(dest.indices.end(), part.triangleIndices.cbegin(), part.triangleIndices.cend());
}
}
return dest;
}