lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-13 00:07:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restructured a bit the aging loop. Smoothed normals for better offset directions. Used update flags functions for sake of clarity.

Browse Source
This commit is contained in:
Paolo Cignoni cignoni 2008-05-08 23:47:11 +00:00
parent c7bfee6973
commit 939f5efbd7
1 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/fgt/filter_aging/filter_aging.cpp
View File

@ -32,10 +32,11 @@
/* VCG includes */
#include <vcg/complex/trimesh/update/position.h>
#include <vcg/complex/trimesh/update/selection.h>
#include <vcg/complex/trimesh/update/flag.h>
#include <vcg/complex/trimesh/stat.h>
#include <vcg/math/perlin_noise.h>
#include <vcg/complex/trimesh/clean.h>
#include <vcg/complex/trimesh/smooth.h>
/* Constructor */
GeometryAgingPlugin::GeometryAgingPlugin()
@ -178,7 +179,6 @@ bool GeometryAgingPlugin::applyFilter(QAction *filter, MeshModel &m, FilterParam
// edge predicate
AgingEdgePred ep = AgingEdgePred((useQuality?AgingEdgePred::QUALITY:AgingEdgePred::ANGLE),
selected, edgeLenTreshold, thresholdValue);
int fcount = 1; // face counter (to update progress bar)
switch(ID(filter)) {
case FP_ERODE:
@ -189,55 +189,58 @@ bool GeometryAgingPlugin::applyFilter(QAction *filter, MeshModel &m, FilterParam
if(selected) tri::UpdateSelection<CMeshO>::VertexFromFaceStrict(m.cm);
// clear vertexes V bit (will be used to mark the vertexes as displaced)
for(CMeshO::VertexIterator vi=m.cm.vert.begin(); vi!=m.cm.vert.end(); vi++)
if(!(*vi).IsD()) (*vi).ClearV();
tri::UpdateFlags<CMeshO>::VertexClearV(m.cm);
// displace vertexes
for(int i=0; i<dispSteps; i++) {
GridStaticPtr<CFaceO, CMeshO::ScalarType> gM;
gM.Set(m.cm.face.begin(), m.cm.face.end());
if(cb) (*cb)( (i+1)*100/dispSteps, "Aging...");
// blend toghether face normals and recompute vertex normal from these normals
// to get smoother offest directions
FaceNormalSmoothFF(m.cm,3);
tri::UpdateNormals<CMeshO>::PerVertexFromCurrentFaceNormal(m.cm);
tri::UpdateNormals<CMeshO>::NormalizeVertex(m.cm);
for(CMeshO::FaceIterator fi=m.cm.face.begin(); fi!=m.cm.face.end(); fi++) {
if(cb) (*cb)(((fcount++/dispSteps)/m.cm.fn)*100, "Aging...");
if((*fi).IsD()) continue;
for(int j=0; j<3; j++) {
if(ep.qaVertTest(face::Pos<CMeshO::FaceType>(&*fi,j)) &&
!(*fi).V(j)->IsV() &&
(!selected || ((*fi).IsS() && (*fi).FFp(j)->IsS())) ) {
double noise; // noise value
Point3f dispDir = (*fi).V(j)->N(); // displacement direction
!(*fi).V(j)->IsV() &&
(!selected || ((*fi).IsS() && (*fi).FFp(j)->IsS())) )
{
double noise; // noise value
Point3f dispDir = (*fi).V(j)->N(); // displacement direction
Point3f p = (*fi).V(j)->P() / noiseScale;
noise = generateNoiseValue(octaves, p);
// only values bigger than noiseClamp will be considered
noise = (noise<noiseClamp?0.0:(noise-noiseClamp));
Point3f p = (*fi).V(j)->P() / noiseScale;
noise = generateNoiseValue(octaves, p);
// only values bigger than noiseClamp will be considered
noise = (noise<noiseClamp?0.0:(noise-noiseClamp));
// displacement offset
Point3f offset = -(dispDir * chipDepth * noise) / dispSteps;
// displacement offset
Point3f offset = -(dispDir * chipDepth * noise) / dispSteps;
(*fi).V(j)->P() += offset;
if(faceIntersections(m.cm, face::Pos<CMeshO::FaceType>(&*fi,j), gM))
(*fi).V(j)->P() -= offset;
(*fi).V(j)->P() += offset;
if(faceIntersections(m.cm, face::Pos<CMeshO::FaceType>(&*fi,j), gM))
(*fi).V(j)->P() -= offset;
// mark as visited (displaced)
(*fi).V(j)->SetV();
}
// mark as visited (displaced)
(*fi).V(j)->SetV();
}
}
}
// clear vertexes V bit again
for(CMeshO::VertexIterator vi=m.cm.vert.begin(); vi!=m.cm.vert.end(); vi++)
if(!(*vi).IsD()) (*vi).ClearV();
tri::UpdateFlags<CMeshO>::VertexClearV(m.cm);
// update vertex normals
vcg::tri::UpdateNormals<CMeshO>::PerVertexNormalized(m.cm);
vcg::tri::UpdateNormals<CMeshO>::PerVertexNormalizedPerFace(m.cm);
}
// readjust selection
if(selected) tri::UpdateSelection<CMeshO>::VertexFromFaceLoose(m.cm);
// update all normals (face and vertex) before return
vcg::tri::UpdateNormals<CMeshO>::PerVertexNormalizedPerFace(m.cm);
return true;
default:
assert(0);