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

fix samples after removing using namespace in header files

This commit is contained in:
alemuntoni 2021-11-17 17:48:00 +01:00
parent 8de019c1e3
commit ad562ed9f1
8 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/sample/trimesh_attribute_saving/trimesh_attribute_saving.cpp
View File

@ -45,7 +45,7 @@ class MyMesh : public vcg::tri::TriMesh< std::vector<MyVertex>, std::vector<MyFa
int main() int main()
{ {
MyMesh m; MyMesh m;
Torus<MyMesh>(m, 3.0f, 1.0f); vcg::tri::Torus<MyMesh>(m, 3.0f, 1.0f);
//! [Adding a few attributes] //! [Adding a few attributes]
// add a per-vertex attribute with type float named "GaussianCurvature" // add a per-vertex attribute with type float named "GaussianCurvature"
MyMesh::PerVertexAttributeHandle<float> MyMesh::PerVertexAttributeHandle<float>

2
apps/sample/trimesh_hole/trimesh_hole.cpp
View File

@ -229,7 +229,7 @@ int main(int argc,char ** argv){
{ {
f1=f2; f1=f2;
f2++; f2++;
TriSplit<MyMesh,CenterPointBarycenter<MyMesh> >::Apply(vf[i],&(*f1),&(*f2),&(*vertp),CenterPointBarycenter<MyMesh>() ); vcg::tri::TriSplit<MyMesh,vcg::tri::CenterPointBarycenter<MyMesh> >::Apply(vf[i],&(*f1),&(*f2),&(*vertp),vcg::tri::CenterPointBarycenter<MyMesh>() );
f1->SetS(); f1->SetS();
f2->SetS(); f2->SetS();
for(int itr=0;itr<3;itr++) for(int itr=0;itr<3;itr++)

6
apps/sample/trimesh_intersection_mesh/trimesh_intersection_mesh.cpp
View File

@ -70,7 +70,7 @@ int main(int ,char **)
tri::UpdateSelection<MyMesh>::FaceDilate(m1); tri::UpdateSelection<MyMesh>::FaceDilate(m1);
tri::Clean<MyMesh>::SelectIntersectingFaces(m2,m1); tri::Clean<MyMesh>::SelectIntersectingFaces(m2,m1);
tri::UpdateSelection<MyMesh>::FaceDilate(m2); tri::UpdateSelection<MyMesh>::FaceDilate(m2);
IsotropicRemeshing<MyMesh>::Params params; vcg::tri::IsotropicRemeshing<MyMesh>::Params params;
float len = (tri::Stat<MyMesh>::ComputeFaceEdgeLengthAverage(m1,true) + tri::Stat<MyMesh>::ComputeFaceEdgeLengthAverage(m1,true)); float len = (tri::Stat<MyMesh>::ComputeFaceEdgeLengthAverage(m1,true) + tri::Stat<MyMesh>::ComputeFaceEdgeLengthAverage(m1,true));
params.SetTargetLen(len*0.8f); params.SetTargetLen(len*0.8f);
@ -78,8 +78,8 @@ int main(int ,char **)
params.iter=1; // just one iteration to avoid overtessellating. params.iter=1; // just one iteration to avoid overtessellating.
params.selectedOnly=true; params.selectedOnly=true;
printf(" Input mesh %8i v %8i f\n",m1.VN(),m1.FN()); printf(" Input mesh %8i v %8i f\n",m1.VN(),m1.FN());
IsotropicRemeshing<MyMesh>::Do(m1, params); vcg::tri::IsotropicRemeshing<MyMesh>::Do(m1, params);
IsotropicRemeshing<MyMesh>::Do(m2, params); vcg::tri::IsotropicRemeshing<MyMesh>::Do(m2, params);
printf(" Input mesh %8i v %8i f\n",m1.VN(),m1.FN()); printf(" Input mesh %8i v %8i f\n",m1.VN(),m1.FN());
} }
tri::Clean<MyMesh>::SelectIntersectingFaces(m1,m2); tri::Clean<MyMesh>::SelectIntersectingFaces(m1,m2);

6
apps/sample/trimesh_remeshing/trimesh_remeshing.cpp
View File

@ -75,7 +75,7 @@ int main( int argc, char **argv )
// Mesh cleaning // Mesh cleaning
tri::Clean<MyMesh>::RemoveUnreferencedVertex(original); tri::Clean<MyMesh>::RemoveUnreferencedVertex(original);
Allocator<MyMesh>::CompactEveryVector(original); vcg::tri::Allocator<MyMesh>::CompactEveryVector(original);
tri::UpdateNormal<MyMesh>::PerVertexNormalizedPerFaceNormalized(original); tri::UpdateNormal<MyMesh>::PerVertexNormalizedPerFaceNormalized(original);
@ -90,7 +90,7 @@ int main( int argc, char **argv )
float maxSurfDist = maxSurfDistPerc*(original.bbox.Diag()/100.f); float maxSurfDist = maxSurfDistPerc*(original.bbox.Diag()/100.f);
printf("Length Thr: %8.3f ~ %4.2f %% on %5.3f\n",lengthThr,targetLenPerc,original.bbox.Diag()); printf("Length Thr: %8.3f ~ %4.2f %% on %5.3f\n",lengthThr,targetLenPerc,original.bbox.Diag());
IsotropicRemeshing<MyMesh>::Params params; vcg::tri::IsotropicRemeshing<MyMesh>::Params params;
params.SetTargetLen(lengthThr); params.SetTargetLen(lengthThr);
params.SetFeatureAngleDeg(creaseAngle); params.SetFeatureAngleDeg(creaseAngle);
params.iter=iterNum; params.iter=iterNum;
@ -111,7 +111,7 @@ int main( int argc, char **argv )
printf(" Input mesh %8i v %8i f\n",toremesh.VN(),toremesh.FN()); printf(" Input mesh %8i v %8i f\n",toremesh.VN(),toremesh.FN());
IsotropicRemeshing<MyMesh>::Do(toremesh, original, params); vcg::tri::IsotropicRemeshing<MyMesh>::Do(toremesh, original, params);
vcg::tri::io::ExporterPLY<MyMesh>::Save(toremesh, "remesh.ply"); vcg::tri::io::ExporterPLY<MyMesh>::Save(toremesh, "remesh.ply");
printf("Output mesh %8i v %8i f\n",toremesh.VN(),toremesh.FN()); printf("Output mesh %8i v %8i f\n",toremesh.VN(),toremesh.FN());

2
apps/sample/trimesh_texture_clean/trimesh_texture_clean.cpp
View File

@ -53,7 +53,7 @@ int main(int ,char ** )
// generate a simple 2D grid // generate a simple 2D grid
Grid(m,20,20,1,1); Grid(m,20,20,1,1);
// assign it a simple planar parametrization // assign it a simple planar parametrization
tri:UpdateTexture<MyMesh>::WedgeTexFromPlane(m,Point3f(1.0f,0,0),Point3f(0,1.0f,0),true); tri::UpdateTexture<MyMesh>::WedgeTexFromPlane(m,Point3f(1.0f,0,0),Point3f(0,1.0f,0),true);
tri::io::ExporterOBJ<MyMesh>::Save(m,"grid_0.obj",mask); tri::io::ExporterOBJ<MyMesh>::Save(m,"grid_0.obj",mask);
// randomly perturb a few coord textures introducing fake seams // randomly perturb a few coord textures introducing fake seams

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

@ -475,8 +475,8 @@ bool TagFaceEdgeSelWithPolyLine(MeshType &poly,bool markFlag=true)
CoordType p0=f->P0(i); CoordType p0=f->P0(i);
CoordType p1=f->P1(i); CoordType p1=f->P1(i);
if (p0>p1) std::swap(p0,p1); if (p0>p1) std::swap(p0,p1);
if(edgeToPolyVertMap[make_pair(p0,p1)]) printf("Found an already used Edge %lu - %lu %lu!!!\n", tri::Index(base,f->V0(i)),tri::Index(base,f->V1(i)),tri::Index(poly,&*vi)); if(edgeToPolyVertMap[std::make_pair(p0,p1)]) printf("Found an already used Edge %lu - %lu %lu!!!\n", tri::Index(base,f->V0(i)),tri::Index(base,f->V1(i)),tri::Index(poly,&*vi));
edgeToPolyVertMap[make_pair(p0,p1)]=&*vi; edgeToPolyVertMap[std::make_pair(p0,p1)]=&*vi;
} }
} }
} }
@ -1136,7 +1136,7 @@ public:
CoordType p0 = ep.V()->P(); CoordType p0 = ep.V()->P();
CoordType p1 = ep.VFlip()->P(); CoordType p1 = ep.VFlip()->P();
if (p0>p1) std::swap(p0,p1); if (p0>p1) std::swap(p0,p1);
VertexPointer vp=edgeToPolyVertMap[make_pair(p0,p1)]; VertexPointer vp=edgeToPolyVertMap[std::make_pair(p0,p1)];
return vp!=0; return vp!=0;
} }
}; };
@ -1152,7 +1152,7 @@ public:
CoordType p0 = ep.V()->P(); CoordType p0 = ep.V()->P();
CoordType p1 = ep.VFlip()->P(); CoordType p1 = ep.VFlip()->P();
if (p0>p1) std::swap(p0,p1); if (p0>p1) std::swap(p0,p1);
VertexPointer vp=edgeToPolyVertMap[make_pair(p0,p1)]; VertexPointer vp=edgeToPolyVertMap[std::make_pair(p0,p1)];
assert(vp); assert(vp);
nv.P()=vp->P(); nv.P()=vp->P();
return; return;

