archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

* fixed defocus background blurin...

Browse Source
This commit is contained in:
Jeroen Bakker
2012-06-19 09:52:52 +00:00
parent 340489d29f
commit bb7b8bed8a
4 changed files with 48 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
source/blender/compositor/nodes/COM_BokehBlurNode.cpp
View File

@@ -37,24 +37,24 @@ BokehBlurNode::BokehBlurNode(bNode *editorNode) : Node(editorNode)
void BokehBlurNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
{
Object *camob = context->getScene()->camera;
// Object *camob = context->getScene()->camera;
if (this->getInputSocket(2)->isConnected()) {
VariableSizeBokehBlurOperation *operation = new VariableSizeBokehBlurOperation();
ConvertDepthToRadiusOperation *converter = new ConvertDepthToRadiusOperation();
converter->setfStop(this->getbNode()->custom3);
converter->setCameraObject(camob);
operation->setMaxBlur((int)this->getbNode()->custom4);
operation->setQuality(context->getQuality());
this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph);
this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, graph);
this->getInputSocket(2)->relinkConnections(converter->getInputSocket(0), 2, graph);
addLink(graph, converter->getOutputSocket(), operation->getInputSocket(2));
graph->addOperation(operation);
graph->addOperation(converter);
this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket());
}
else {
// if (this->getInputSocket(2)->isConnected()) {
// VariableSizeBokehBlurOperation *operation = new VariableSizeBokehBlurOperation();
// ConvertDepthToRadiusOperation *converter = new ConvertDepthToRadiusOperation();
// converter->setfStop(this->getbNode()->custom3);
// converter->setCameraObject(camob);
// operation->setMaxBlur((int)this->getbNode()->custom4);
// operation->setQuality(context->getQuality());
// this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph);
// this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, graph);
// this->getInputSocket(2)->relinkConnections(converter->getInputSocket(0), 2, graph);
// addLink(graph, converter->getOutputSocket(), operation->getInputSocket(2));
// graph->addOperation(operation);
// graph->addOperation(converter);
// this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket());
// }
// else {
BokehBlurOperation *operation = new BokehBlurOperation();
this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph);
this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, graph);
@@ -63,5 +63,5 @@ void BokehBlurNode::convertToOperations(ExecutionSystem *graph, CompositorContex
operation->setQuality(context->getQuality());
graph->addOperation(operation);
this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket());
}
// }
}

1
source/blender/compositor/nodes/COM_DefocusNode.cpp
View File

