Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 00:10:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

address review feedback

Browse source
This commit is contained in:
Andrew Meadows 2016-05-25 20:53:43 -07:00
parent 2efec2a878
commit 402b7f2282
3 changed files with 57 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
tools/vhacd-util/src/VHACDUtil.cpp
View file

@ -47,7 +47,7 @@ bool vhacd::VHACDUtil::loadFBX(const QString filename, FBXGeometry& result) {
} else if (filename.toLower().endsWith(".fbx")) { } else if (filename.toLower().endsWith(".fbx")) {
geom = readFBX(fbxContents, QVariantHash(), filename); geom = readFBX(fbxContents, QVariantHash(), filename);
} else { } else {
qWarning() << "unknown file extension"; qWarning() << "file has unknown extension" << filename;
return false; return false;
} }
result = *geom; result = *geom;
@ -63,18 +63,20 @@ bool vhacd::VHACDUtil::loadFBX(const QString filename, FBXGeometry& result) {
void getTrianglesInMeshPart(const FBXMeshPart &meshPart, std::vector<int>& triangleIndices) { void getTrianglesInMeshPart(const FBXMeshPart &meshPart, std::vector<int>& triangleIndices) {
// append all the triangles (and converted quads) from this mesh-part to triangles // append triangle indices
std::vector<int> meshPartTriangles = meshPart.triangleIndices.toStdVector(); triangleIndices.reserve(triangleIndices.size() + (size_t)meshPart.triangleIndices.size());
triangleIndices.insert(triangleIndices.end(), meshPartTriangles.begin(), meshPartTriangles.end()); for (auto index : meshPart.triangleIndices) {
triangleIndices.push_back(index);
}
// convert quads to triangles // convert quads to triangles
const uint32_t QUAD_STRIDE = 4; const uint32_t QUAD_STRIDE = 4;
uint32_t quadCount = meshPart.quadIndices.size() / QUAD_STRIDE; uint32_t numIndices = (uint32_t)meshPart.quadIndices.size();
for (uint32_t i = 0; i < quadCount; i++) { for (uint32_t i = 0; i < numIndices; i += QUAD_STRIDE) {
uint32_t p0Index = meshPart.quadIndices[i * QUAD_STRIDE]; uint32_t p0Index = meshPart.quadIndices[i];
uint32_t p1Index = meshPart.quadIndices[i * QUAD_STRIDE + 1]; uint32_t p1Index = meshPart.quadIndices[i + 1];
uint32_t p2Index = meshPart.quadIndices[i * QUAD_STRIDE + 2]; uint32_t p2Index = meshPart.quadIndices[i + 2];
uint32_t p3Index = meshPart.quadIndices[i * QUAD_STRIDE + 3]; uint32_t p3Index = meshPart.quadIndices[i + 3];
// split each quad into two triangles // split each quad into two triangles
triangleIndices.push_back(p0Index); triangleIndices.push_back(p0Index);
triangleIndices.push_back(p1Index); triangleIndices.push_back(p1Index);
@ -105,8 +107,6 @@ void vhacd::VHACDUtil::fattenMeshes(const FBXMesh& mesh, FBXMesh& result,
return; return;
} }
int indexStartOffset = result.vertices.size();
// new mesh gets the transformed points from the original // new mesh gets the transformed points from the original
for (int i = 0; i < mesh.vertices.size(); i++) { for (int i = 0; i < mesh.vertices.size(); i++) {
// apply the source mesh's transform to the points // apply the source mesh's transform to the points
@ -118,6 +118,7 @@ void vhacd::VHACDUtil::fattenMeshes(const FBXMesh& mesh, FBXMesh& result,
const uint32_t TRIANGLE_STRIDE = 3; const uint32_t TRIANGLE_STRIDE = 3;
const float COLLISION_TETRAHEDRON_SCALE = 0.25f; const float COLLISION_TETRAHEDRON_SCALE = 0.25f;
int indexStartOffset = result.vertices.size();
for (uint32_t i = 0; i < triangleIndices.size(); i += TRIANGLE_STRIDE) { for (uint32_t i = 0; i < triangleIndices.size(); i += TRIANGLE_STRIDE) {
int index0 = triangleIndices[i] + indexStartOffset; int index0 = triangleIndices[i] + indexStartOffset;
int index1 = triangleIndices[i + 1] + indexStartOffset; int index1 = triangleIndices[i + 1] + indexStartOffset;
@ -178,26 +179,39 @@ AABox getAABoxForMeshPart(const FBXMesh& mesh, const FBXMeshPart &meshPart) {
return aaBox; return aaBox;
} }
struct TriangleEdge { class TriangleEdge {
int indexA { -1 }; public:
int indexB { -1 };
TriangleEdge() {} TriangleEdge() {}
TriangleEdge(int A, int B) : indexA(A), indexB(B) {} TriangleEdge(uint32_t A, uint32_t B) {
bool operator==(const TriangleEdge& other) const { setIndices(A, B);
return indexA == other.indexA && indexB == other.indexB;
} }
void sortIndices() { void setIndices(uint32_t A, uint32_t B) {
if (indexB < indexA) { if (A < B) {
std::swap(indexA, indexB); _indexA = A;
_indexB = B;
} else {
_indexA = B;
_indexB = A;
} }
} }
bool operator==(const TriangleEdge& other) const {
return _indexA == other._indexA && _indexB == other._indexB;
}
uint32_t getIndexA() const { return _indexA; }
uint32_t getIndexB() const { return _indexB; }
private:
uint32_t _indexA { (uint32_t)(-1) };
uint32_t _indexB { (uint32_t)(-1) };
}; };
namespace std { namespace std {
template <> template <>
struct hash<TriangleEdge> { struct hash<TriangleEdge> {
std::size_t operator()(const TriangleEdge& edge) const { std::size_t operator()(const TriangleEdge& edge) const {
return (hash<int>()(edge.indexA) ^ (hash<int>()(edge.indexB) << 1)); // use Cantor's pairing function to generate a hash of ZxZ --> Z
uint32_t ab = edge.getIndexA() + edge.getIndexB();
return hash<int>()((ab * (ab + 1)) / 2 + edge.getIndexB());
} }
}; };
} }
@ -212,14 +226,12 @@ bool isClosedManifold(const std::vector<int>& triangleIndices) {
for (uint32_t i = 0; i < triangleIndices.size(); i += TRIANGLE_STRIDE) { for (uint32_t i = 0; i < triangleIndices.size(); i += TRIANGLE_STRIDE) {
TriangleEdge edge; TriangleEdge edge;
// the triangles indices are stored in sequential order // the triangles indices are stored in sequential order
for (int j = 0; j < 3; ++j) { for (uint32_t j = 0; j < 3; ++j) {
edge.indexA = triangleIndices[(int)i + j]; edge.setIndices(triangleIndices[i + j], triangleIndices[i + ((j + 1) % 3)]);
edge.indexB = triangleIndices[i + ((j + 1) % 3)];
edge.sortIndices();
EdgeList::iterator edgeEntry = edges.find(edge); EdgeList::iterator edgeEntry = edges.find(edge);
if (edgeEntry == edges.end()) { if (edgeEntry == edges.end()) {
edges.insert(std::pair<TriangleEdge, int>(edge, 1)); edges.insert(std::pair<TriangleEdge, uint32_t>(edge, 1));
} else { } else {
edgeEntry->second += 1; edgeEntry->second += 1;
} }
@ -243,6 +255,7 @@ void vhacd::VHACDUtil::getConvexResults(VHACD::IVHACD* convexifier, FBXMesh& res
// create an output meshPart for each convex hull // create an output meshPart for each convex hull
const uint32_t TRIANGLE_STRIDE = 3; const uint32_t TRIANGLE_STRIDE = 3;
const uint32_t POINT_STRIDE = 3;
for (uint32_t j = 0; j < numHulls; j++) { for (uint32_t j = 0; j < numHulls; j++) {
VHACD::IVHACD::ConvexHull hull; VHACD::IVHACD::ConvexHull hull;
convexifier->GetConvexHull(j, hull); convexifier->GetConvexHull(j, hull);
@ -251,20 +264,21 @@ void vhacd::VHACDUtil::getConvexResults(VHACD::IVHACD* convexifier, FBXMesh& res
FBXMeshPart& resultMeshPart = resultMesh.parts.last(); FBXMeshPart& resultMeshPart = resultMesh.parts.last();
int hullIndexStart = resultMesh.vertices.size(); int hullIndexStart = resultMesh.vertices.size();
for (uint32_t i = 0; i < hull.m_nPoints; i++) { resultMesh.vertices.reserve(hullIndexStart + hull.m_nPoints);
float x = hull.m_points[i * TRIANGLE_STRIDE]; uint32_t numIndices = hull.m_nPoints * POINT_STRIDE;
float y = hull.m_points[i * TRIANGLE_STRIDE + 1]; for (uint32_t i = 0; i < numIndices; i += POINT_STRIDE) {
float z = hull.m_points[i * TRIANGLE_STRIDE + 2]; float x = hull.m_points[i];
float y = hull.m_points[i + 1];
float z = hull.m_points[i + 2];
resultMesh.vertices.append(glm::vec3(x, y, z)); resultMesh.vertices.append(glm::vec3(x, y, z));
} }
for (uint32_t i = 0; i < hull.m_nTriangles; i++) { numIndices = hull.m_nTriangles * TRIANGLE_STRIDE;
int index0 = hull.m_triangles[i * TRIANGLE_STRIDE] + hullIndexStart; resultMeshPart.triangleIndices.reserve(resultMeshPart.triangleIndices.size() + numIndices);
int index1 = hull.m_triangles[i * TRIANGLE_STRIDE + 1] + hullIndexStart; for (uint32_t i = 0; i < numIndices; i += TRIANGLE_STRIDE) {
int index2 = hull.m_triangles[i * TRIANGLE_STRIDE + 2] + hullIndexStart; resultMeshPart.triangleIndices.append(hull.m_triangles[i] + hullIndexStart);
resultMeshPart.triangleIndices.append(index0); resultMeshPart.triangleIndices.append(hull.m_triangles[i + 1] + hullIndexStart);
resultMeshPart.triangleIndices.append(index1); resultMeshPart.triangleIndices.append(hull.m_triangles[i + 2] + hullIndexStart);
resultMeshPart.triangleIndices.append(index2);
} }
if (_verbose) { if (_verbose) {
qDebug() << " hull" << j << " vertices =" << hull.m_nPoints qDebug() << " hull" << j << " vertices =" << hull.m_nPoints
@ -419,7 +433,7 @@ bool vhacd::VHACDUtil::computeVHACD(FBXGeometry& geometry,
index = dupeIndexMap[index]; index = dupeIndexMap[index];
} }
// this time we don't care if the parts are close or not // this time we don't care if the parts are closed or not
uint32_t triangleCount = (uint32_t)(triangleIndices.size()) / TRIANGLE_STRIDE; uint32_t triangleCount = (uint32_t)(triangleIndices.size()) / TRIANGLE_STRIDE;
if (_verbose) { if (_verbose) {
qDebug() << " process remaining open parts =" << openParts.size() << ": " qDebug() << " process remaining open parts =" << openParts.size() << ": "

4
tools/vhacd-util/src/VHACDUtilApp.cpp
View file

@ -18,10 +18,6 @@
using namespace std; using namespace std;
using namespace VHACD; using namespace VHACD;
const int VHACD_RETURN_CODE_FAILURE_TO_READ = 1;
const int VHACD_RETURN_CODE_FAILURE_TO_WRITE = 2;
const int VHACD_RETURN_CODE_FAILURE_TO_CONVEXIFY = 3;
QString formatFloat(double n) { QString formatFloat(double n) {
// limit precision to 6, but don't output trailing zeros. // limit precision to 6, but don't output trailing zeros.

4
tools/vhacd-util/src/VHACDUtilApp.h
View file

@ -17,6 +17,10 @@
#include <FBXReader.h> #include <FBXReader.h>
const int VHACD_RETURN_CODE_FAILURE_TO_READ = 1;
const int VHACD_RETURN_CODE_FAILURE_TO_WRITE = 2;
const int VHACD_RETURN_CODE_FAILURE_TO_CONVEXIFY = 3;
class VHACDUtilApp : public QCoreApplication { class VHACDUtilApp : public QCoreApplication {
Q_OBJECT Q_OBJECT