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

Inserted report on progress.

This commit is contained in:
Federico Ponchio 2004-07-20 14:05:45 +00:00
parent 2df9700bbd
commit a4bfb515fd
1 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
apps/nexus/voronoiremap.cpp
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.3 2004/07/15 14:32:49 ponchio
Debug.
Revision 1.2 2004/07/05 15:49:39 ponchio Revision 1.2 2004/07/05 15:49:39 ponchio
Windows (DevCpp, mingw) port. Windows (DevCpp, mingw) port.
@ -47,14 +50,13 @@ Created
#include "pvoronoi.h" #include "pvoronoi.h"
#include "vert_remap.h" #include "vert_remap.h"
#include "crude.h" #include "crude.h"
#include "stopwatch.h"
#include "pintersect.h" #include "pintersect.h"
#include "report.h"
using namespace std; using namespace std;
using namespace nxs; using namespace nxs;
using namespace vcg; using namespace vcg;
StopWatch watch;
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
if(argc < 3) { if(argc < 3) {
@ -95,9 +97,9 @@ int main(int argc, char *argv[]) {
cerr << "Verts: " << crude.Vertices() << endl; cerr << "Verts: " << crude.Vertices() << endl;
cerr << "Faces: " << crude.Faces() << endl; cerr << "Faces: " << crude.Faces() << endl;
cerr << "Getting optimal radius...\n"; cerr << "Getting optimal radius...\n";
watch.Start();
Report report;
report.Start((unsigned int)0, 0);
vector<unsigned int> target; vector<unsigned int> target;
unsigned int patch_size = target_size; unsigned int patch_size = target_size;
@ -112,10 +114,7 @@ int main(int argc, char *argv[]) {
// for(unsigned int i = 0; i < radius.size(); i++) // for(unsigned int i = 0; i < radius.size(); i++)
// cerr << "Radius: " << radius[i] << endl; // cerr << "Radius: " << radius[i] << endl;
watch.Stop(); cerr << " ...done in " << report.Elapsed() << " secs\n";
cerr << " ...done in " << watch.Elapsed() << " secs\n";
watch.Reset();
watch.Start();
assert(radius.size() > 1); assert(radius.size() > 1);
//TODO cosa succede se c'e' una sola patch? //TODO cosa succede se c'e' una sola patch?
@ -127,6 +126,8 @@ int main(int argc, char *argv[]) {
part.Init(crude.GetBox()); part.Init(crude.GetBox());
chain.levels.push_back(part); chain.levels.push_back(part);
} }
report.Start(0, 0);
cerr << "Building voronoi partitions...";
//TODO move this part to pvoronoi (and create Crude::vert_iterator //TODO move this part to pvoronoi (and create Crude::vert_iterator
VFile<Point3f>::iterator iter; VFile<Point3f>::iterator iter;
@ -142,6 +143,7 @@ int main(int argc, char *argv[]) {
} }
} }
cerr << "...done in " << report.Elapsed() << " secs\n";
VFile<unsigned int> face_remap; VFile<unsigned int> face_remap;
if(!face_remap.Create(output + ".rmf")) { if(!face_remap.Create(output + ".rmf")) {
@ -153,6 +155,7 @@ int main(int argc, char *argv[]) {
PIntersect<VoronoiPartition> inter(chain.levels[0], chain.levels[1]); PIntersect<VoronoiPartition> inter(chain.levels[0], chain.levels[1]);
report.Start(crude.Faces(), 100000);
cerr << "Splitting faces... "; cerr << "Splitting faces... ";
Point3f bari; Point3f bari;
@ -160,12 +163,10 @@ int main(int argc, char *argv[]) {
bari = crude.GetBari(i); bari = crude.GetBari(i);
unsigned int patch = inter.Locate(bari); unsigned int patch = inter.Locate(bari);
face_remap[i] = patch; face_remap[i] = patch;
report.Output(i);
} }
watch.Stop(); cerr << "done in " << report.Elapsed() << " secs\n";
cerr << "done in " << watch.Elapsed() << " secs\n";
watch.Reset();
watch.Start();
//TODO Prune inter to threshold and relocate faces //TODO Prune inter to threshold and relocate faces
@ -177,27 +178,22 @@ int main(int argc, char *argv[]) {
vert_remap.Resize(crude.vert.Size()); vert_remap.Resize(crude.vert.Size());
cerr << "Splitting vertices... "; cerr << "Splitting vertices... ";
report.Start(crude.Faces(), 100000);
unsigned int totvert = 0; unsigned int totvert = 0;
for(unsigned int i = 0; i < crude.Faces(); i++) { for(unsigned int i = 0; i < crude.Faces(); i++) {
report.Output(i);
Crude::Face &face = crude.GetFace(i); Crude::Face &face = crude.GetFace(i);
unsigned int patch = face_remap[i]; unsigned int patch = face_remap[i];
if((i % 10000) == 0)
cerr << "inserting: " << i << endl;
for(int k = 0; k < 3; k++) { for(int k = 0; k < 3; k++) {
//DEBUG:
set<unsigned int> pp; set<unsigned int> pp;
vert_remap.GetValues(face[k], pp); vert_remap.GetValues(face[k], pp);
if(!pp.count(patch)) if(!pp.count(patch))
totvert++; totvert++;
vert_remap.Insert(face[k], patch); vert_remap.Insert(face[k], patch);
// if(i > 240000 && (i%100)==0) {
// cerr << "inserted " << i << " face: " << face[k] << " \n";
// }
} }
} }
watch.Stop(); cerr << "done in " << report.Elapsed() << " secs\n";
cerr << "done in " << watch.Elapsed() << " secs\n";
cerr << "Tot vertices: " << totvert << endl; cerr << "Tot vertices: " << totvert << endl;
chain.Save(output + ".chn"); chain.Save(output + ".chn");