4
vcg/complex/algorithms/implicit_smooth.h
View File

@ -260,7 +260,7 @@ public:
//add the entries for mass matrix //add the entries for mass matrix
if (SParam.useMassMatrix) if (SParam.useMassMatrix)
MeshToMatrix<MeshType>::MassMatrixEntry(mesh,IndexM,ValuesM,!SParam.SmoothQ); vcg::tri::MeshToMatrix<MeshType>::MassMatrixEntry(mesh,IndexM,ValuesM,!SParam.SmoothQ);
//then add entries for lagrange mult due to barycentric constraints //then add entries for lagrange mult due to barycentric constraints
for (size_t i=0;i<SParam.ConstrainedF.size();i++) for (size_t i=0;i<SParam.ConstrainedF.size();i++)
@ -313,7 +313,7 @@ public:
//get the entries for laplacian matrix //get the entries for laplacian matrix
std::vector<std::pair<int,int> > IndexL; std::vector<std::pair<int,int> > IndexL;
std::vector<ScalarType> ValuesL; std::vector<ScalarType> ValuesL;
MeshToMatrix<MeshType>::GetLaplacianMatrix(mesh,IndexL,ValuesL,SParam.useCotWeight,SParam.lapWeight,!SParam.SmoothQ); vcg::tri::MeshToMatrix<MeshType>::GetLaplacianMatrix(mesh,IndexL,ValuesL,SParam.useCotWeight,SParam.lapWeight,!SParam.SmoothQ);
//initialize sparse laplacian matrix //initialize sparse laplacian matrix
if (!SParam.SmoothQ) if (!SParam.SmoothQ)

4
vcg/complex/algorithms/update/halfedge_indexed.h
View File

@ -214,9 +214,9 @@ namespace vcg
for(typename MeshType::EdgeIterator ei1 = m.edge.begin(); ei1 != m.edge.end(); ++ei1 ) for(typename MeshType::EdgeIterator ei1 = m.edge.begin(); ei1 != m.edge.end(); ++ei1 )
{ {
vector<HEdgePointer> hedges = HalfEdgeTopology<MeshType>::get_incident_hedges((*ei1).V(0)); std::vector<HEdgePointer> hedges = HalfEdgeTopology<MeshType>::get_incident_hedges((*ei1).V(0));
for(typename vector<HEdgePointer>::iterator hi = hedges.begin(); hi != hedges.end(); ++hi) for(typename std::vector<HEdgePointer>::iterator hi = hedges.begin(); hi != hedges.end(); ++hi)
{ {
if((*hi)->HOp()->HVp() == (*ei1).V(1)) if((*hi)->HOp()->HVp() == (*ei1).V(1))
{ {