Commit 87ad99dc authored by Christopher Tenter's avatar Christopher Tenter

interface change fxaa

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free-Staging@19688 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 1d55edb5
......@@ -68,8 +68,15 @@ QString PostProcessorFXAAPlugin::postProcessorName() {
return QString("FXAA");
}
QString PostProcessorFXAAPlugin::checkOpenGL() {
if ( ! ACG::openGLVersion(3, 0) )
return QString("Insufficient OpenGL Version! OpenGL 3.0 or higher required");
void PostProcessorFXAAPlugin::postProcess(ACG::GLState* _glstate, const PostProcessorInput& _input, GLuint _targetFBO) {
return QString("");
}
void PostProcessorFXAAPlugin::postProcess(ACG::GLState* _glstate, const std::vector<const PostProcessorInput*>& _input, const PostProcessorOutput& _output) {
// ======================================================================================================
// Load shader if needed
......@@ -83,13 +90,14 @@ void PostProcessorFXAAPlugin::postProcess(ACG::GLState* _glstate, const PostProc
glActiveTexture(GL_TEXTURE0);
glEnable(GL_TEXTURE_2D);
glBindTexture(GL_TEXTURE_2D, _input.colorTex_);
glBindTexture(GL_TEXTURE_2D, _input[0]->colorTex_);
// ======================================================================================================
// Bind output FBO
// ======================================================================================================
glBindFramebuffer(GL_FRAMEBUFFER, _targetFBO);
glBindFramebuffer(GL_FRAMEBUFFER, _output.fbo_);
glDrawBuffer(_output.drawBuffer_);
// ======================================================================================================
// Clear rendering buffer
......@@ -113,7 +121,7 @@ void PostProcessorFXAAPlugin::postProcess(ACG::GLState* _glstate, const PostProc
fxaa_->use();
fxaa_->setUniform("textureSampler", 0);
ACG::Vec2f texcoordOffset(1.0f / float(_input.width), 1.0f / float(_input.height));
ACG::Vec2f texcoordOffset(1.0f / float(_input[0]->width), 1.0f / float(_input[0]->height));
fxaa_->setUniform("texcoordOffset", texcoordOffset);
// ======================================================================================================
......
......@@ -73,7 +73,7 @@ class PostProcessorFXAAPlugin : public QObject, BaseInterface, PostProcessorInte
private slots:
void postProcess(ACG::GLState* _glstate, const PostProcessorInput& _input, GLuint _targetFBO);
void postProcess(ACG::GLState* _glstate, const std::vector<const PostProcessorInput*>& _input, const PostProcessorOutput& _output);
QString postProcessorName();
......
/*===========================================================================*\
* *
* 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 of the PostProcessorFXAAPlugin 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