WebSVN – gelsvn – Diff – /trunk/apps/OBJViewer/objview.cpp

 #include "Geometry/TriMesh.h"
 #include "Geometry/obj_load.h"
 #include "Geometry/ply_load.h"
 #include "HMesh/x3d_load.h"
 #include "HMesh/FaceCirculator.h"
-#include "wireframe.h"
 using namespace std;
 using namespace CGLA;
 using namespace Geometry;
 using namespace HMesh;
     ball->set_gl_modelview();
 	if(do_wireframe)
+	{
 		if(GLEW_EXT_geometry_shader4)
-		{
-			enable_wireframe();
+			draw_triangles_in_wireframe(mesh, per_vertex_normals, Vec3f(1,0,0));
-			glCallList(l);
-			glUseProgram(0);
-		}
 		else
-		{
-			glDisable(GL_LIGHTING);
-			glColor3f(1,1,1);
-			glCallList(l);
-			glEnable(GL_POLYGON_OFFSET_LINE);
-			glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
+			draw_wireframe_oldfashioned(mesh, per_vertex_normals, Vec3f(1,0,0));
-			glColor3fv(line_col.get());
-			glPolygonOffset(0,-5);
-			glCallList(l);
-			glEnable(GL_LIGHTING);
-			glDisable(GL_POLYGON_OFFSET_LINE);
-			glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
-		}
+	}
 	else
 		glCallList(l);
     glutSwapBuffers();
 	// Setup projection
 	glMatrixMode(GL_PROJECTION);
 	glLoadIdentity();
 	gluPerspective(53,1.0f,r/100.0,r*3.0);
 	glMatrixMode(GL_MODELVIEW);
-	if(GLEW_EXT_geometry_shader4)
-		initialize_wireframe_shaders();
 	// Pass control to GLUT
 	glutMainLoop();
 	return 0;
+}

Subversion Repositories gelsvn