- fix thumbnail preview (previously it showed only one input) - make SplitViewer node update even if the second input is not connected - now it works when the first socket is connected to a zero-sized node tree (e. g. Color Input node) - SplitViewer node is now based on 2 operations: SplitOperation and ViewerOperation. - ViewerBaseOperation was removed as a redundant one. Any future viewer style node can use the same principle and prepare the output before passing to an actual ViewerOperation. Thanks Lukas Toenne for reviewing this patch and giving me get few pieces of advice.
75 lines
2.8 KiB
C++
75 lines
2.8 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_SplitViewerNode.h"
|
|
#include "BKE_global.h"
|
|
|
|
#include "COM_SplitOperation.h"
|
|
#include "COM_ViewerOperation.h"
|
|
#include "COM_ExecutionSystem.h"
|
|
|
|
SplitViewerNode::SplitViewerNode(bNode *editorNode) : Node(editorNode)
|
|
{
|
|
/* pass */
|
|
}
|
|
|
|
void SplitViewerNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
|
|
{
|
|
bNode *editorNode = this->getbNode();
|
|
bool is_active = ((editorNode->flag & NODE_DO_OUTPUT_RECALC) &&
|
|
(editorNode->flag & NODE_DO_OUTPUT) && this->isInActiveGroup()) ||
|
|
context->isRendering();
|
|
|
|
InputSocket *image1Socket = this->getInputSocket(0);
|
|
InputSocket *image2Socket = this->getInputSocket(1);
|
|
Image *image = (Image *)this->getbNode()->id;
|
|
ImageUser *imageUser = (ImageUser *) this->getbNode()->storage;
|
|
|
|
SplitOperation *splitViewerOperation = new SplitOperation();
|
|
splitViewerOperation->setSplitPercentage(this->getbNode()->custom1);
|
|
splitViewerOperation->setXSplit(!this->getbNode()->custom2);
|
|
|
|
image1Socket->relinkConnections(splitViewerOperation->getInputSocket(0), 0, graph);
|
|
image2Socket->relinkConnections(splitViewerOperation->getInputSocket(1), 1, graph);
|
|
|
|
ViewerOperation *viewerOperation = new ViewerOperation();
|
|
viewerOperation->setImage(image);
|
|
viewerOperation->setImageUser(imageUser);
|
|
viewerOperation->setActive(is_active);
|
|
viewerOperation->setViewSettings(context->getViewSettings());
|
|
viewerOperation->setDisplaySettings(context->getDisplaySettings());
|
|
|
|
/* defaults - the viewer node has these options but not exposed for split view
|
|
* we could use the split to define an area of interest on one axis at least */
|
|
viewerOperation->setChunkOrder(COM_ORDER_OF_CHUNKS_DEFAULT);
|
|
viewerOperation->setCenterX(0.5f);
|
|
viewerOperation->setCenterY(0.5f);
|
|
|
|
addLink(graph, splitViewerOperation->getOutputSocket(), viewerOperation->getInputSocket(0));
|
|
|
|
if (is_active)
|
|
addPreviewOperation(graph, context, viewerOperation->getInputSocket(0));
|
|
|
|
graph->addOperation(splitViewerOperation);
|
|
graph->addOperation(viewerOperation);
|
|
}
|