Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Box and Ellipse mask nodes will now output shape

Browse Source 
even if nothing is attached to input.

They'll use black image with render resolution
as a background if nothing is attached to mask input.

Was a request from 4K ToS project.
This commit is contained in:
Sergey Sharybin
2013-04-02 17:56:41 +00:00
parent f7efb51054
commit ed792b5de0
2 changed files with 75 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
source/blender/compositor/nodes/COM_BoxMaskNode.cpp
View File

@@ -24,6 +24,9 @@
#include "COM_BoxMaskOperation.h" #include "COM_BoxMaskOperation.h"
#include "COM_ExecutionSystem.h" #include "COM_ExecutionSystem.h"
#include "COM_SetValueOperation.h"
#include "COM_ScaleOperation.h"
BoxMaskNode::BoxMaskNode(bNode *editorNode) : Node(editorNode) BoxMaskNode::BoxMaskNode(bNode *editorNode) : Node(editorNode)
{ {
/* pass */ /* pass */
@@ -34,9 +37,41 @@ void BoxMaskNode::convertToOperations(ExecutionSystem *graph, CompositorContext
BoxMaskOperation *operation; BoxMaskOperation *operation;
operation = new BoxMaskOperation(); operation = new BoxMaskOperation();
operation->setData((NodeBoxMask *)this->getbNode()->storage); operation->setData((NodeBoxMask *)this->getbNode()->storage);
this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph);
InputSocket *inputSocket = this->getInputSocket(0);
OutputSocket *outputSocket = this->getOutputSocket(0);
if (inputSocket->isConnected()) {
inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph);
outputSocket->relinkConnections(operation->getOutputSocket());
}
else {
/* Value operation to produce original transparent image */
SetValueOperation *valueOperation = new SetValueOperation();
valueOperation->setValue(0.0f);
graph->addOperation(valueOperation);
/* Scale that image up to render resolution */
const RenderData *rd = context->getRenderData();
ScaleFixedSizeOperation *scaleOperation = new ScaleFixedSizeOperation();
scaleOperation->setIsAspect(false);
scaleOperation->setIsCrop(false);
scaleOperation->setOffset(0.0f, 0.0f);
scaleOperation->setNewWidth(rd->xsch * rd->size / 100.0f);
scaleOperation->setNewHeight(rd->ysch * rd->size / 100.0f);
addLink(graph, valueOperation->getOutputSocket(0), scaleOperation->getInputSocket(0));
addLink(graph, scaleOperation->getOutputSocket(0), operation->getInputSocket(0));
outputSocket->relinkConnections(operation->getOutputSocket(0));
scaleOperation->getInputSocket(0)->getConnection()->setIgnoreResizeCheck(true);
graph->addOperation(scaleOperation);
}
this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, graph); this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, graph);
this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0));
operation->setMaskType(this->getbNode()->custom1); operation->setMaskType(this->getbNode()->custom1);
graph->addOperation(operation); graph->addOperation(operation);

40
source/blender/compositor/nodes/COM_EllipseMaskNode.cpp
View File

@@ -24,6 +24,9 @@
#include "COM_EllipseMaskOperation.h" #include "COM_EllipseMaskOperation.h"
#include "COM_ExecutionSystem.h" #include "COM_ExecutionSystem.h"
#include "COM_SetValueOperation.h"
#include "COM_ScaleOperation.h"
EllipseMaskNode::EllipseMaskNode(bNode *editorNode) : Node(editorNode) EllipseMaskNode::EllipseMaskNode(bNode *editorNode) : Node(editorNode)
{ {
/* pass */ /* pass */
@@ -32,11 +35,44 @@ EllipseMaskNode::EllipseMaskNode(bNode *editorNode) : Node(editorNode)
void EllipseMaskNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context) void EllipseMaskNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
{ {
EllipseMaskOperation *operation; EllipseMaskOperation *operation;
operation = new EllipseMaskOperation(); operation = new EllipseMaskOperation();
operation->setData((NodeEllipseMask *)this->getbNode()->storage); operation->setData((NodeEllipseMask *)this->getbNode()->storage);
this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph);
InputSocket *inputSocket = this->getInputSocket(0);
OutputSocket *outputSocket = this->getOutputSocket(0);
if (inputSocket->isConnected()) {
inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph);
outputSocket->relinkConnections(operation->getOutputSocket());
}
else {
/* Value operation to produce original transparent image */
SetValueOperation *valueOperation = new SetValueOperation();
valueOperation->setValue(0.0f);
graph->addOperation(valueOperation);
/* Scale that image up to render resolution */
const RenderData *rd = context->getRenderData();
ScaleFixedSizeOperation *scaleOperation = new ScaleFixedSizeOperation();
scaleOperation->setIsAspect(false);
scaleOperation->setIsCrop(false);
scaleOperation->setOffset(0.0f, 0.0f);
scaleOperation->setNewWidth(rd->xsch * rd->size / 100.0f);
scaleOperation->setNewHeight(rd->ysch * rd->size / 100.0f);
addLink(graph, valueOperation->getOutputSocket(0), scaleOperation->getInputSocket(0));
addLink(graph, scaleOperation->getOutputSocket(0), operation->getInputSocket(0));
outputSocket->relinkConnections(operation->getOutputSocket(0));
scaleOperation->getInputSocket(0)->getConnection()->setIgnoreResizeCheck(true);
graph->addOperation(scaleOperation);
}
this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, graph); this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, graph);
this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0));
operation->setMaskType(this->getbNode()->custom1); operation->setMaskType(this->getbNode()->custom1);
graph->addOperation(operation); graph->addOperation(operation);