WebSVN – gelsvn – Diff – /trunk/src/GLGraphics/IDBufferWireFrameRenderer.cpp/

+/* ----------------------------------------------------------------------- *
-#include "CGLA/Vec4f.h"
+ * This file is part of GEL, http://www.imm.dtu.dk/GEL
-#include "CGLA/Vec2f.h"
+ * Copyright (C) the authors and DTU Informatics
-#include "CGLA/Vec3f.h"
+ * For license and list of authors, see ../../doc/intro.pdf
+ * ----------------------------------------------------------------------- */
 #include "IDBufferWireFrameRenderer.h"
+#include <CGLA/Vec4f.h>
+#include <CGLA/Vec2f.h>
-#include "glsl_shader.h"
+#include <CGLA/Vec3f.h>
 #include <HMesh/Manifold.h>
-#include <HMesh/FaceCirculator.h>
+#include <HMesh/AttributeVector.h>
 #include <GLGraphics/draw.h>
+#include "glsl_shader.h"
 using namespace std;
 using namespace CGLA;
 using namespace GLGraphics;
 using namespace HMesh;
-	IDBufferWireframeRenderer::IDBufferWireframeRenderer(int _XSZ, int _YSZ,
+    IDBufferWireframeRenderer::IDBufferWireframeRenderer(int _XSZ, int _YSZ,
-										 HMesh::Manifold& _mesh,
+        HMesh::Manifold& _mesh,
-										 float _thickness,
+        float _thickness,
-										 float _transition,
+        float _transition,
-										 int atten_mode):
+        int atten_mode):
-	mesh(_mesh), XSZ(_XSZ), YSZ(_YSZ), thickness(_thickness), transition(_transition)
+    mesh(&_mesh), XSZ(_XSZ), YSZ(_YSZ), thickness(_thickness), transition(_transition)
+    {
-		if(atten_mode == 0 && thickness == 0.0)
+        if(atten_mode == 0 && thickness == 0.0)
+        {
-			vs = create_glsl_shader(GL_VERTEX_SHADER, line_vert);
+            vs = create_glsl_shader(GL_VERTEX_SHADER, line_vert);
-		glGenBuffers(1, &line_id_attrib);
+        glGenBuffers(1, &line_id_attrib);
-		glGenBuffers(1, &line_vertex_pos);
+        glGenBuffers(1, &line_vertex_pos);
-		glGenBuffers(1, &line_disp_attrib);
+        glGenBuffers(1, &line_disp_attrib);
-		glGenBuffers(1, &line_opp_attrib);
+        glGenBuffers(1, &line_opp_attrib);
-		triangles = static_cast<int>(mesh.no_faces());
+        triangles = static_cast<int>(mesh->no_faces());
-		vector<Vec3f> verts;
+        vector<Vec3f> verts;
-		vector<Vec3f> cols;
+        vector<Vec3f> cols;
-		int i=0;
+        unsigned int k = 0;
-		for(FaceIter f = mesh.faces_begin(); f != mesh.faces_end(); ++f, ++i)
+        for(FaceIDIterator f = mesh->faces_begin(); f != mesh->faces_end(); ++f, ++k){
-		{
-			Vec3uc idv(id_get(i));
+            Vec3uc idv(id_get(k));
-			Vec3f idvec(idv[0]/255.0, idv[1]/255.0, idv[2]/255.0);
+            Vec3f idvec(idv[0]/255.0, idv[1]/255.0, idv[2]/255.0);
-			FaceCirculator fc(f);
+            for(Walker w = mesh->walker(*f); !w.full_circle(); w = w.circulate_face_ccw()){
-			while(!fc.end())
-			{
-				cols.push_back(idvec);
+                cols.push_back(idvec);
-				verts.push_back(fc.get_vertex()->pos);
+                verts.push_back(Vec3f(mesh->pos(w.vertex())));
-				++fc;
+            }
+        }
-		glBindBuffer(GL_ARRAY_BUFFER, vertex_buffername);
+        glBindBuffer(GL_ARRAY_BUFFER, vertex_buffername);
-		glBufferData(GL_ARRAY_BUFFER, sizeof(float)*3*verts.size(),
+        glBufferData(GL_ARRAY_BUFFER, sizeof(float)*3*verts.size(),
-					 (float*)&verts[0],GL_STATIC_DRAW);
+            (float*)&verts[0],GL_STATIC_DRAW);
-		vector<Vec2f> displacements;
+        vector<Vec2f> displacements;
-		vector<Vec3f> opposite_positions;
+        vector<Vec3f> opposite_positions;
-		quads = 0;
+        quads = 0;
-		mesh.enumerate_faces();
+        unsigned int i = 0;
-		for(FaceIter f=mesh.faces_begin(); f!=mesh.faces_end(); ++f)
+        for(FaceIDIterator f = mesh->faces_begin(); f != mesh->faces_end(); ++f,++i){
-		{
-			for(FaceCirculator fc(f); !fc.end(); ++fc)
+            for(Walker w = mesh->walker(*f); !w.full_circle(); w = w.circulate_face_ccw()){
-			{
-				++quads;
+                ++quads;
-				HalfEdgeIter h = fc.get_halfedge();
-				Vec3uc idv(id_get(h->face->touched));
+                Vec3uc idv(id_get(i));
-				Vec3f v0 = h->vert->pos;
+                Vec3f v0(mesh->pos(w.next().vertex()));
-				Vec3f v1 = h->opp->vert->pos;
+                Vec3f v1(mesh->pos(w.next().opp().vertex()));
-				Vec3f idvec(idv[0]/255.0, idv[1]/255.0, idv[2]/255.0);
+                Vec3f idvec(idv[0]/255.0, idv[1]/255.0, idv[2]/255.0);
-				line_ids.push_back(idvec);
+                line_ids.push_back(idvec);
-				opposite_positions.push_back(v0);
+                opposite_positions.push_back(v0);
-				displacements.push_back(Vec2f(1,-1));
+                displacements.push_back(Vec2f(1,-1));
-		glBindBuffer(GL_ARRAY_BUFFER, colors_buffername);
+        glBindBuffer(GL_ARRAY_BUFFER, colors_buffername);
-		glColorPointer(3,GL_FLOAT,0,static_cast<char*>(0));
+        glColorPointer(3,GL_FLOAT,0,static_cast<char*>(0));
-		glEnableClientState(GL_COLOR_ARRAY);
+        glEnableClientState(GL_COLOR_ARRAY);
-		int vertex_idx = 0;
+        int vertex_idx = 0;
-		for(FaceIter f=mesh.faces_begin(); f != mesh.faces_end(); ++f)
+        for(FaceIDIterator f = mesh->faces_begin(); f != mesh->faces_end(); ++f){
-		{
-			FaceCirculator fc(f);
-			glBegin(GL_POLYGON);
+            glBegin(GL_POLYGON);
-			while(!fc.end())
+            for(Walker w = mesh->walker(*f); !w.full_circle(); w = w.circulate_face_ccw())
-			{
-				glArrayElement(vertex_idx++);
+                 glArrayElement(vertex_idx++);
-				++fc;
-			}
-			glEnd();
+            glEnd();
+        }
-		glFinish();
+        glFinish();
-		glDisableClientState(GL_COLOR_ARRAY);
+        glDisableClientState(GL_COLOR_ARRAY);
-		glDisableClientState(GL_VERTEX_ARRAY);
+        glDisableClientState(GL_VERTEX_ARRAY);
-		glDepthFunc(GL_LEQUAL);
+        glDepthFunc(GL_LEQUAL);
-		glBlendEquation(GL_FUNC_ADD);
+        glBlendEquation(GL_FUNC_ADD);
-		glBlendFuncSeparate(GL_ONE_MINUS_DST_ALPHA, GL_DST_ALPHA,
+        glBlendFuncSeparate(GL_ONE_MINUS_DST_ALPHA, GL_DST_ALPHA,
-							GL_ZERO, GL_ONE);
+            GL_ZERO, GL_ONE);
-		if(lights_on)
+        if(lights_on)
+        {
-			glEnable(GL_LIGHTING);
+            glEnable(GL_LIGHTING);
+            glEnable(GL_LIGHT0);
-		else
+        }else
-			glColor4fv(current_color.get());
+            glColor4fv(current_color.get());
-		glBindBuffer(GL_ARRAY_BUFFER, vertex_buffername);
+        glBindBuffer(GL_ARRAY_BUFFER, vertex_buffername);
-		glVertexPointer(3,GL_FLOAT,0,static_cast<char*>(0));
+        glVertexPointer(3,GL_FLOAT,0,static_cast<char*>(0));
-		glEnableClientState(GL_VERTEX_ARRAY);
+        glEnableClientState(GL_VERTEX_ARRAY);
-		vertex_idx = 0;
+        vertex_idx = 0;
-		for(FaceIter f=mesh.faces_begin(); f != mesh.faces_end(); ++f)
+        for(FaceIDIterator f = mesh->faces_begin(); f != mesh->faces_end(); ++f){
-		{
-			FaceCirculator fc(f);
+			Vec3f n(normal(*mesh, *f));
+            glNormal3fv(n.get());
-			glBegin(GL_POLYGON);
+            glBegin(GL_POLYGON);
-			glNormal3fv(normal(f).get());
+            for(Walker w = mesh->walker(*f); !w.full_circle(); w = w.circulate_face_ccw())
-			while(!fc.end())
-			{
-				glArrayElement(vertex_idx++);
+                 glArrayElement(vertex_idx++);
-				++fc;
-			}
-			glEnd();
+            glEnd();
+        }
-		glDisableClientState(GL_VERTEX_ARRAY);
+        glDisableClientState(GL_VERTEX_ARRAY);
-		glDisable(GL_LIGHTING);
+        glDisable(GL_LIGHTING);

Subversion Repositories gelsvn

(root)/trunk/src/GLGraphics/IDBufferWireFrameRenderer.cpp/ – Rev 409 → 594