The area-of-interest calculation for that node didn't work reliably. It tries to estimate the distorted rectangular area based on min/max distortion and dispersion values, but this fails in some cases and leaves uninitialized buffer chunks. So now simply use the full input rect as the area, even though it may not be as efficient - at least it works ... Also cleaned up the code somewhat to make it understandable, using separate functions for common stuff instead of cryptic walls of math.
68 lines
2.5 KiB
C++
68 lines
2.5 KiB
C++
/*
|
|
* Copyright 2011, Blender Foundation.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program 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 General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*
|
|
* Contributor:
|
|
* Jeroen Bakker
|
|
* Monique Dewanchand
|
|
*/
|
|
|
|
#include "COM_LensDistortionNode.h"
|
|
#include "COM_ExecutionSystem.h"
|
|
#include "COM_ProjectorLensDistortionOperation.h"
|
|
#include "COM_ScreenLensDistortionOperation.h"
|
|
|
|
LensDistortionNode::LensDistortionNode(bNode *editorNode) : Node(editorNode)
|
|
{
|
|
/* pass */
|
|
}
|
|
|
|
void LensDistortionNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
|
|
{
|
|
bNode *editorNode = this->getbNode();
|
|
NodeLensDist *data = (NodeLensDist *)editorNode->storage;
|
|
if (data->proj) {
|
|
ProjectorLensDistortionOperation *operation = new ProjectorLensDistortionOperation();
|
|
operation->setbNode(editorNode);
|
|
this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph);
|
|
this->getInputSocket(2)->relinkConnections(operation->getInputSocket(1), 2, graph);
|
|
this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0));
|
|
|
|
graph->addOperation(operation);
|
|
|
|
}
|
|
else {
|
|
ScreenLensDistortionOperation *operation = new ScreenLensDistortionOperation();
|
|
operation->setbNode(editorNode);
|
|
operation->setFit(data->fit);
|
|
operation->setJitter(data->jit);
|
|
|
|
if (!getInputSocket(1)->isConnected())
|
|
operation->setDistortion(getInputSocket(1)->getEditorValueFloat());
|
|
if (!getInputSocket(2)->isConnected())
|
|
operation->setDispersion(getInputSocket(2)->getEditorValueFloat());
|
|
|
|
this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph);
|
|
this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, graph);
|
|
this->getInputSocket(2)->relinkConnections(operation->getInputSocket(2), 2, graph);
|
|
|
|
this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0));
|
|
|
|
graph->addOperation(operation);
|
|
}
|
|
|
|
}
|