manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

corrected some simple warning and avoided collapse of edges of triangular faces for polygons

This commit is contained in:
nico 2021-08-31 21:38:59 +10:00
parent bd05cf0932
commit 4e3f08e134
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vcg/complex/algorithms/parametrization/tangent_field_operators.h
View File

@ -624,7 +624,7 @@ public:
do do
{ {
std::vector<int> new_queue; std::vector<int> new_queue;
for (int i=0; i<queue.size(); i++) for (size_t i=0; i<queue.size(); i++)
{ {
FaceType *f0=&(mesh.face[queue[i]]); FaceType *f0=&(mesh.face[queue[i]]);
assert(!f0->IsD()); assert(!f0->IsD());

8
vcg/complex/algorithms/polygonal_algorithms.h
View File

@ -1181,6 +1181,14 @@ public:
for (int j=0;j<poly_m.face[i].VN();j++) for (int j=0;j<poly_m.face[i].VN();j++)
valenceVertH[poly_m.face[i].V(j)]++; valenceVertH[poly_m.face[i].V(j)]++;
//cannot collapse triangular vertices otherwise will collapse to a segment
for (size_t i=0;i<poly_m.face.size();i++)
{
if (poly_m.face[i].VN()>3)continue;
for (int j=0;j<poly_m.face[i].VN();j++)
valenceVertH[poly_m.face[i].V(j)]=3;
}
//then re-elaborate the faces //then re-elaborate the faces
for (size_t i=0;i<poly_m.face.size();i++) for (size_t i=0;i<poly_m.face.size();i++)
{ {

2
vcg/container/simple_temporary_data.h
View File

@ -82,7 +82,7 @@ public:
void resize(size_t sz) void resize(size_t sz)
{ {
int oldDatasize = datasize; int oldDatasize = datasize;
if (sz <= oldDatasize) if ((int)sz <= oldDatasize)
return; return;
if (sz > datareserve) if (sz > datareserve)
reserve(sz); reserve(sz);