Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-05 14:21:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Introduce extents for TriangleListMesh and calculate them

Browse source
This commit is contained in:
sabrina-shanman 2019-10-31 15:54:17 -07:00
parent 67e05a70d4
commit ba257634f2
3 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -235,6 +235,7 @@ struct TriangleListMesh {
std::vector<glm::vec3> vertices; std::vector<glm::vec3> vertices;
std::vector<uint32_t> indices; std::vector<uint32_t> indices;
std::vector<glm::ivec2> parts; // Offset in the indices, Number of indices std::vector<glm::ivec2> parts; // Offset in the indices, Number of indices
std::vector<Extents> partExtents; // Extents of each part with no transform applied. Same length as parts.
}; };
/// A single mesh (with optional blendshapes). /// A single mesh (with optional blendshapes).

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

@ -40,6 +40,20 @@ void thickenFlatExtents(Extents& extents) {
extents.maximum += glm::vec3(EPSILON, EPSILON, EPSILON); extents.maximum += glm::vec3(EPSILON, EPSILON, EPSILON);
} }
void calculateExtentsForTriangleListMesh(TriangleListMesh& triangleListMesh) {
triangleListMesh.partExtents.resize(triangleListMesh.parts.size());
for (size_t partIndex = 0; partIndex < triangleListMesh.parts.size(); ++partIndex) {
const auto& part = triangleListMesh.parts[partIndex];
auto& extents = triangleListMesh.partExtents[partIndex];
int partEnd = part.x + part.y;
for (int i = part.x; i < partEnd; ++i) {
auto index = triangleListMesh.indices[i];
const auto& position = triangleListMesh.vertices[index];
extents.addPoint(position);
}
}
}
void calculateExtentsForShape(hfm::Shape& shape, const std::vector<hfm::Mesh>& meshes, const std::vector<hfm::Joint> joints) { void calculateExtentsForShape(hfm::Shape& shape, const std::vector<hfm::Mesh>& meshes, const std::vector<hfm::Joint> joints) {
auto& shapeExtents = shape.transformedExtents; auto& shapeExtents = shape.transformedExtents;
shapeExtents.reset(); shapeExtents.reset();
@ -196,6 +210,8 @@ const TriangleListMesh generateTriangleListMesh(const std::vector<glm::vec3>& sr
} }
} }
calculateExtentsForTriangleListMesh(dest);
return dest; return dest;
} }

2
libraries/hfm/src/hfm/HFMModelMath.h
View file

@ -20,6 +20,8 @@ void forEachIndex(const hfm::MeshPart& meshPart, std::function<void(uint32_t)> f
void initializeExtents(Extents& extents); void initializeExtents(Extents& extents);
void calculateExtentsForTriangleListMesh(TriangleListMesh& triangleListMesh);
// This can't be moved to model-baker until // This can't be moved to model-baker until
void calculateExtentsForShape(hfm::Shape& shape, const std::vector<hfm::Mesh>& meshes, const std::vector<hfm::Joint> joints); void calculateExtentsForShape(hfm::Shape& shape, const std::vector<hfm::Mesh>& meshes, const std::vector<hfm::Joint> joints);