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

minor changes to voronoi remesher

This commit is contained in:
Luigi Malomo 2017-03-24 13:19:26 +01:00
parent 9eb6610f34
commit b4779b7151
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
vcg/complex/algorithms/voronoi_remesher.h
View File

@ -32,6 +32,7 @@
#include <vcg/complex/algorithms/voronoi_processing.h> #include <vcg/complex/algorithms/voronoi_processing.h>
#include <vcg/complex/algorithms/point_sampling.h> #include <vcg/complex/algorithms/point_sampling.h>
#include <vcg/complex/algorithms/crease_cut.h> #include <vcg/complex/algorithms/crease_cut.h>
#include <vcg/complex/algorithms/curve_on_manifold.h>
#include <memory> #include <memory>
#include <string> #include <string>
@ -43,7 +44,10 @@
#include <array> #include <array>
#include <utility> #include <utility>
//#define DEBUG_VORO 1 #define DEBUG_VORO 1
#include <wrap/io_trimesh/export.h>
#include <QString>
namespace vcg { namespace vcg {
namespace tri { namespace tri {
@ -142,7 +146,7 @@ public:
for (size_t i=0; i<ccs.size(); i++) for (size_t i=0; i<ccs.size(); i++)
{ {
std::cout << "Remeshing component " << (i+1) << "/" << ccs.size() << std::endl; std::cout << "Remeshing component " << (i+1) << "/" << ccs.size() << std::endl;
ccs[i] = RemeshOneCC(*ccs[i], samplingRadius, borderCreaseAngleThreshold); ccs[i] = RemeshOneCC(*ccs[i], samplingRadius, borderCreaseAngleThreshold, i);
} }
MeshPtr ret = std::make_shared<Mesh>(); MeshPtr ret = std::make_shared<Mesh>();
@ -161,7 +165,7 @@ public:
/// \param borderCreaseAngleThreshold is the angle treshold for preserving corner points on the mesh boundary /// \param borderCreaseAngleThreshold is the angle treshold for preserving corner points on the mesh boundary
/// \return the remeshed mesh /// \return the remeshed mesh
/// ///
static inline MeshPtr RemeshOneCC(Mesh & original, const ScalarType samplingRadius, const ScalarType borderCreaseAngleThreshold = 0.0) static inline MeshPtr RemeshOneCC(Mesh & original, const ScalarType samplingRadius, const ScalarType borderCreaseAngleThreshold = 0.0, int idx = 0)
{ {
RequireCompactness(original); RequireCompactness(original);
RequirePerFaceFlags(original); RequirePerFaceFlags(original);
@ -207,17 +211,9 @@ public:
TrivialSampler<EdgeMeshType> ps(borderSamples); TrivialSampler<EdgeMeshType> ps(borderSamples);
// uniform sampling // uniform sampling
// (use different sampling radius for the edges)
UpdateTopology<EdgeMeshType>::EdgeEdge(em); UpdateTopology<EdgeMeshType>::EdgeEdge(em);
SurfaceSampling<EdgeMeshType>::EdgeMeshUniform(em, ps, samplingRadius, true); SurfaceSampling<EdgeMeshType>::EdgeMeshUniform(em, ps, samplingRadius, true);
BuildMeshFromCoordVector(poissonEdgeMesh, borderSamples);
// convert to mesh
auto vi = Allocator<Mesh>::AddVertices(poissonEdgeMesh, borderSamples.size());
for (auto p : borderSamples)
{
vi->P() = CoordType::Construct(p);
vi++;
}
UpdateBounding<Mesh>::Box(poissonEdgeMesh); UpdateBounding<Mesh>::Box(poissonEdgeMesh);
// remove duplicate vertices // remove duplicate vertices
@ -484,6 +480,8 @@ protected:
const std::vector<bool> & seedFixed, const std::vector<bool> & seedFixed,
std::vector<VertexType *> & seedVVec) std::vector<VertexType *> & seedVVec)
{ {
// TODO mark here all seeds (cross-border)
typedef typename vcg::SpatialHashTable<VertexType, ScalarType> HashVertexGrid; typedef typename vcg::SpatialHashTable<VertexType, ScalarType> HashVertexGrid;
seedVVec.clear(); seedVVec.clear();