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

Revert "Fix for the context" 

This reverts commit 552aaa159f.

Conflicts:
	Linear_cell_complex/examples/Linear_cell_complex/linear_cell_complex_3_viewer_qt.h
This commit is contained in:
Maxime Gimeno 2016-02-11 14:16:04 +01:00
parent b8599c199a
commit 0a37521263
11 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@
#include <CGAL/Qt/CreateOpenGLContext.h> #include <CGAL/Qt/CreateOpenGLContext.h>
Viewer::Viewer(QWidget* parent) Viewer::Viewer(QWidget* parent)
: QGLViewer(CGAL::Qt::createOpenGLContext(parent),parent), : QGLViewer(CGAL::Qt::createOpenGLContext(),parent),
m_pScene(NULL), m_pScene(NULL),
m_custom_mouse(false) m_custom_mouse(false)
{ {

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

@ -5,7 +5,7 @@
#include "CGAL/Qt/CreateOpenGLContext.h" #include "CGAL/Qt/CreateOpenGLContext.h"
Viewer::Viewer(QWidget* parent) Viewer::Viewer(QWidget* parent)
: QGLViewer(CGAL::Qt::createOpenGLContext(parent),parent) : QGLViewer(CGAL::Qt::createOpenGLContext(),parent)
{ {
are_buffers_initialized = false; are_buffers_initialized = false;
} }

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

@ -7,7 +7,7 @@
Viewer::Viewer(QWidget* parent ) Viewer::Viewer(QWidget* parent )
: QGLViewer(CGAL::Qt::createOpenGLContext(parent),parent) : QGLViewer(CGAL::Qt::createOpenGLContext(),parent)
{ {
extension_is_found = false; extension_is_found = false;
} }

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

@ -23,9 +23,9 @@
#include <QGLContext> #include <QGLContext>
namespace CGAL{ namespace CGAL{
namespace Qt{ namespace Qt{
inline QGLContext* createOpenGLContext(QObject* parent) inline QGLContext* createOpenGLContext()
{ {
QOpenGLContext *context = new QOpenGLContext(parent); QOpenGLContext *context = new QOpenGLContext();
QSurfaceFormat format; QSurfaceFormat format;
format.setVersion(2,1); format.setVersion(2,1);
format.setProfile(QSurfaceFormat::CompatibilityProfile); format.setProfile(QSurfaceFormat::CompatibilityProfile);
@ -35,9 +35,9 @@ inline QGLContext* createOpenGLContext(QObject* parent)
return result; return result;
} }
inline QGLContext* createOpenGLMSAAContext(QObject* parent) inline QGLContext* createOpenGLMSAAContext()
{ {
QOpenGLContext *context = new QOpenGLContext(parent); QOpenGLContext *context = new QOpenGLContext();
QSurfaceFormat format; QSurfaceFormat format;
format.setVersion(2,1); format.setVersion(2,1);
format.setProfile(QSurfaceFormat::CompatibilityProfile); format.setProfile(QSurfaceFormat::CompatibilityProfile);

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),parent), wireframe(false), : QGLViewer(CGAL::Qt::createOpenGLMSAAContext(),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)
{ {

4
Linear_cell_complex/examples/Linear_cell_complex/linear_cell_complex_3_viewer_qt.h
View File

@ -153,8 +153,8 @@ class SimpleLCCViewerQt : public QGLViewer, public QOpenGLFunctions_2_1
public: public:
// Constructor/Destructor // Constructor/Destructor
SimpleLCCViewerQt(LCC& alcc, QObject* parent) : SimpleLCCViewerQt(LCC& alcc) :
QGLViewer(CGAL::Qt::createOpenGLContext(parent)), QGLViewer(CGAL::Qt::createOpenGLContext()),
lcc(alcc), lcc(alcc),
wireframe(false), wireframe(false),
flatShading(true), flatShading(true),

2
Mesh_3/demo/Mesh_3/src/CGAL_demo/Viewer.cpp
View File

@ -3,7 +3,7 @@
#include <CGAL/Qt/CreateOpenGLContext.h> #include <CGAL/Qt/CreateOpenGLContext.h>
Viewer::Viewer(QWidget* parent, bool antialiasing) Viewer::Viewer(QWidget* parent, bool antialiasing)
: QGLViewer(CGAL::Qt::createOpenGLContext(parent), parent), : QGLViewer(CGAL::Qt::createOpenGLContext(), parent),
scene(0), scene(0),
antialiasing(antialiasing), antialiasing(antialiasing),
twosides(false), twosides(false),

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

@ -2,7 +2,7 @@
#include <CGAL/Qt/CreateOpenGLContext.h> #include <CGAL/Qt/CreateOpenGLContext.h>
Viewer::Viewer(QWidget *parent) Viewer::Viewer(QWidget *parent)
: QGLViewer(CGAL::Qt::createOpenGLContext(parent),parent) : QGLViewer(CGAL::Qt::createOpenGLContext(),parent)
{} {}
Viewer::~Viewer() Viewer::~Viewer()
{} {}

2
Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/Viewer.h
View File

@ -22,7 +22,7 @@ class Viewer : public QGLViewer, QOpenGLFunctions_2_1 {
int nr_of_facets; int nr_of_facets;
public: public:
Viewer(QWidget* parent) Viewer(QWidget* parent)
: QGLViewer(CGAL::Qt::createOpenGLContext(parent), parent) : QGLViewer(CGAL::Qt::createOpenGLContext(), parent)
{} {}
~Viewer() ~Viewer()
{ {

2
Three/include/CGAL/Three/Viewer_interface.h
View File

@ -64,7 +64,7 @@ public:
NB_OF_PROGRAMS /** Holds the number of different programs in this enum.*/ NB_OF_PROGRAMS /** Holds the number of different programs in this enum.*/
}; };
Viewer_interface(QWidget* parent) : QGLViewer(CGAL::Qt::createOpenGLContext(parent), parent) {} Viewer_interface(QWidget* parent) : QGLViewer(CGAL::Qt::createOpenGLContext(), parent) {}
virtual ~Viewer_interface() {} virtual ~Viewer_interface() {}
//! Sets the scene for the viewer. //! Sets the scene for the viewer.

2
Triangulation_3/demo/Triangulation_3/Viewer.h
View File

@ -24,7 +24,7 @@ class Viewer : public QGLViewer, QOpenGLFunctions_2_1 {
public: public:
Viewer(QWidget* parent) Viewer(QWidget* parent)
: QGLViewer(CGAL::Qt::createOpenGLContext(parent),parent) : QGLViewer(CGAL::Qt::createOpenGLContext(),parent)
, m_showAxis(false) , m_showAxis(false)
, m_showVertex(true) , m_showVertex(true)
, m_showDEdge(true) , m_showDEdge(true)