@@ -96,6 +96,7 @@ void DefocusNode::convertToOperations(ExecutionSystem *graph, CompositorContext
operation->setThreshold(data->bthresh);
addLink(graph, bokeh->getOutputSocket(), operation->getInputSocket(1));
addLink(graph, radiusOperation->getOutputSocket(), operation->getInputSocket(2));
addLink(graph, radiusOperation->getInputSocket(0)->getConnection()->getFromSocket(), operation->getInputSocket(3));
if (data->gamco) {
GammaCorrectOperation *correct = new GammaCorrectOperation();
GammaUncorrectOperation *inverse = new GammaUncorrectOperation();

44
source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
View File

@@ -31,13 +31,15 @@ VariableSizeBokehBlurOperation::VariableSizeBokehBlurOperation() : NodeOperation
{
this->addInputSocket(COM_DT_COLOR);
this->addInputSocket(COM_DT_COLOR, COM_SC_NO_RESIZE); // do not resize the bokeh image.
this->addInputSocket(COM_DT_VALUE);
this->addInputSocket(COM_DT_VALUE); // radius
this->addInputSocket(COM_DT_VALUE); // depth
this->addOutputSocket(COM_DT_COLOR);
this->setComplex(true);
this->inputProgram = NULL;
this->inputBokehProgram = NULL;
this->inputSizeProgram = NULL;
this->inputDepthProgram = NULL;
this->maxBlur = 32.0f;
this->threshold = 1.0f;
}
@@ -48,6 +50,7 @@ void VariableSizeBokehBlurOperation::initExecution()
this->inputProgram = getInputSocketReader(0);
this->inputBokehProgram = getInputSocketReader(1);
this->inputSizeProgram = getInputSocketReader(2);
this->inputDepthProgram = getInputSocketReader(3);
QualityStepHelper::initExecution(COM_QH_INCREASE);
}
@@ -56,7 +59,7 @@ void VariableSizeBokehBlurOperation::executePixel(float *color, int x, int y, Me
float readColor[4];
float bokeh[4];
float tempSize[4];
float tempSizeCenter[4];
float tempDepth[4];
float multiplier_accum[4] = {0.0f, 0.0f, 0.0f, 0.0f};
float color_accum[4] = {0.0f, 0.0f, 0.0f, 0.0f};
@@ -65,29 +68,34 @@ void VariableSizeBokehBlurOperation::executePixel(float *color, int x, int y, Me
int minx = x - maxBlur;
int maxx = x + maxBlur;
{
inputSizeProgram->read(tempSizeCenter, x, y, COM_PS_NEAREST, inputBuffers);
inputSizeProgram->read(tempSize, x, y, COM_PS_NEAREST, inputBuffers);
inputDepthProgram->read(tempDepth, x, y, COM_PS_NEAREST, inputBuffers);
inputProgram->read(readColor, x, y, COM_PS_NEAREST, inputBuffers);
add_v4_v4(color_accum, readColor);
add_v4_fl(multiplier_accum, 1.0f);
float sizeCenter = tempSizeCenter[0];
float sizeCenter = tempSize[0];
float centerDepth = tempDepth[0]+threshold;
for (int ny = miny; ny < maxy; ny += QualityStepHelper::getStep()) {
for (int nx = minx; nx < maxx; nx += QualityStepHelper::getStep()) {
if (nx >= 0 && nx < this->getWidth() && ny >= 0 && ny < getHeight()) {
inputDepthProgram->read(tempDepth, nx, ny, COM_PS_NEAREST, inputBuffers);
inputSizeProgram->read(tempSize, nx, ny, COM_PS_NEAREST, inputBuffers);
float size = tempSize[0];
if ((sizeCenter > threshold && size > threshold) || size <= threshold) {
float dx = nx - x;
float dy = ny - y;
if (nx == x && ny == y) {
}
else if (size >= fabsf(dx) && size >= fabsf(dy)) {
float u = 256 + dx * 256 / size;
float v = 256 + dy * 256 / size;
inputBokehProgram->read(bokeh, u, v, COM_PS_NEAREST, inputBuffers);
inputProgram->read(readColor, nx, ny, COM_PS_NEAREST, inputBuffers);
madd_v4_v4v4(color_accum, bokeh, readColor);
add_v4_v4(multiplier_accum, bokeh);
if (tempDepth[0] < centerDepth) {
if ((sizeCenter > threshold && size > threshold) || size <= threshold) {
float dx = nx - x;
float dy = ny - y;
if (nx == x && ny == y) {
}
else if (size >= fabsf(dx) && size >= fabsf(dy)) {
float u = 256 + dx * 256 / size;
float v = 256 + dy * 256 / size;
inputBokehProgram->read(bokeh, u, v, COM_PS_NEAREST, inputBuffers);
inputProgram->read(readColor, nx, ny, COM_PS_NEAREST, inputBuffers);
madd_v4_v4v4(color_accum, bokeh, readColor);
add_v4_v4(multiplier_accum, bokeh);
}
}
}
}
@@ -131,6 +139,10 @@ bool VariableSizeBokehBlurOperation::determineDependingAreaOfInterest(rcti *inpu
if (operation->determineDependingAreaOfInterest(&bokehInput, readOperation, output) ) {
return true;
}
operation = getInputOperation(3);
if (operation->determineDependingAreaOfInterest(&newInput, readOperation, output) ) {
return true;
}
operation = getInputOperation(0);
if (operation->determineDependingAreaOfInterest(&newInput, readOperation, output) ) {
return true;

1
source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
View File

@@ -32,6 +32,7 @@ private:
SocketReader *inputProgram;
SocketReader *inputBokehProgram;
SocketReader *inputSizeProgram;
SocketReader *inputDepthProgram;
public:
VariableSizeBokehBlurOperation();