Commit 9b853c41 authored by Jan Möbius's avatar Jan Möbius

Qt5 port



git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free-Staging@19008 383ad7c9-94d9-4d36-a494-682f7c89f535
parent e7fab0df
...@@ -40,6 +40,8 @@ ...@@ -40,6 +40,8 @@
* * * *
\*===========================================================================*/ \*===========================================================================*/
#include <GL/glew.h>
#include "DeferredShading.hh" #include "DeferredShading.hh"
#include <OpenFlipper/common/GlobalOptions.hh> #include <OpenFlipper/common/GlobalOptions.hh>
...@@ -49,11 +51,6 @@ ...@@ -49,11 +51,6 @@
#include <ACG/GL/GLError.hh> #include <ACG/GL/GLError.hh>
#include <ACG/QtWidgets/QtColorChooserButton.hh> #include <ACG/QtWidgets/QtColorChooserButton.hh>
#undef QT_NO_OPENGL
#include <QGLFormat>
#define QT_NO_OPENGL
// ================================================= // =================================================
#define GBUFFER_INCLUDE_FILE "DeferredShading/GBufferAccess.glsl" #define GBUFFER_INCLUDE_FILE "DeferredShading/GBufferAccess.glsl"
...@@ -425,25 +422,7 @@ void DeferredShading::render(ACG::GLState* _glState, Viewer::ViewerProperties& _ ...@@ -425,25 +422,7 @@ void DeferredShading::render(ACG::GLState* _glState, Viewer::ViewerProperties& _
} }
QString DeferredShading::checkOpenGL() {
// Get version and check
QGLFormat::OpenGLVersionFlags flags = QGLFormat::openGLVersionFlags();
if ( !flags.testFlag(QGLFormat::OpenGL_Version_3_2) )
return QString("Insufficient OpenGL Version! OpenGL 3.2 or higher required");
// Check extensions
QString glExtensions = QString((const char*)glGetString(GL_EXTENSIONS));
QString missing("");
if ( !glExtensions.contains("GL_ARB_vertex_buffer_object") )
missing += "GL_ARB_vertex_buffer_object extension missing\n";
#ifndef __APPLE__
if ( !glExtensions.contains("GL_ARB_vertex_program") )
missing += "GL_ARB_vertex_program extension missing\n";
#endif
return missing;
}
void DeferredShading::reloadShaders() { void DeferredShading::reloadShaders() {
const int numShaders = 9; const int numShaders = 9;
...@@ -498,41 +477,7 @@ void DeferredShading::ViewerResources::resize( int _newWidth, int _newHeight, in ...@@ -498,41 +477,7 @@ void DeferredShading::ViewerResources::resize( int _newWidth, int _newHeight, in
_numSamples = scene_->setMultisampling(_numSamples, GL_TRUE); _numSamples = scene_->setMultisampling(_numSamples, GL_TRUE);
scene_->resize(_newWidth, _newHeight); scene_->resize(_newWidth, _newHeight);
}
QAction* DeferredShading::optionsAction() {
// QAction * action = new QAction("DeferredShading Renderer Options" , this );
//
// connect(action,SIGNAL(triggered( )),this,SLOT(reloadShaders( )));
//
// return action;
QMenu* menu = new QMenu("DeferredShading Renderer Options");
// Recreate actionGroup
QActionGroup* modeGroup = new QActionGroup( this );
modeGroup->setExclusive( true );
QAction * action = new QAction("0x MSAA" , modeGroup );
action->setCheckable( true );
action->setChecked(true);
action = new QAction("2x MSAA" , modeGroup );
action->setCheckable( true );
action = new QAction("4x MSAA" , modeGroup );
action->setCheckable( true );
action = new QAction("8x MSAA" , modeGroup );
action->setCheckable( true );
menu->addActions(modeGroup->actions());
connect(modeGroup,SIGNAL(triggered( QAction * )),this,SLOT(slotMSAASelection( QAction * )));
return menu->menuAction();
} }
void DeferredShading::slotMSAASelection( QAction * _action) { void DeferredShading::slotMSAASelection( QAction * _action) {
...@@ -557,3 +502,4 @@ void DeferredShading::slotMSAASelection( QAction * _action) { ...@@ -557,3 +502,4 @@ void DeferredShading::slotMSAASelection( QAction * _action) {
#if QT_VERSION < 0x050000 #if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN2( deferredshading , DeferredShading ); Q_EXPORT_PLUGIN2( deferredshading , DeferredShading );
#endif #endif
/*===========================================================================*\
* *
* OpenFlipper *
* Copyright (C) 2001-2014 by Computer Graphics Group, RWTH Aachen *
* www.openflipper.org *
* *
*--------------------------------------------------------------------------- *
* This file is part of OpenFlipper. *
* *
* OpenFlipper is free software: you can redistribute it and/or modify *
* it under the terms of the GNU Lesser General Public License as *
* published by the Free Software Foundation, either version 3 of *
* the License, or (at your option) any later version with the *
* following exceptions: *
* *
* If other files instantiate templates or use macros *
* or inline functions from this file, or you compile this file and *
* link it with other files to produce an executable, this file does *
* not by itself cause the resulting executable to be covered by the *
* GNU Lesser General Public License. This exception does not however *
* invalidate any other reasons why the executable file might be *
* covered by the GNU Lesser General Public License. *
* *
* OpenFlipper is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU Lesser General Public License for more details. *
* *
* You should have received a copy of the GNU LesserGeneral Public *
* License along with OpenFlipper. If not, *
* see <http://www.gnu.org/licenses/>. *
* *
\*===========================================================================*/
/*===========================================================================*\
* *
* $Revision: 18127 $ *
* $LastChangedBy: moebius $ *
* $Date: 2014-02-05 10:12:54 +0100 (Wed, 05 Feb 2014) $ *
* *
\*===========================================================================*/
/**
* @file Contains definitions that require qt headers which are incompatible
* with glew.h.
*/
#include "DeferredShading.hh"
#include <QGLFormat>
#include <QAction>
#include <QMenu>
QString DeferredShading::checkOpenGL() {
// Get version and check
QGLFormat::OpenGLVersionFlags flags = QGLFormat::openGLVersionFlags();
if ( !flags.testFlag(QGLFormat::OpenGL_Version_3_2) )
return QString("Insufficient OpenGL Version! OpenGL 3.2 or higher required");
// Check extensions
QString glExtensions = QString((const char*)glGetString(GL_EXTENSIONS));
QString missing("");
if ( !glExtensions.contains("GL_ARB_vertex_buffer_object") )
missing += "GL_ARB_vertex_buffer_object extension missing\n";
#ifndef __APPLE__
if ( !glExtensions.contains("GL_ARB_vertex_program") )
missing += "GL_ARB_vertex_program extension missing\n";
#endif
return missing;
}
QAction* DeferredShading::optionsAction() {
// QAction * action = new QAction("DeferredShading Renderer Options" , this );
//
// connect(action,SIGNAL(triggered( )),this,SLOT(reloadShaders( )));
//
// return action;
QMenu* menu = new QMenu("DeferredShading Renderer Options");
// Recreate actionGroup
QActionGroup* modeGroup = new QActionGroup( this );
modeGroup->setExclusive( true );
QAction * action = new QAction("0x MSAA" , modeGroup );
action->setCheckable( true );
action->setChecked(true);
action = new QAction("2x MSAA" , modeGroup );
action->setCheckable( true );
action = new QAction("4x MSAA" , modeGroup );
action->setCheckable( true );
action = new QAction("8x MSAA" , modeGroup );
action->setCheckable( true );
menu->addActions(modeGroup->actions());
connect(modeGroup,SIGNAL(triggered( QAction * )),this,SLOT(slotMSAASelection( QAction * )));
return menu->menuAction();
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment