songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fir Surface_mesher demo for QGLViewer 2.7

This commit is contained in:
Maxime Gimeno 2017-06-27 16:03:23 +02:00
parent 609819b579
commit c64f5583bc
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Surface_mesher/demo/Surface_mesher/viewer.h
View File

@ -1,6 +1,7 @@
#ifndef _VIEWER_H #ifndef _VIEWER_H
#define _VIEWER_H #define _VIEWER_H
#include <QMap>
#include <QGLViewer/qglviewer.h> #include <QGLViewer/qglviewer.h>
class Surface; class Surface;

16
Surface_mesher/demo/Surface_mesher/volume.cpp
View File

@ -1243,7 +1243,9 @@ void Volume::draw()
if(!m_view_mc && m_draw_triangulation) if(!m_view_mc && m_draw_triangulation)
{ {
// draw the triangualtion // draw the triangualtion
mw->viewer->qglColor(m_triangulation_color); ::glColor3d(m_triangulation_color.redF(),
m_triangulation_color.greenF(),
m_triangulation_color.blueF());
::glLineWidth(1.0); ::glLineWidth(1.0);
::glBegin(GL_LINES); ::glBegin(GL_LINES);
for(Tr::Finite_edges_iterator for(Tr::Finite_edges_iterator
@ -1362,7 +1364,9 @@ void Volume::gl_draw_surface()
} else { } else {
::glNormal3d(n.x(),n.y(),n.z()); ::glNormal3d(n.x(),n.y(),n.z());
} }
mw->viewer->qglColor(values_list->color(values_list->search(facet_cell->info()))); ::glColor3d(values_list->color(values_list->search(facet_cell->info())).redF(),
values_list->color(values_list->search(facet_cell->info())).greenF(),
values_list->color(values_list->search(facet_cell->info())).blueF());
::glVertex3d(a.x(),a.y(),a.z()); ::glVertex3d(a.x(),a.y(),a.z());
::glVertex3d(b.x(),b.y(),b.z()); ::glVertex3d(b.x(),b.y(),b.z());
::glVertex3d(c.x(),c.y(),c.z()); ::glVertex3d(c.x(),c.y(),c.z());
@ -1378,7 +1382,9 @@ void Volume::gl_draw_surface()
{ {
if(values_list->enabled(i)) if(values_list->enabled(i))
{ {
mw->viewer->qglColor(values_list->color(i)); ::glColor3d(values_list->color(i).redF(),
values_list->color(i).greenF(),
values_list->color(i).blueF());
::glCallList(lists_draw_surface[i]); ::glCallList(lists_draw_surface[i]);
} }
} }
@ -1398,7 +1404,9 @@ void Volume::gl_draw_surface()
% lists_draw_surface[i] % lists_draw_surface[i]
% i; % i;
mw->viewer->qglColor(values_list->color(i)); ::glColor3d(values_list->color(i).redF(),
values_list->color(i).greenF(),
values_list->color(i).blueF());
if(!direct_draw && lists_draw_surface[i]) // If if(!direct_draw && lists_draw_surface[i]) // If
::glNewList(lists_draw_surface[i], // lists_draw_surface[i]==0 ::glNewList(lists_draw_surface[i], // lists_draw_surface[i]==0