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

Merge pull request #766 from maxGimeno/LCC_Demo-MSAA_removal-GF 

Removal of the MSAA in LCC

Conflicts:
	GraphicsView/include/CGAL/Qt/CreateOpenGLContext.h
	Linear_cell_complex/demo/Linear_cell_complex/Viewer.cpp
This commit is contained in:
Laurent Rineau 2016-02-11 15:13:18 +01:00
parent ae84dec360 9da8afe1f1
commit 8b22743b06
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
GraphicsView/include/CGAL/Qt/CreateOpenGLContext.h
View File

@ -34,19 +34,6 @@ inline QGLContext* createOpenGLContext()
result->create(); result->create();
return result; return result;
} }
inline QGLContext* createOpenGLMSAAContext()
{
QOpenGLContext *context = new QOpenGLContext();
QSurfaceFormat format;
format.setVersion(2,1);
format.setProfile(QSurfaceFormat::CompatibilityProfile);
format.setSamples(16);
context->setFormat(format);
QGLContext *result = QGLContext::fromOpenGLContext(context);
result->create();
return result;
}
} // namespace Qt } // namespace Qt
} // namespace CGAL } // namespace CGAL
#endif #endif

2
Linear_cell_complex/demo/Linear_cell_complex/Viewer.cpp
View File

@ -28,7 +28,7 @@
#include <QDebug> #include <QDebug>
Viewer::Viewer(QWidget* parent) Viewer::Viewer(QWidget* parent)
: QGLViewer(CGAL::Qt::createOpenGLMSAAContext(),parent), wireframe(false), : QGLViewer(CGAL::Qt::createOpenGLContext(),parent), wireframe(false),
flatShading(true), edges(true), vertices(true), flatShading(true), edges(true), vertices(true),
m_previous_scene_empty(true), are_buffers_initialized(false) m_previous_scene_empty(true), are_buffers_initialized(false)
{ {