Subversion Repositories gelsvn

Rev

Rev 309 | Rev 382 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 309 Rev 341
Line 11... Line 11...
11 
#include "Geometry/GridAlgorithm.h"
 11 
#include "Geometry/GridAlgorithm.h"
12 
#include "Geometry/build_bbtree.h"
 12 
#include "Geometry/build_bbtree.h"
13 
#include "Geometry/AABox.h"
 13 
#include "Geometry/AABox.h"
14 
 
 14 
 
15 
#include "HMesh/triangulate.h"
 15 
#include "HMesh/triangulate.h"
- 
 
 16 
 
- 
 
 17 
#include "HMesh/obj_load.h"
16 
#include "HMesh/x3d_load.h"
 18 
#include "HMesh/x3d_load.h"
17 
#include "HMesh/x3d_save.h"
 19 
#include "HMesh/x3d_save.h"
18 
 
 20 
 
19 
using namespace std;
 21 
using namespace std;
20 
using namespace HMesh;
 22 
using namespace HMesh;
Line 125... Line 127...
125 
	  ArgExtracter ae(argc, argv);
 127 
		ArgExtracter ae(argc, argv);
126 
 
 128
127 
	  do_aabb = ae.extract("-A");
 129 
		do_aabb = ae.extract("-A");
128 
	  do_ray_tests = ae.extract("-R");
 130 
		do_ray_tests = ae.extract("-R");
129 
	  flip_normals = ae.extract("-f");
 131 
		flip_normals = ae.extract("-f");
- 
 
 132 
		string file = ae.get_last_arg();
- 
 
 133 
		if(file.substr(file.length()-4,file.length())==".obj")
- 
 
 134 
		{
- 
 
 135 
			obj_load(file, m);
130 
 
 136 
		}
- 
 
 137 
		else
131 
	  x3d_load(ae.get_last_arg(), m);
 138 
			x3d_load(file, m);
132 
	}
 139 
	}
133 
    else
 140 
    else
134 
	{
 141 
	{
135 
	  string fn("../../data/bunny-little.x3d");
 142 
		string fn("../../data/bunny-little.x3d");
136 
	  x3d_load(fn, m);
 143 
		x3d_load(fn, m);