Originally issue was discovered when using stabilization and movie distortion nodes, but in fact issue was caused by render layer node always doing nearest interpolation. Now made it so this node will respect sampler passed to it's executePixel function and do an interpolation. Added two new functions to do bilinear/bicubic interpolation in float buffer with variable number of components per element, so it could interpolate 1, 3 and 4 component vectors. This functions currently mostly duplicates the same functions from imageprocess.c and it should actually be de-duplicated. Think it's ok to leave a bit of time with such duplication, since functions should be generalized one more time to support byte buffers, which could backfire on readability. Also removed mark as complex from stabilization node, which isn't needed sine int fact this node is not complex.
102 lines
3.6 KiB
C++
102 lines
3.6 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_ScaleNode.h"
|
|
|
|
#include "COM_ScaleOperation.h"
|
|
#include "COM_ExecutionSystem.h"
|
|
#include "BKE_node.h"
|
|
#include "COM_SetValueOperation.h"
|
|
#include "COM_SetSamplerOperation.h"
|
|
|
|
ScaleNode::ScaleNode(bNode *editorNode) : Node(editorNode)
|
|
{
|
|
/* pass */
|
|
}
|
|
|
|
void ScaleNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
|
|
{
|
|
InputSocket *inputSocket = this->getInputSocket(0);
|
|
InputSocket *inputXSocket = this->getInputSocket(1);
|
|
InputSocket *inputYSocket = this->getInputSocket(2);
|
|
OutputSocket *outputSocket = this->getOutputSocket(0);
|
|
BaseScaleOperation *scaleoperation;
|
|
bNode *bnode = this->getbNode();
|
|
|
|
switch (bnode->custom1) {
|
|
case CMP_SCALE_RELATIVE: {
|
|
ScaleOperation *operation = new ScaleOperation();
|
|
|
|
inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph);
|
|
inputXSocket->relinkConnections(operation->getInputSocket(1), 1, graph);
|
|
inputYSocket->relinkConnections(operation->getInputSocket(2), 2, graph);
|
|
|
|
scaleoperation = operation;
|
|
}
|
|
break;
|
|
case CMP_SCALE_SCENEPERCENT: {
|
|
SetValueOperation *scaleFactorOperation = new SetValueOperation();
|
|
scaleFactorOperation->setValue(context->getRenderData()->size / 100.0f);
|
|
ScaleOperation *operation = new ScaleOperation();
|
|
inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph);
|
|
addLink(graph, scaleFactorOperation->getOutputSocket(), operation->getInputSocket(1));
|
|
addLink(graph, scaleFactorOperation->getOutputSocket(), operation->getInputSocket(2));
|
|
graph->addOperation(scaleFactorOperation);
|
|
|
|
scaleoperation = operation;
|
|
}
|
|
break;
|
|
|
|
case CMP_SCALE_RENDERPERCENT: {
|
|
const RenderData *rd = context->getRenderData();
|
|
ScaleFixedSizeOperation *operation = new ScaleFixedSizeOperation();
|
|
|
|
/* framing options */
|
|
operation->setIsAspect((bnode->custom2 & CMP_SCALE_RENDERSIZE_FRAME_ASPECT) != 0);
|
|
operation->setIsCrop((bnode->custom2 & CMP_SCALE_RENDERSIZE_FRAME_CROP) != 0);
|
|
operation->setOffset(bnode->custom3, bnode->custom4);
|
|
|
|
operation->setNewWidth(rd->xsch * rd->size / 100.0f);
|
|
operation->setNewHeight(rd->ysch * rd->size / 100.0f);
|
|
inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph);
|
|
operation->getInputSocket(0)->getConnection()->setIgnoreResizeCheck(true);
|
|
|
|
scaleoperation = operation;
|
|
}
|
|
break;
|
|
|
|
case CMP_SCALE_ABSOLUTE: {
|
|
ScaleAbsoluteOperation *operation = new ScaleAbsoluteOperation(); // TODO: what is the use of this one.... perhaps some issues when the ui was updated....
|
|
|
|
inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph);
|
|
inputXSocket->relinkConnections(operation->getInputSocket(1), 1, graph);
|
|
inputYSocket->relinkConnections(operation->getInputSocket(2), 2, graph);
|
|
|
|
scaleoperation = operation;
|
|
}
|
|
break;
|
|
}
|
|
|
|
outputSocket->relinkConnections(scaleoperation->getOutputSocket(0));
|
|
graph->addOperation(scaleoperation);
|
|
}
|