Subversion Repositories gelsvn

Rev

Rev 363 | Rev 368 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 363 Rev 365
Line 38... Line 38...
38 
#include "GLGraphics/gel_glut.h"
 38 
#include "GLGraphics/gel_glut.h"
39 
#include "GLGraphics/QuatTrackBall.h"
 39 
#include "GLGraphics/QuatTrackBall.h"
40 
#include "GLGraphics/draw.h"
 40 
#include "GLGraphics/draw.h"
41 
#include "Geometry/TriMesh.h"
 41 
#include "Geometry/TriMesh.h"
42 
#include "Geometry/obj_load.h"
 42 
#include "Geometry/obj_load.h"
43 
 
 - 
 
- 
 
 43 
#include "HMesh/x3d_load.h"
44 
#include "ply_load.h"
 44 
#include "ply_load.h"
45 
 
 45 
 
46 
using namespace std;
 46 
using namespace std;
47 
using namespace CGLA;
 47 
using namespace CGLA;
48 
using namespace Geometry;
 48 
using namespace Geometry;
- 
 
 49 
using namespace HMesh;
49 
using namespace GLGraphics;
 50 
using namespace GLGraphics;
50 
 
 51 
 
51 
namespace
 52 
namespace
52 
{
 53 
{
53 
	int win_size_x = 800;
 54 
	int win_size_x = 800;
Line 366... Line 367...
366 
	}
 367 
	}
367 
	else if(fn.substr(fn.length()-4,fn.length())==".ply")
 368 
	else if(fn.substr(fn.length()-4,fn.length())==".ply")
368 
	{
 369 
	{
369 
		ply_load(fn, mesh);
 370 
		ply_load(fn, mesh);
370 
	}
371 
	}
- 
 
 372 
/*	else if(fn.substr(fn.length()-4,fn.length())==".x3d")
- 
 
 373 
	{
- 
 
 374 
		TriMesh mesh;
- 
 
 375 
		Manifold m;
- 
 
 376 
		x3d_load(fn, m);
- 
 
 377 
		for(FaceIter f = m.faces_begin(); f!= m.faces_end(); ++f)
- 
 
 378 
			{
- 
 
 379 
				mesh.
- 
 
 380 
			}
- 
 
 381 
	}
- 
 
 382 
	*/
371 
	else
 383 
	else
372 
	{
 384 
	{
373 
		cout << "Either the format was unrecognized or the file did not have the appropriate extension" << endl;
 385 
		cout << "Either the format was unrecognized or the file did not have the appropriate extension" << endl;
374 
		exit(0);
 386 
		exit(0);
375 
	}
387 
	}