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

WIP

This commit is contained in:
Maxime Gimeno 2021-01-12 11:05:10 +01:00
parent 78f1b28e41
commit 3ec3ffc518
2 changed files with 41 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
GraphicsView/include/CGAL/Qt/Basic_viewer_qt.h
View File

@ -54,27 +54,6 @@
namespace CGAL namespace CGAL
{ {
int& code_to_call_before_creation_of_QCoreApplication(int& i) {
QSurfaceFormat fmt;
#ifdef Q_OS_MAC
fmt.setVersion(4, 1);
#else
fmt.setVersion(4, 3);
#endif
fmt.setRenderableType(QSurfaceFormat::OpenGL);
fmt.setProfile(QSurfaceFormat::CoreProfile);
fmt.setOption(QSurfaceFormat::DebugContext);
QSurfaceFormat::setDefaultFormat(fmt);
//for windows
#if (QT_VERSION >= QT_VERSION_CHECK(5, 3, 0))
QCoreApplication::setAttribute(::Qt::AA_UseDesktopOpenGL);
#endif
//We set the locale to avoid any trouble with VTK
setlocale(LC_ALL, "C");
return i;
}
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
const char vertex_source_color[] = const char vertex_source_color[] =
{ {

41
GraphicsView/include/CGAL/Qt/Context_initialization.h Normal file
View File

@ -0,0 +1,41 @@
// Copyright (c) 2021 GeometryFactory Sarl (France).
// All rights reserved.
//
// This file is part of CGAL (www.cgal.org).
//
// $URL$
// $Id$
// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial
//
//
// Author(s) : Maxime Gimeno
#ifndef CGAL_QT_CONTEXT_INITIALIZATION_H
#define CGAL_QT_CONTEXT_INITIALIZATION_H
namespace CGAL
{
void init_ogl_context(int major, int minor) {
QSurfaceFormat fmt;
#ifdef Q_OS_MAC
fmt.setVersion(4, 1);
#else
fmt.setVersion(4, 3);
#endif
fmt.setRenderableType(QSurfaceFormat::OpenGL);
fmt.setProfile(QSurfaceFormat::CoreProfile);
fmt.setOption(QSurfaceFormat::DebugContext);
QSurfaceFormat::setDefaultFormat(fmt);
//for windows
#if (QT_VERSION >= QT_VERSION_CHECK(5, 3, 0))
QCoreApplication::setAttribute(::Qt::AA_UseDesktopOpenGL);
#endif
//We set the locale to avoid any trouble with VTK
setlocale(LC_ALL, "C");
return i;
}
}
#endif // CGAL_QT_CONTEXT_INITIALIZATION_H