Relintai/fast_quadratic_mesh_simplifier
1
0
Fork 0
mirror of https://github.com/Relintai/fast_quadratic_mesh_simplifier.git synced 2025-02-19 15:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed smaller issues, also added a few temporary ERR_CONTINUE-s.

Browse Source
This commit is contained in:
Relintai 2020-03-09 16:42:40 +01:00
parent 2998216c17
commit 10213c726d
3 changed files with 51 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
fast_quadratic_mesh_simplifier.cpp
View File

@ -295,13 +295,17 @@ void FastQuadraticMeshSimplifier::update_mesh(int iteration) {
{ {
int dst = 0; int dst = 0;
for (int i = 0; i < _mu_triangles.size(); ++i) { for (int i = 0; i < _mu_triangles.size(); ++i) {
if (!_mu_triangles[i].deleted) { MUTriangle t = _mu_triangles[i];
if (!t.deleted) {
if (dst != i) { if (dst != i) {
_mu_triangles.set(dst, _mu_triangles[i]); _mu_triangles.set(dst, t);
} }
dst++;
++dst;
} }
} }
_mu_triangles.resize(dst); _mu_triangles.resize(dst);
} }
@ -326,8 +330,8 @@ void FastQuadraticMeshSimplifier::update_mesh(int iteration) {
int ofs = 0; int ofs = 0;
int id = 0; int id = 0;
int borderVertexCount = 0; int borderVertexCount = 0;
double borderMinX = std::numeric_limits<double>::min(); double borderMinX = std::numeric_limits<double>::max();
double borderMaxX = std::numeric_limits<double>::max(); double borderMaxX = std::numeric_limits<double>::min();
for (int i = 0; i < _mu_vertices.size(); i++) { for (int i = 0; i < _mu_vertices.size(); i++) {
MUVertex v = _mu_vertices[i]; MUVertex v = _mu_vertices[i];
@ -338,11 +342,11 @@ void FastQuadraticMeshSimplifier::update_mesh(int iteration) {
vids.resize(0); vids.resize(0);
vsize = 0; vsize = 0;
for (int j = 0; j < tcount; j++) { for (int j = 0; j < tcount; ++j) {
int tid = _mu_refs[tstart + j].tid; int tid = _mu_refs[tstart + j].tid;
MUTriangle t = _mu_triangles[tid]; MUTriangle t = _mu_triangles[tid];
for (int k = 0; k < 3; k++) { for (int k = 0; k < 3; ++k) {
ofs = 0; ofs = 0;
id = t.get(k); id = t.get(k);
@ -363,7 +367,7 @@ void FastQuadraticMeshSimplifier::update_mesh(int iteration) {
} }
} }
for (int j = 0; j < vsize; j++) { for (int j = 0; j < vsize; ++j) {
if (vcount[j] == 1) { if (vcount[j] == 1) {
id = vids[j]; id = vids[j];
@ -374,11 +378,12 @@ void FastQuadraticMeshSimplifier::update_mesh(int iteration) {
++borderVertexCount; ++borderVertexCount;
if (_enable_smart_link) { if (_enable_smart_link) {
if (v.p.x < borderMinX) { if (v.vertex.vertex.x < borderMinX) {
borderMinX = v.p.x; borderMinX = v.vertex.vertex.x;
} }
if (v.p.x > borderMaxX) {
borderMaxX = v.p.x; if (v.vertex.vertex.x > borderMaxX) {
borderMaxX = v.vertex.vertex.x;
} }
} }
} }
@ -389,14 +394,15 @@ void FastQuadraticMeshSimplifier::update_mesh(int iteration) {
// First find all border vertices // First find all border vertices
Vector<BorderVertex> borderVertices; Vector<BorderVertex> borderVertices;
borderVertices.resize(borderVertexCount); borderVertices.resize(borderVertexCount);
int borderIndexCount = 0; int borderIndexCount = 0;
double borderAreaWidth = borderMaxX - borderMinX; double borderAreaWidth = borderMaxX - borderMinX;
for (int i = 0; i < _mu_vertices.size(); i++) { for (int i = 0; i < _mu_vertices.size(); ++i) {
MUVertex mvi = _mu_vertices[i]; MUVertex mvi = _mu_vertices[i];
if (mvi.border_edge) { if (mvi.border_edge) {
int vertexHash = (int)(((((mvi.p.x - borderMinX) / borderAreaWidth) * 2.0) - 1.0) * std::numeric_limits<int>::max()); int vertexHash = (int)(((((mvi.vertex.vertex.x - borderMinX) / borderAreaWidth) * 2.0) - 1.0) * std::numeric_limits<int>::max());
borderVertices.set(borderIndexCount, BorderVertex(i, vertexHash)); borderVertices.set(borderIndexCount, BorderVertex(i, vertexHash));
++borderIndexCount; ++borderIndexCount;
} }
@ -416,7 +422,7 @@ void FastQuadraticMeshSimplifier::update_mesh(int iteration) {
if (myIndex == -1) if (myIndex == -1)
continue; continue;
Vector3 myPoint = _mu_vertices[myIndex].p; Vector3 myPoint = _mu_vertices[myIndex].vertex.vertex;
for (int j = i + 1; j < borderIndexCount; j++) { for (int j = i + 1; j < borderIndexCount; j++) {
@ -426,7 +432,7 @@ void FastQuadraticMeshSimplifier::update_mesh(int iteration) {
else if ((borderVertices[j].hash - borderVertices[i].hash) > hashMaxDistance) // There is no point to continue beyond this point else if ((borderVertices[j].hash - borderVertices[i].hash) > hashMaxDistance) // There is no point to continue beyond this point
break; break;
Vector3 otherPoint = _mu_vertices[otherIndex].p; Vector3 otherPoint = _mu_vertices[otherIndex].vertex.vertex;
double sqrX = ((myPoint.x - otherPoint.x) * (myPoint.x - otherPoint.x)); double sqrX = ((myPoint.x - otherPoint.x) * (myPoint.x - otherPoint.x));
double sqrY = ((myPoint.y - otherPoint.y) * (myPoint.y - otherPoint.y)); double sqrY = ((myPoint.y - otherPoint.y) * (myPoint.y - otherPoint.y));
double sqrZ = ((myPoint.z - otherPoint.z) * (myPoint.z - otherPoint.z)); double sqrZ = ((myPoint.z - otherPoint.z) * (myPoint.z - otherPoint.z));
@ -499,9 +505,9 @@ void FastQuadraticMeshSimplifier::update_mesh(int iteration) {
MUVertex vt1 = _mu_vertices[v1]; MUVertex vt1 = _mu_vertices[v1];
MUVertex vt2 = _mu_vertices[v2]; MUVertex vt2 = _mu_vertices[v2];
p0 = vt0.p; p0 = vt0.vertex.vertex;
p1 = vt1.p; p1 = vt1.vertex.vertex;
p2 = vt2.p; p2 = vt2.vertex.vertex;
p10 = p1 - p0; p10 = p1 - p0;
p20 = p2 - p0; p20 = p2 - p0;
@ -565,7 +571,7 @@ void FastQuadraticMeshSimplifier::update_references() {
} }
int tstart = 0; int tstart = 0;
for (int i = 0; i < _mu_vertices.size(); i++) { for (int i = 0; i < _mu_vertices.size(); ++i) {
MUVertex v = _mu_vertices[i]; MUVertex v = _mu_vertices[i];
v.tstart = tstart; v.tstart = tstart;
@ -576,7 +582,7 @@ void FastQuadraticMeshSimplifier::update_references() {
// Write References // Write References
_mu_refs.resize(tstart); _mu_refs.resize(tstart);
for (int i = 0; i < _mu_triangles.size(); i++) { for (int i = 0; i < _mu_triangles.size(); ++i) {
MUTriangle t = _mu_triangles[i]; MUTriangle t = _mu_triangles[i];
int start0 = _mu_vertices[t.v0].tstart; int start0 = _mu_vertices[t.v0].tstart;
@ -634,7 +640,7 @@ void FastQuadraticMeshSimplifier::compact_mesh() {
MUVertex d = _mu_vertices[iDest]; MUVertex d = _mu_vertices[iDest];
MUVertex s = _mu_vertices[iSrc]; MUVertex s = _mu_vertices[iSrc];
d.p = s.p; d.vertex = s.vertex;
_mu_vertices.set(iDest, d); _mu_vertices.set(iDest, d);
triangle.v0 = triangle.va0; triangle.v0 = triangle.va0;
@ -646,7 +652,7 @@ void FastQuadraticMeshSimplifier::compact_mesh() {
MUVertex d = _mu_vertices[iDest]; MUVertex d = _mu_vertices[iDest];
MUVertex s = _mu_vertices[iSrc]; MUVertex s = _mu_vertices[iSrc];
d.p = s.p; d.vertex = s.vertex;
_mu_vertices.set(iDest, d); _mu_vertices.set(iDest, d);
triangle.v1 = triangle.va1; triangle.v1 = triangle.va1;
@ -658,7 +664,7 @@ void FastQuadraticMeshSimplifier::compact_mesh() {
MUVertex d = _mu_vertices[iDest]; MUVertex d = _mu_vertices[iDest];
MUVertex s = _mu_vertices[iSrc]; MUVertex s = _mu_vertices[iSrc];
d.p = s.p; d.vertex = s.vertex;
_mu_vertices.set(iDest, d); _mu_vertices.set(iDest, d);
triangle.v2 = triangle.va2; triangle.v2 = triangle.va2;
@ -693,7 +699,7 @@ void FastQuadraticMeshSimplifier::compact_mesh() {
if (dst != i) { if (dst != i) {
MUVertex dv = _mu_vertices[dst]; MUVertex dv = _mu_vertices[dst];
dv.p = vert.p; dv.vertex = vert.vertex;
_mu_vertices.set(dst, dv); _mu_vertices.set(dst, dv);
if (_indices.size() > 0) _indices.set(dst, _indices[i]); if (_indices.size() > 0) _indices.set(dst, _indices[i]);
@ -720,8 +726,6 @@ bool FastQuadraticMeshSimplifier::are_uvs_the_same(int channel, int indexA, int
Vector2 uvb = _mu_vertices[indexB].vertex.uv; Vector2 uvb = _mu_vertices[indexB].vertex.uv;
return Math::is_equal_approx(uva.x, uvb.x) && Math::is_equal_approx(uva.y, uvb.y); return Math::is_equal_approx(uva.x, uvb.x) && Math::is_equal_approx(uva.y, uvb.y);
return false;
} }
/// Remove vertices and mark deleted triangles /// Remove vertices and mark deleted triangles
@ -786,10 +790,10 @@ void FastQuadraticMeshSimplifier::remove_vertex_pass(int startTrisCount, int tar
// Calculate the barycentric coordinates within the triangle // Calculate the barycentric coordinates within the triangle
int nextNextEdgeIndex = ((edgeIndex + 2) % 3); int nextNextEdgeIndex = ((edgeIndex + 2) % 3);
int i2 = t.get(nextNextEdgeIndex); int i2 = t.get(nextNextEdgeIndex);
barycentricCoord = calculate_barycentric_coords(p, v0.p, v1.p, _mu_vertices[i2].p); barycentricCoord = calculate_barycentric_coords(p, v0.vertex.vertex, v1.vertex.vertex, _mu_vertices[i2].vertex.vertex);
// Not flipped, so remove edge // Not flipped, so remove edge
v0.p = p; v0.vertex.vertex = p;
v0.q += v1.q; v0.q += v1.q;
// Interpolate the vertex attributes // Interpolate the vertex attributes
@ -837,11 +841,11 @@ void FastQuadraticMeshSimplifier::remove_vertex_pass(int startTrisCount, int tar
//return deletedTris; //return deletedTris;
} }
double FastQuadraticMeshSimplifier::vertex_error(SymmetricMatrix q, double x, double y, double z) { double FastQuadraticMeshSimplifier::vertex_error(const SymmetricMatrix &q, const double x, const double y, const double z) const {
return q.m0 * x * x + 2 * q.m1 * x * y + 2 * q.m2 * x * z + 2 * q.m3 * x + q.m4 * y * y + 2 * q.m5 * y * z + 2 * q.m6 * y + q.m7 * z * z + 2 * q.m8 * z + q.m9; return q.m0 * x * x + 2 * q.m1 * x * y + 2 * q.m2 * x * z + 2 * q.m3 * x + q.m4 * y * y + 2 * q.m5 * y * z + 2 * q.m6 * y + q.m7 * z * z + 2 * q.m8 * z + q.m9;
} }
double FastQuadraticMeshSimplifier::calculate_error(MUVertex vert0, MUVertex vert1, Vector3 *result) { double FastQuadraticMeshSimplifier::calculate_error(const MUVertex &vert0, const MUVertex &vert1, Vector3 *result) {
// compute interpolated vertex // compute interpolated vertex
SymmetricMatrix q = (vert0.q + vert1.q); SymmetricMatrix q = (vert0.q + vert1.q);
bool borderEdge = (vert0.border_edge & vert1.border_edge); bool borderEdge = (vert0.border_edge & vert1.border_edge);
@ -856,8 +860,8 @@ double FastQuadraticMeshSimplifier::calculate_error(MUVertex vert0, MUVertex ver
error = vertex_error(q, result->x, result->y, result->z); error = vertex_error(q, result->x, result->y, result->z);
} else { } else {
// det = 0 -> try to find best result // det = 0 -> try to find best result
Vector3 p1 = vert0.p; Vector3 p1 = vert0.vertex.vertex;
Vector3 p2 = vert1.p; Vector3 p2 = vert1.vertex.vertex;
Vector3 p3 = (p1 + p2) * 0.5f; Vector3 p3 = (p1 + p2) * 0.5f;
double error1 = vertex_error(q, p1.x, p1.y, p1.z); double error1 = vertex_error(q, p1.x, p1.y, p1.z);
double error2 = vertex_error(q, p2.x, p2.y, p2.z); double error2 = vertex_error(q, p2.x, p2.y, p2.z);
@ -889,20 +893,21 @@ void FastQuadraticMeshSimplifier::update_triangles(int i0, int ia0, const MUVert
Vector3 p; Vector3 p;
int tcount = v.tcount; int tcount = v.tcount;
for (int k = 0; k < tcount; k++) { for (int k = 0; k < tcount; ++k) {
MURef r = _mu_refs[v.tstart + k]; MURef r = _mu_refs[v.tstart + k];
int tid = r.tid; int tid = r.tid;
ERR_CONTINUE(r.tid >= _mu_triangles.size());
MUTriangle t = _mu_triangles[tid]; MUTriangle t = _mu_triangles[tid];
if (t.deleted) if (t.deleted)
continue; continue;
if (deleted->get(k)) { if (deleted->get(k)) {
MUTriangle t2 = _mu_triangles[tid]; t.deleted = true;
t2.deleted = true; _mu_triangles.set(tid, t);
_mu_triangles.set(tid, t2);
++(*deletedTriangles); ++(*deletedTriangles);
continue; continue;
@ -922,8 +927,6 @@ void FastQuadraticMeshSimplifier::update_triangles(int i0, int ia0, const MUVert
_mu_triangles.set(tid, t); _mu_triangles.set(tid, t);
_mu_refs.push_back(r); _mu_refs.push_back(r);
} }
//return deletedTriangles;
} }
bool FastQuadraticMeshSimplifier::flipped(const Vector3 &p, int i0, int i1, const MUVertex &v0, PoolVector<bool> *deleted) { bool FastQuadraticMeshSimplifier::flipped(const Vector3 &p, int i0, int i1, const MUVertex &v0, PoolVector<bool> *deleted) {
@ -931,6 +934,9 @@ bool FastQuadraticMeshSimplifier::flipped(const Vector3 &p, int i0, int i1, cons
for (int k = 0; k < tcount; k++) { for (int k = 0; k < tcount; k++) {
MURef r = _mu_refs[v0.tstart + k]; MURef r = _mu_refs[v0.tstart + k];
ERR_CONTINUE(r.tid >= _mu_triangles.size());
MUTriangle t = _mu_triangles[r.tid]; MUTriangle t = _mu_triangles[r.tid];
if (t.deleted) if (t.deleted)
@ -944,9 +950,9 @@ bool FastQuadraticMeshSimplifier::flipped(const Vector3 &p, int i0, int i1, cons
continue; continue;
} }
Vector3 d1 = _mu_vertices[id1].p - p; Vector3 d1 = _mu_vertices[id1].vertex.vertex - p;
d1.normalize(); d1.normalize();
Vector3 d2 = _mu_vertices[id2].p - p; Vector3 d2 = _mu_vertices[id2].vertex.vertex - p;
d2.normalize(); d2.normalize();
double dot = d1.dot(d2); double dot = d1.dot(d2);
if (Math::abs(dot) > 0.999) if (Math::abs(dot) > 0.999)

4
fast_quadratic_mesh_simplifier.h
View File

@ -70,8 +70,8 @@ public:
void remove_vertex_pass(int startTrisCount, int targetTrisCount, double threshold, PoolVector<bool> *deleted0, PoolVector<bool> *deleted1, int *deletedTris); void remove_vertex_pass(int startTrisCount, int targetTrisCount, double threshold, PoolVector<bool> *deleted0, PoolVector<bool> *deleted1, int *deletedTris);
void compact_mesh(); void compact_mesh();
bool are_uvs_the_same(int channel, int indexA, int indexB); bool are_uvs_the_same(int channel, int indexA, int indexB);
double vertex_error(SymmetricMatrix q, double x, double y, double z); double vertex_error(const SymmetricMatrix &q, const double x, const double y, const double z) const;
double calculate_error(MUVertex vert0, MUVertex vert1, Vector3 *result); double calculate_error(const MUVertex &vert0, const MUVertex &vert1, Vector3 *result);
void update_triangles(int i0, int ia0, const MUVertex &v, PoolVector<bool> *deleted, int *deletedTriangles); void update_triangles(int i0, int ia0, const MUVertex &v, PoolVector<bool> *deleted, int *deletedTriangles);
bool flipped(const Vector3 &p, int i0, int i1, const MUVertex &v0, PoolVector<bool> *deleted); bool flipped(const Vector3 &p, int i0, int i1, const MUVertex &v0, PoolVector<bool> *deleted);
static Vector3 calculate_barycentric_coords(Vector3 const &point, Vector3 const &a, Vector3 const &b, Vector3 const &c); static Vector3 calculate_barycentric_coords(Vector3 const &point, Vector3 const &a, Vector3 const &b, Vector3 const &c);

4
mesh_utils.h
View File

@ -435,7 +435,6 @@ struct MUTriangle {
}; };
struct MUVertex { struct MUVertex {
Vector3 p;
Vertex vertex; Vertex vertex;
int tstart; int tstart;
int tcount; int tcount;
@ -453,7 +452,7 @@ struct MUVertex {
} }
MUVertex(float x, float y, float z) { MUVertex(float x, float y, float z) {
p = Vector3(x, y, z); vertex.vertex = Vector3(x, y, z);
tstart = 0; tstart = 0;
tcount = 0; tcount = 0;
border_edge = true; border_edge = true;
@ -462,7 +461,6 @@ struct MUVertex {
} }
MUVertex(const Vertex &p_vertex) { MUVertex(const Vertex &p_vertex) {
p = p_vertex.vertex;
vertex = p_vertex; vertex = p_vertex;
tstart = 0; tstart = 0;
tcount = 0; tcount = 0;