Subversion Repositories gelsvn

Rev

Rev 191 | Only display areas with differences | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 191 Rev 192
1 
#include "CGLA/Mat4x4f.h"
 1 
#include "CGLA/Mat4x4f.h"
2 
#include "Util/ArgExtracter.h"
 2 
#include "Util/ArgExtracter.h"
3 
#include "Geometry/RGrid.h"
 3 
#include "Geometry/RGrid.h"
4 
#include "Geometry/load_raw.h"
 4 
#include "Geometry/load_raw.h"
5 
#include "Geometry/save_raw.h"
 5 
#include "Geometry/save_raw.h"
6 
#include "HMesh/obj_save.h"
 6 
#include "HMesh/obj_save.h"
7 
#include "HMesh/x3d_save.h"
 7 
#include "HMesh/x3d_save.h"
8 
#include "HMesh/caps_and_needles.h"
 8 
#include "HMesh/caps_and_needles.h"
9 
#include "HMesh/volume_polygonize.h"
 9 
#include "HMesh/volume_polygonize.h"
10 
#include "HMesh/triangulate.h"
 10 
#include "HMesh/triangulate.h"
11 
 
 11 
 
12 
using namespace CGLA;
 12 
using namespace CGLA;
13 
using namespace Util;
 13 
using namespace Util;
14 
using namespace HMesh;
 14 
using namespace HMesh;
15 
using namespace std;
 15 
using namespace std;
16 
using namespace Geometry;
 16 
using namespace Geometry;
17 
 
 17 
 
18 
typedef RGrid<unsigned char> RGridb;
 18 
typedef RGrid<unsigned char> RGridb;
19 
 
 19 
 
20 
int main(int argc, char**argv)
 20 
int main(int argc, char**argv)
21 
{
 21 
{
- 
 
 22
22 
		ArgExtracter ae(argc, argv);
 23 
		ArgExtracter ae(argc, argv);
23 
		float iso = 40;
 24 
		float iso = 40;
24 
		ae.extract("-i", iso);
 25 
		ae.extract("-i", iso);
25 
		int X  = 128;
 26 
		int X  = 128;
26 
		ae.extract("-x", X);
 27 
		ae.extract("-x", X);
27 
		int Y  = 128;
 28 
		int Y  = 128;
28 
		ae.extract("-y", Y);
 29 
		ae.extract("-y", Y);
29 
		int Z  = 62;
 30 
		int Z  = 62;
30 
		ae.extract("-z", Z);
 31 
		ae.extract("-z", Z);
- 
 
 32
- 
 
 33 
		string ofile = "../../data/isosurf.x3d";
- 
 
 34 
		ae.extract("-o", ofile);
- 
 
 35 
 
31 
		string file;
 36 
		string file;
32 
		if(ae.no_remaining_args()<2)
37 
		if(ae.no_remaining_args()<2)
33 
				file ="../../data/teddybear.raw";
 38 
				file ="../../data/teddybear.raw";
34 
		else
 39 
		else
35 
				file = ae.get_last_arg();
 40 
				file = ae.get_last_arg();
36
41
37 
		RGridb grid(Vec3i(X,Y,Z));
 42 
		RGridb grid(Vec3i(X,Y,Z));
38 
 
 43 
 
39 
//		RGridb grid(Vec3i(32));
 44 
//		RGridb grid(Vec3i(32));
40 
// 		srand(0);
 45 
// 		srand(0);
41 
// 		for(int i=0;i<32;++i)
 46 
// 		for(int i=0;i<32;++i)
42 
// 			for(int j=0;j<32;++j)
 47 
// 			for(int j=0;j<32;++j)
43 
// 				for(int k=0;k<32;++k)
48 
// 				for(int k=0;k<32;++k)
44 
// 					grid[Vec3i(i,j,k)] = 80.0 * rand()/double(RAND_MAX);
 49 
// 					grid[Vec3i(i,j,k)] = 80.0 * rand()/double(RAND_MAX);
45 
 
 50 
 
46 
 		cout << "loading " << file << endl;
 51 
 		cout << "loading " << file << endl;
47 
 		load_raw(file,grid);
 52 
 		load_raw(file,grid);
48 
//  		for(int i=0;i<X;++i)
 - 
 
49 
//  			for(int j=0;j<Y;++j)
 - 
 
50 
//  				for(int k=0;k<Z;++k)
- 
 
51 
// 						grid[Vec3i(i,j,k)] = _grid[Vec3i(i,j,k)];
 - 
 
52
53
53 
		cout << "Polygonizing, iso = " << iso << endl;
 54 
		cout << "Polygonizing, iso = " << iso << endl;
54 
		Manifold mani;
 55 
		Manifold mani;
55 
		cuberille_polygonize(grid, mani, iso, true);
 56 
		cuberille_polygonize(grid, mani, iso, true);
56 
		shortest_edge_triangulate(mani);
 57 
		shortest_edge_triangulate(mani);
57 
 
 58 
 
58 
		cout << "Saving" << endl;
 59 
		cout << "Saving" << endl;
59 
		x3d_save("../../data/isosurf.x3d", mani);
 60 
		x3d_save(ofile, mani);
60 
}
 61 
}
61 
 
 62