Commit e7fab0df authored by Jan Möbius's avatar Jan Möbius

Qt5 port



git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free-Staging@19007 383ad7c9-94d9-4d36-a494-682f7c89f535
parent a3bcc35e
......@@ -40,11 +40,7 @@
* *
\*===========================================================================*/
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <GL/glew.h>
#include "PostProcessorFXAAPlugin.hh"
......@@ -72,10 +68,6 @@ QString PostProcessorFXAAPlugin::postProcessorName() {
return QString("FXAA");
}
QString PostProcessorFXAAPlugin::checkOpenGL() {
return QString("");
}
void PostProcessorFXAAPlugin::postProcess(ACG::GLState* _glstate, const PostProcessorInput& _input, GLuint _targetFBO) {
......
......@@ -56,7 +56,7 @@ class PostProcessorFXAAPlugin : public QObject, BaseInterface, PostProcessorInte
Q_INTERFACES(PostProcessorInterface)
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "org.OpenFlipper.Plugins.Plugin-PostProcessorDepthImage")
Q_PLUGIN_METADATA(IID "org.OpenFlipper.Plugins.Plugin-PostProcessorFXAA")
#endif
public:
......
/*===========================================================================*\
* *
* 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 "PostProcessorFXAAPlugin.hh"
#include <QGLFormat>
QString PostProcessorFXAAPlugin::checkOpenGL() {
return QString("");
}
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